Alexander Alekhin [Tue, 14 Jan 2020 14:04:22 +0000 (17:04 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 14 Jan 2020 12:45:59 +0000 (12:45 +0000)]
Merge pull request #16291 from dkurt:dnn_onnx_graph_simplifier
Alexander Alekhin [Tue, 14 Jan 2020 12:42:28 +0000 (12:42 +0000)]
Merge pull request #16199 from sajarindider:computeGradientX
Alexander Alekhin [Tue, 14 Jan 2020 11:55:37 +0000 (11:55 +0000)]
Merge pull request #16344 from l-bat:ngraph_normalize
sajarindider [Thu, 19 Dec 2019 05:46:46 +0000 (00:46 -0500)]
Fixed small inefficiency in seamless clone init
Liubov Batanina [Tue, 14 Jan 2020 09:51:19 +0000 (12:51 +0300)]
Enable acrossSpatial normalizeL2 on Myriad
Dmitry Kurtaev [Mon, 6 Jan 2020 11:03:05 +0000 (14:03 +0300)]
ONNX graphs simplifier
Alexander Alekhin [Mon, 13 Jan 2020 16:59:45 +0000 (16:59 +0000)]
Merge pull request #16232 from dkurt:dnn_ie_ngraph_fix_myriad_tests
Vadim Levin [Mon, 13 Jan 2020 15:11:34 +0000 (18:11 +0300)]
Merge pull request #15915 from VadimLevin:dev/norm_fix
Fix implicit conversion from array to scalar in python bindings
* Fix wrong conversion behavior for primitive types
- Introduce ArgTypeInfo namedtuple instead of plain tuple.
If strict conversion parameter for type is set to true, it is
handled like object argument in PyArg_ParseTupleAndKeywords and
converted to concrete type with the appropriate pyopencv_to function
call.
- Remove deadcode and unused variables.
- Fix implicit conversion from numpy array with 1 element to scalar
- Fix narrowing conversion to size_t type.
* Fix wrong conversion behavior for primitive types
- Introduce ArgTypeInfo namedtuple instead of plain tuple.
If strict conversion parameter for type is set to true, it is
handled like object argument in PyArg_ParseTupleAndKeywords and
converted to concrete type with the appropriate pyopencv_to function
call.
- Remove deadcode and unused variables.
- Fix implicit conversion from numpy array with 1 element to scalar
- Fix narrowing conversion to size_t type.·
- Enable tests with wrong conversion behavior
- Restrict passing None as value
- Restrict bool to integer/floating types conversion
* Add PyIntType support for Python 2
* Remove possible narrowing conversion of size_t
* Bindings conversion update
- Remove unused macro
- Add better conversion for types to numpy types descriptors
- Add argument name to fail messages
- NoneType treated as a valid argument. Better handling will be added
as a standalone patch
* Add descriptor specialization for size_t
* Add check for signed to unsigned integer conversion safety
- If signed integer is positive it can be safely converted
to unsigned
- Add check for plain python 2 objects
- Add check for numpy scalars
- Add simple type_traits implementation for better code style
* Resolve type "overflow" false negative in safe casting check
- Move type_traits to separate header
* Add copyright message to type_traits.hpp
* Limit conversion scope for integral numpy types
- Made canBeSafelyCasted specialized only for size_t, so
type_traits header became unused and was removed.
- Added clarification about descriptor pointer
Dmitry Kurtaev [Tue, 24 Dec 2019 10:34:33 +0000 (13:34 +0300)]
Disable some tests for Myriad target of nGraph
Add lightweight IE hardware targets checks
nGraph: Concat with paddings
Enable more nGraph tests
Restore FP32->FP16 for GPU plugin of IE
try to fix buildbot
Use lightweight IE targets check only starts from R4
Alexander Alekhin [Mon, 13 Jan 2020 12:16:40 +0000 (12:16 +0000)]
Merge pull request #16335 from berak:fix_ml_python_digits_samples_3.4
Anatoliy Talamanov [Mon, 13 Jan 2020 11:54:10 +0000 (14:54 +0300)]
Merge pull request #16221 from TolyaTalamanov:at/fix-g_typed_kernel_m
G-API: Fix G_TYPED_KERNEL_M macro
* Fix G_TYPED_KERNEL_M macro
* Fixes
* Fix windows build
* Fix doxygen
* Added several macros
* Add overloads for G_TYPED_KERNEL
berak [Mon, 13 Jan 2020 11:26:28 +0000 (12:26 +0100)]
ml/python: fix digits samples(3.4)
Alexander Alekhin [Sun, 12 Jan 2020 09:34:34 +0000 (09:34 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Gourav Roy [Sun, 12 Jan 2020 08:34:59 +0000 (14:04 +0530)]
Merge pull request #16276 from themechanicalcoder:video-tutorial
* Added java code for meanshift and optical_flow
* added java code for module video
* added appropriate spaces in codes
* converted absolute path to command line arguments
* added spaces at appropriate places
ihsan314 [Sun, 12 Jan 2020 08:32:12 +0000 (00:32 -0800)]
Merge pull request #14666 from ihsan314:file_io_xml_yml
Python code examples for file IO in xml and yml format
* Initial "Pythonization" of file_input_output.cpp
* Moved file_input_output.py to correct location
* Nearly done Pythonizing file_input_output.cpp
* Python equivalent of file_input_output.py created
* Started Pythonizing camera_calibration.cpp
* Completed Python tutorial/sample code for file_input_output
* Resolved whitespace issues
* Removed tabs in file_input_output.cpp
* Patched import order and wrapped code in main function
* Changed string to docstring format in help file
* Updated link to Python example code
Alexander Alekhin [Sat, 11 Jan 2020 17:39:13 +0000 (17:39 +0000)]
Merge pull request #16270 from dkurt:dnn_sort_tf_text_graphs
Alexander Alekhin [Fri, 10 Jan 2020 18:31:02 +0000 (21:31 +0300)]
Merge pull request #16236 from alalek:fix_core_simd_emulator
* core: fix intrin_cpp, allow to build modules with SIMD emulator
* core(arithm): fix v_zero initialization
* core(simd): 'strict' types for binary/bitwise operations
* features2d: avoid aligned load issue in GCC 5.4 with emulated SIMD
* core(simd): alignment checks in SIMD emulator
olramde [Fri, 10 Jan 2020 13:18:31 +0000 (22:18 +0900)]
Merge pull request #16240 from olramde:olramde
* Changed plus operator to os.path.join()
* Remove '/' from PATH
Alexander Alekhin [Fri, 10 Jan 2020 11:38:17 +0000 (11:38 +0000)]
Merge pull request #16302 from sthibaul:dlopen-glibc
Alexander Alekhin [Wed, 8 Jan 2020 21:52:30 +0000 (21:52 +0000)]
Merge pull request #16300 from Palmitoxico:cmake-cmp0077
Augusto Fraga Giachero [Tue, 7 Jan 2020 11:36:35 +0000 (08:36 -0300)]
Enable cmake CMP0077 policy
When building OpenCV as a sub-project using cmake's add_subdirectory()
the OpenCV's build options would be overwritten to its default
state. With cmake 3.13+ the CMP0077 policy, option() honors previous
definitions via set().
Samuel Thibault [Wed, 8 Jan 2020 00:32:12 +0000 (01:32 +0100)]
Fix build on non-Linux glibc-based systems
dl functions are provided by all glibc-based systems (GNU/Linux, but
also GNU/Hurd, GNU/kFreeBSD)
Alexander Alekhin [Tue, 7 Jan 2020 22:13:39 +0000 (22:13 +0000)]
Merge pull request #16289 from Nuzhny007:3.4
Nuzhny007 [Mon, 6 Jan 2020 03:32:56 +0000 (06:32 +0300)]
Fixed compilation on windows with openvx
Alexander Alekhin [Sun, 5 Jan 2020 12:01:03 +0000 (12:01 +0000)]
Merge pull request #16265 from JanuszL:fix_bgr
Alexander Alekhin [Sun, 5 Jan 2020 11:59:33 +0000 (11:59 +0000)]
Merge pull request #16230 from YashasSamaga:cuda4dnn-fp-conversion
Janusz Lisiecki [Fri, 20 Dec 2019 16:54:37 +0000 (17:54 +0100)]
Fix swapped channels in BGR* conversion utility function
- some of `icvCvt_BGR*` functions have R with B channels
swapped what leads to the wrong conversion
- renames misleading `rgb` variable name to `bgr`
- swap back the conversion coefficients, `cB` should be the first
Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
Alexander Alekhin [Fri, 3 Jan 2020 16:30:28 +0000 (16:30 +0000)]
Merge pull request #16238 from alalek:imgproc_resize_fix_types
hannesa2 [Fri, 3 Jan 2020 16:15:35 +0000 (17:15 +0100)]
Merge pull request #16222 from hannesa2:AndroidMoveVersionInfo
Android move version info to Gradle style
* move version info to Gradle style
* Use VERSION_NAME in loader
* apply review suggestion
Andrew Bruce [Fri, 3 Jan 2020 16:09:40 +0000 (11:09 -0500)]
Merge pull request #16275 from andybrucenet:fix_vector_insert
* Ticket 16274: Fix compile error on std::vector.insert
* See https://github.com/opencv/opencv/issues/16274
Alexander Alekhin [Thu, 2 Jan 2020 11:58:20 +0000 (11:58 +0000)]
copyright: 2020
Alexander Alekhin [Thu, 2 Jan 2020 11:58:20 +0000 (11:58 +0000)]
copyright: 2020
Alexander Alekhin [Tue, 31 Dec 2019 10:11:39 +0000 (10:11 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 31 Dec 2019 10:09:00 +0000 (10:09 +0000)]
Merge pull request #16249 from alalek:check_size
Dmitry Kurtaev [Tue, 31 Dec 2019 08:43:32 +0000 (11:43 +0300)]
Sort text TensorFlow graphs
Alexander Alekhin [Tue, 31 Dec 2019 08:20:24 +0000 (08:20 +0000)]
Merge pull request #16264 from YashasSamaga:cuda4dnn-msvc-v140-workaround
Alexander Alekhin [Mon, 30 Dec 2019 22:56:11 +0000 (22:56 +0000)]
Merge pull request #16263 from dkurt:dnn_tf_addv2
Alexander Alekhin [Mon, 30 Dec 2019 17:34:23 +0000 (17:34 +0000)]
Merge pull request #16258 from jed-frey:patch/python38-clock
YashasSamaga [Mon, 30 Dec 2019 17:32:17 +0000 (23:02 +0530)]
simplify code to help MSVC 19.10 and lower
Dmitry Kurtaev [Mon, 30 Dec 2019 17:06:58 +0000 (20:06 +0300)]
AddV2 from TensorFlow
Jed [Sun, 29 Dec 2019 23:50:17 +0000 (18:50 -0500)]
Removed deprecated 'clock' import.
Alexander Alekhin [Sun, 29 Dec 2019 22:30:39 +0000 (22:30 +0000)]
Merge pull request #16251 from pwuertz:rtrees_set_rng
Peter Würtz [Sat, 28 Dec 2019 12:34:08 +0000 (13:34 +0100)]
Use global RNG for training RTrees.
Alexander Alekhin [Sun, 29 Dec 2019 20:53:17 +0000 (20:53 +0000)]
Merge pull request #16254 from YashasSamaga:cuda4dnn-cudnn-optm-conv_bias_relu
YashasSamaga [Sun, 29 Dec 2019 18:35:39 +0000 (00:05 +0530)]
perfor fp conversions on GPU
YashasSamaga [Sun, 29 Dec 2019 07:38:38 +0000 (13:08 +0530)]
use optimized cuDNN path for conv + bias + relu
Alexander Alekhin [Sat, 28 Dec 2019 21:59:19 +0000 (21:59 +0000)]
Merge pull request #16250 from alalek:remove_moved_code
Alexander Alekhin [Sat, 28 Dec 2019 13:57:11 +0000 (13:57 +0000)]
remove moved code
Alexander Alekhin [Sat, 28 Dec 2019 13:18:12 +0000 (13:18 +0000)]
core(check): add Size_<int>
Alexander Alekhin [Fri, 27 Dec 2019 19:38:25 +0000 (19:38 +0000)]
Merge pull request #16237 from alalek:eliminate_build_warnings
Alexander Alekhin [Fri, 27 Dec 2019 16:20:52 +0000 (16:20 +0000)]
Merge pull request #16247 from alalek:backport_16241
Alexander Alekhin [Fri, 27 Dec 2019 16:18:56 +0000 (16:18 +0000)]
Merge pull request #16241 from bwignall:typo
Alexander Alekhin [Fri, 27 Dec 2019 13:41:38 +0000 (13:41 +0000)]
Merge pull request #16229 from hannesa2:RemoveAndroidEclipse
Alexander Alekhin [Fri, 27 Dec 2019 13:12:03 +0000 (13:12 +0000)]
Merge pull request #16242 from catree:add_Rodrigues_input_shape_check
Alexander Alekhin [Fri, 27 Dec 2019 13:01:43 +0000 (13:01 +0000)]
Merge pull request #16226 from YashasSamaga:cuda4dnn-permute-optm
Brian Wignall [Thu, 26 Dec 2019 11:45:03 +0000 (06:45 -0500)]
Alexander Alekhin [Fri, 27 Dec 2019 11:13:08 +0000 (11:13 +0000)]
Merge pull request #16243 from collinbrake:grammar_fixes_9
catree [Thu, 26 Dec 2019 23:59:25 +0000 (00:59 +0100)]
Add explicit size check for Rodrigues() function to prevent issue like https://stackoverflow.com/questions/
58969553
Collin Brake [Fri, 27 Dec 2019 01:31:54 +0000 (20:31 -0500)]
grammar and readability improvements
Brian Wignall [Thu, 26 Dec 2019 11:45:03 +0000 (06:45 -0500)]
Fix spelling typos
Alexander Alekhin [Wed, 25 Dec 2019 23:46:32 +0000 (23:46 +0000)]
imgproc(resize): avoid unnecessary type conversions
Alexander Alekhin [Wed, 25 Dec 2019 23:26:59 +0000 (23:26 +0000)]
build: eliminate build warnings
Hannes Achleitner [Tue, 24 Dec 2019 06:38:12 +0000 (07:38 +0100)]
Remove Android Eclipse relicts
YashasSamaga [Mon, 23 Dec 2019 18:53:45 +0000 (00:23 +0530)]
improve reduction logic and add fast transpose kernel
Alexander Alekhin [Fri, 20 Dec 2019 14:06:11 +0000 (17:06 +0300)]
Merge tag '4.2.0'
Alexander Alekhin [Fri, 20 Dec 2019 13:44:16 +0000 (16:44 +0300)]
release: OpenCV 4.2.0
shimat [Fri, 20 Dec 2019 13:38:51 +0000 (22:38 +0900)]
Merge pull request #16208 from shimat:fix_compare_16f
* add cv::compare test when Mat type == CV_16F
* add assertion in cv::compare when src.depth() == CV_16F
* cv::compare assertion minor fix
* core: add more checks
Yashas Samaga B L [Fri, 20 Dec 2019 13:36:32 +0000 (19:06 +0530)]
Merge pull request #16010 from YashasSamaga:cuda4dnn-fp16-tests
* enable tests for DNN_TARGET_CUDA_FP16
* disable deconvolution tests
* disable shortcut tests
* fix typos and some minor changes
* dnn(test): skip CUDA FP16 test too (run_pool_max)
Alexander Alekhin [Fri, 20 Dec 2019 11:02:56 +0000 (14:02 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 20 Dec 2019 09:43:26 +0000 (12:43 +0300)]
Merge tag '3.4.9'
Alexander Alekhin [Thu, 19 Dec 2019 20:55:46 +0000 (20:55 +0000)]
Merge pull request #16205 from alalek:fix_dnn_test_data
Alexander Alekhin [Thu, 19 Dec 2019 19:31:59 +0000 (19:31 +0000)]
dnn(test): don't require downloaded data
Alexander Alekhin [Thu, 19 Dec 2019 15:16:47 +0000 (18:16 +0300)]
release: OpenCV 3.4.9
Sajarin [Thu, 19 Dec 2019 15:15:59 +0000 (10:15 -0500)]
Merge pull request #16165 from sajarindider:macOS_install
* doc: added macOS installation guide
* doc: added clarification and corrections
* docs: introduction entry, lowercase file names and ids
Alexander Alekhin [Thu, 19 Dec 2019 14:43:53 +0000 (14:43 +0000)]
Merge pull request #16201 from mshabunin:fix-dup-test
Alexander Alekhin [Thu, 19 Dec 2019 11:01:24 +0000 (14:01 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Maksim Shabunin [Thu, 19 Dec 2019 11:35:56 +0000 (14:35 +0300)]
Test: avoid duplicated test cases
Alexander Alekhin [Thu, 19 Dec 2019 10:55:31 +0000 (10:55 +0000)]
Merge pull request #16195 from alalek:tbb_version_2020
Alexander Alekhin [Thu, 19 Dec 2019 10:35:54 +0000 (10:35 +0000)]
Merge pull request #16196 from alalek:issue_13574
Alexander Alekhin [Thu, 19 Dec 2019 10:29:07 +0000 (10:29 +0000)]
Merge pull request #16139 from alalek:core_flip_avoid_unaligned
Alexander Alekhin [Thu, 19 Dec 2019 10:20:42 +0000 (13:20 +0300)]
Merge pull request #16194 from alalek:fix_16192
* imgproc(test): resize(LANCZOS4) reproducer 16192
* imgproc: fix resize LANCZOS4 coefficients generation
jeffeDurand [Thu, 19 Dec 2019 10:02:48 +0000 (05:02 -0500)]
Merge pull request #16090 from jeffeDurand:cuda_mog2_issue_5296
* cuda_mog2_issue_5296
Alexander Alekhin [Thu, 19 Dec 2019 10:00:07 +0000 (10:00 +0000)]
Merge pull request #16034 from Quantizs:irLoadFromBuffer
Sebastien Wybo [Thu, 19 Dec 2019 09:59:18 +0000 (10:59 +0100)]
Merge pull request #16011 from sebastien-wybo:fix_16007
* Fix #16007 - colinearity computed using all 3 coordinates
* calib3d(test): estimateAffine3D regression 16007
Alexander Alekhin [Thu, 19 Dec 2019 00:29:53 +0000 (00:29 +0000)]
android(camera2): apply .disconnectCamera() patch from issue 13574
Alexander Alekhin [Wed, 11 Dec 2019 20:08:10 +0000 (20:08 +0000)]
core: workaround flipHoriz() alignment issues
Alexander Alekhin [Wed, 18 Dec 2019 23:14:38 +0000 (23:14 +0000)]
3rdparty: TBB version 2019u8 => 2020.0
Alexander Alekhin [Wed, 18 Dec 2019 22:31:52 +0000 (22:31 +0000)]
Merge pull request #16191 from terfendail:lres2c_fix
Vitaly Tuzov [Wed, 18 Dec 2019 17:05:36 +0000 (20:05 +0300)]
Fix for CV_8UC2 linear resize vectorization
Alexander Alekhin [Wed, 18 Dec 2019 14:41:58 +0000 (14:41 +0000)]
Merge pull request #16082 from YashasSamaga:cuda4dnn-roi-pooling
antalzsiroscandid [Wed, 27 Nov 2019 14:31:38 +0000 (15:31 +0100)]
dnn: reading IR models from buffer
mcellis33 [Wed, 18 Dec 2019 14:25:59 +0000 (14:25 +0000)]
Merge pull request #16136 from mcellis33:mec-nan
* Handle det == 0 in findCircle3pts.
Issue 16051 shows a case where findCircle3pts returns NaN for the
center coordinates and radius due to dividing by a determinant of 0. In
this case, the points are colinear, so the longest distance between any
2 points is the diameter of the minimum enclosing circle.
* imgproc(test): update test checks for minEnclosingCircle()
* imgproc: fix handling of special cases in minEnclosingCircle()
Alexander Alekhin [Wed, 18 Dec 2019 10:30:35 +0000 (10:30 +0000)]
Merge pull request #16188 from saskatchewancatch:issue-13551
Rajkiran Natarajan [Wed, 18 Dec 2019 04:17:32 +0000 (20:17 -0800)]
Change program type in hdr format files to modern value: RADIANCE so
modern readers that expect RADIANCE will read it
Alexander Alekhin [Tue, 17 Dec 2019 19:02:15 +0000 (19:02 +0000)]
Merge pull request #16104 from alalek:issue_16095
Alexander Alekhin [Tue, 17 Dec 2019 18:58:12 +0000 (18:58 +0000)]
Merge pull request #16171 from YashasSamaga:cuda4dnn-tensor-cores
Alexander Alekhin [Tue, 17 Dec 2019 12:03:55 +0000 (12:03 +0000)]
Merge pull request #16083 from alalek:issue_14961
Alexander Alekhin [Fri, 6 Dec 2019 12:59:06 +0000 (15:59 +0300)]
gapi(test): avoid using of unstable random floating-point input
Orest Chura [Tue, 17 Dec 2019 08:00:49 +0000 (11:00 +0300)]
Merge pull request #15942 from OrestChura:fb_tutorial
G-API: Tutorial: Face beautification algorithm implementation
* Introduce a tutorial on face beautification algorithm
- small typo issue in render_ocv.cpp
* Addressing comments rgarnov smirnov-alexey