Suleyman TURKMEN [Thu, 23 Jul 2020 11:39:40 +0000 (14:39 +0300)]
Update train_HOG.cpp
Maksim Shabunin [Thu, 23 Jul 2020 08:35:50 +0000 (08:35 +0000)]
Merge pull request #17489 from Lapshin:ffmpeg_cap_consider_rotation_metadata_3.4
Alexander Smorkalov [Mon, 8 Jun 2020 14:31:18 +0000 (17:31 +0300)]
MP4 autorotation tests and various fixes for Windows
- Added test for automated rotation for MP4 videos with metadata
- Fix 180 degrees rotation bug
- Moved rotation logic to cv::VideoCapture implementation for FFmpeg and restore binary compatibility with FFmpeg wrapper.
Alexey Lapshin [Tue, 2 Jun 2020 15:34:52 +0000 (18:34 +0300)]
Autorotation for mp4 streams with metadata
- Add VideoCapture camera orientation property for mp4 videos with camera orientation meta.
- Add auto rotation for 90, 180, 270 degrees using cv::rotate
Maksim Shabunin [Wed, 22 Jul 2020 16:06:23 +0000 (16:06 +0000)]
Merge pull request #17913 from asmorkalov:as/connected_components_ref
Maksim Shabunin [Wed, 22 Jul 2020 08:19:31 +0000 (08:19 +0000)]
Merge pull request #17863 from nglee:dev_cudaDetachOutput
Alexander Smorkalov [Wed, 22 Jul 2020 07:05:55 +0000 (10:05 +0300)]
Added reference to Original Wu's articte about SAUF connected components search method.
Maksim Shabunin [Tue, 21 Jul 2020 09:38:35 +0000 (09:38 +0000)]
Merge pull request #17890 from l-bat:onnx_gather
Namgoo Lee [Tue, 21 Jul 2020 01:27:43 +0000 (10:27 +0900)]
Use in-place npp function for inplace arguments
Liubov Batanina [Mon, 20 Jul 2020 09:04:20 +0000 (12:04 +0300)]
Support Gather for variable inputs
Alexander Alekhin [Fri, 17 Jul 2020 02:06:19 +0000 (02:06 +0000)]
Merge tag '3.4.11'
Alexander Alekhin [Fri, 17 Jul 2020 00:34:46 +0000 (00:34 +0000)]
release: OpenCV 3.4.11
Alexander Alekhin [Fri, 17 Jul 2020 00:28:33 +0000 (00:28 +0000)]
Merge pull request #17865 from alalek:add_missing_check_17036
Alexander Alekhin [Thu, 16 Jul 2020 20:08:00 +0000 (20:08 +0000)]
Merge pull request #17856 from alalek:dnn_openvino_2020.4.0
Alexander Alekhin [Thu, 16 Jul 2020 20:01:44 +0000 (20:01 +0000)]
imgproc: add missing check into cvtColorTwoPlane()
Alexander Alekhin [Thu, 16 Jul 2020 15:27:21 +0000 (15:27 +0000)]
Merge pull request #17764 from alalek:issue_17762
Alexander Alekhin [Mon, 6 Jul 2020 14:32:42 +0000 (14:32 +0000)]
dnn: fix OpenCL implementation of Slice layer
Alexander Alekhin [Wed, 15 Jul 2020 22:52:08 +0000 (22:52 +0000)]
dnn(test): adjust tests for OpenVINO 2020.4
Alexander Alekhin [Wed, 15 Jul 2020 22:10:45 +0000 (22:10 +0000)]
dnn: eliminate IE deprecation warning
Alexander Alekhin [Wed, 15 Jul 2020 20:44:53 +0000 (20:44 +0000)]
winpack_dldt: switch defaults to OpenVINO 2020.4
Alexander Alekhin [Tue, 19 May 2020 11:48:05 +0000 (11:48 +0000)]
dnn: use OpenVINO 2020.4 defines
original commit:
2813aa7eb9c81e7bc8c765d10e508ad134f6b376
Alexander Alekhin [Wed, 15 Jul 2020 18:53:46 +0000 (18:53 +0000)]
Merge pull request #17849 from dkurt:fix_17848
Dmitry Kurtaev [Wed, 15 Jul 2020 11:36:13 +0000 (14:36 +0300)]
Fix TensorFlow->ONNX imports
Alexander Alekhin [Mon, 13 Jul 2020 18:52:34 +0000 (18:52 +0000)]
Merge pull request #17830 from alalek:fix_17815
Alexander Alekhin [Mon, 13 Jul 2020 17:15:41 +0000 (17:15 +0000)]
features2d: v_fma => v_muladd for integers
Alexander Alekhin [Mon, 13 Jul 2020 17:12:31 +0000 (17:12 +0000)]
Merge pull request #17806 from alalek:dnn_ie_num_threads_windows
pemmanuelviel [Mon, 13 Jul 2020 12:59:10 +0000 (14:59 +0200)]
Merge pull request #17639 from pemmanuelviel:pev--binary-kmeans
Pev binary kmeans
* Ongoing work transposing kmeans clustering method for bitfields: the computeClustering method
Ongoing work transposing kmeans clustering method for bitfields: interface computeBitfieldClustering
Fix genericity of computeNodeStatistics
Ongoing work transposing kmeans clustering method for bitfields: adapt computeNodeStatistics()
Ongoing work transposing kmeans clustering method for bitfields: adapt findNN() method
Ongoing work transposing kmeans clustering method for bitfields: allow kmeans with Hamming distance
Ongoing work transposing kmeans clustering method for bitfields: adapt distances code
Ongoing work transposing kmeans clustering method for bitfields: adapt load/save code
Ongoing work transposing kmeans clustering method for bitfields: adapt kmeans hierarchicalClustring()
PivotType -> CentersType Renaming
Fix type casting for ARM SIMD implementation of Hamming
Fix warnings with Win32 compilation
Fix warnings with Win64 compilation
Fix wrong parenthesis position on rounding
* Ensure proper rounding when CentersType is integral
jasonKercher [Mon, 13 Jul 2020 12:29:54 +0000 (08:29 -0400)]
Merge pull request #17770 from jasonKercher:3.4_triggered
3.4 Allow first capture to return false
* fix first capture timeout
* fix first capture timeout
Alexander Alekhin [Mon, 13 Jul 2020 11:08:33 +0000 (11:08 +0000)]
Merge pull request #17822 from alalek:issue_17792
Alexander Alekhin [Sun, 12 Jul 2020 13:05:14 +0000 (13:05 +0000)]
Merge pull request #17805 from tomoaki0705:fixCUDAHostCompilerIssue
Tomoaki Teshima [Sun, 12 Jul 2020 12:22:12 +0000 (21:22 +0900)]
re-enable automatic CC detection on Jetson
* treat both CMAKE_C_COMPILER and c_compiler_realpath as candidate
Alexander Alekhin [Sun, 12 Jul 2020 11:53:46 +0000 (11:53 +0000)]
core: use lazy on-demand initialization for param_traceEnable
Alexander Alekhin [Sat, 11 Jul 2020 19:09:21 +0000 (19:09 +0000)]
Merge pull request #17800 from Yosshi999:gsoc_sift-universal-intrinsic
Alexander Alekhin [Fri, 10 Jul 2020 15:11:53 +0000 (15:11 +0000)]
Merge pull request #17635 from jsxyhelu:3.4
Alexander Alekhin [Fri, 10 Jul 2020 14:29:21 +0000 (14:29 +0000)]
dnn(ie): enable KEY_CPU_THREADS_NUM for Windows
jsxyhelu [Tue, 23 Jun 2020 12:39:55 +0000 (20:39 +0800)]
Use“ moms” replace "contourArea"
double area = moms.m00;
is same as
double area = contourArea(contours[contourIdx]);
Not to mention
"moms" already calculated here,"contourArea" should not apply
Alexander Alekhin [Fri, 10 Jul 2020 10:53:55 +0000 (10:53 +0000)]
Merge pull request #17772 from mshabunin:fix-match-umat-mask
Yosshi999 [Thu, 9 Jul 2020 16:50:20 +0000 (16:50 +0000)]
use bufferarea for allocating buffer
Maksim Shabunin [Thu, 9 Jul 2020 13:03:04 +0000 (16:03 +0300)]
Added test for checkMasks with UMat train descs
Maksim Shabunin [Tue, 7 Jul 2020 10:26:43 +0000 (13:26 +0300)]
Fixed checkMasks in DescriptorMatcher with train descs in UMats
Alexander Alekhin [Wed, 8 Jul 2020 20:59:29 +0000 (20:59 +0000)]
Merge pull request #17737 from pemmanuelviel:pev--fix-trees-descent
Alexander Alekhin [Wed, 8 Jul 2020 20:33:40 +0000 (20:33 +0000)]
Merge pull request #17707 from Yosshi999:gsoc_sift-universal-intrinsic
Alexander Alekhin [Wed, 8 Jul 2020 20:01:35 +0000 (20:01 +0000)]
Merge pull request #17674 from alalek:issue_16214
Alexander Alekhin [Wed, 8 Jul 2020 20:00:12 +0000 (20:00 +0000)]
Merge pull request #17777 from alalek:backport_cuda_cmake
Alexander Alekhin [Fri, 26 Jun 2020 22:31:02 +0000 (22:31 +0000)]
imgproc: align GaussianBlur/sepFilter2D OpenCL with CPU version
Alexander Alekhin [Sun, 28 Jun 2020 08:14:54 +0000 (08:14 +0000)]
imgproc(test): test bitExact cases in OCL/sepFilter2D
Alexander Alekhin [Wed, 8 Jul 2020 07:28:40 +0000 (07:28 +0000)]
cmake: backport CUDA scripts
Alexander Alekhin [Tue, 7 Jul 2020 19:28:53 +0000 (19:28 +0000)]
Merge pull request #17759 from alalek:build_opencv_winpack_dldt_2020.4.0
Alexander Alekhin [Tue, 7 Jul 2020 10:36:01 +0000 (10:36 +0000)]
Merge pull request #17752 from YashasSamaga:generalize-concat-fusion-3.4
Alexander Alekhin [Mon, 6 Jul 2020 23:01:27 +0000 (23:01 +0000)]
Merge pull request #17728 from sturkmen72:patch-4
Alexander Alekhin [Mon, 6 Jul 2020 22:58:17 +0000 (01:58 +0300)]
Merge pull request #17699 from alalek:build_core_cuda
* core(cuda): fix build
- MSVS 19.25.28612.0
- CUDA release 11.0, V11.0.167
* cmake(cuda): backport workaround for CUDA 11
* cmake(cuda): call CUDA_BUILD_CLEAN_TARGET() on finalize
* cmake(cuda): use CMAKE_SUPPRESS_REGENERATION with MSVS
Alexander Alekhin [Mon, 6 Jul 2020 22:36:35 +0000 (22:36 +0000)]
Merge pull request #17743 from alalek:test_17666
Alexander Alekhin [Mon, 6 Jul 2020 21:50:23 +0000 (21:50 +0000)]
Merge pull request #17766 from alalek:backport_17756
Alexander Alekhin [Mon, 6 Jul 2020 14:13:38 +0000 (14:13 +0000)]
dnn(slice): disable buggy OCV/OCL implementation
Alexander Alekhin [Fri, 3 Jul 2020 19:14:05 +0000 (19:14 +0000)]
dnn(test): add YOLOv4-tiny tests
Alexander Alekhin [Mon, 6 Jul 2020 20:02:15 +0000 (20:02 +0000)]
Merge pull request #17761 from mshabunin:test-wo-jpg-png
Ilya Churaev [Mon, 6 Jul 2020 08:11:59 +0000 (11:11 +0300)]
Fixed header paths for some nGraph ops
* Added dependency on IE version
backport of commit:
992c908b566d264b824680d0cf7d668cdf918254
Alexander Alekhin [Sun, 5 Jul 2020 22:16:46 +0000 (22:16 +0000)]
build: winpack_dldt with dldt 2020.4.0
Maksim Shabunin [Mon, 6 Jul 2020 11:52:52 +0000 (14:52 +0300)]
imgcodecs: fix test build with disabled JPEG and PNG libs
Suleyman TURKMEN [Wed, 1 Jul 2020 20:50:09 +0000 (23:50 +0300)]
Update documentation of imwrite()
Alexander Alekhin [Sat, 4 Jul 2020 17:17:57 +0000 (17:17 +0000)]
Merge pull request #17729 from modeste2015:3.4
Alexander Alekhin [Sat, 4 Jul 2020 17:16:57 +0000 (17:16 +0000)]
Merge pull request #17724 from pemmanuelviel:pev--fix-mix-of-types
pemmanuelviel [Sat, 4 Jul 2020 17:15:44 +0000 (19:15 +0200)]
Merge pull request #17722 from pemmanuelviel:pev--replace-asserts
* Clean: replace C style asserts by CV_Assert and CV_DbgAssert
* Try fixing warning on Windows compilation
* Another way trying to fix warnings on Win
* Fixing warnings with some compilers:
Some compilers warn on systematic exit preventing to execute the code that follows.
This is why assert(0) that exits only in debug was working, but not CV_Assert or CV_Error
that exit both in release and debug, even if with different behavior.
In addition, other compilers complain when return 0 is removed from getKey(),
even if before we have a statement leading to systematic exit.
* Disable "unreachable code" warnings for Win compilers so we can use proper CV_Error
Alexander Alekhin [Sat, 4 Jul 2020 17:14:34 +0000 (17:14 +0000)]
Merge pull request #17719 from pemmanuelviel:pev--fix-computeNodeStatistics-genericity
YashasSamaga [Sat, 4 Jul 2020 13:27:28 +0000 (18:57 +0530)]
generalize axis for concat fusion
Alexander Alekhin [Fri, 3 Jul 2020 21:21:27 +0000 (21:21 +0000)]
Merge pull request #17744 from alalek:issue_17657
Alexander Alekhin [Fri, 3 Jul 2020 19:31:41 +0000 (19:31 +0000)]
cmake: fix ENABLE_PROFILING
Liubov Batanina [Fri, 3 Jul 2020 18:07:08 +0000 (21:07 +0300)]
Merge pull request #17733 from l-bat:tiny_yolov4
* Supported yolov4-tiny
* Added comments
Alexander Alekhin [Fri, 3 Jul 2020 11:24:11 +0000 (11:24 +0000)]
Merge pull request #17725 from pemmanuelviel:pev--precompute-divisor
Pierre-Emmanuel Viel [Thu, 18 Jun 2020 14:30:29 +0000 (16:30 +0200)]
Fix trees parsing behavior in hierarchical_clustering_index:
Before, when maxCheck was reached in the first descent of a tree, time was still wasted parsing
the next trees till their best leaves whose points were not used at all.
Alexander Alekhin [Thu, 2 Jul 2020 11:54:28 +0000 (11:54 +0000)]
Merge pull request #17721 from pemmanuelviel:pev--fix-hist-intersect-arguments
Ken Shirriff [Thu, 2 Jul 2020 10:58:53 +0000 (03:58 -0700)]
Merge pull request #17708 from shirriff:patch-1
Clarify component statistics documentation
* Change ConnectedComponentsTypes documentation
Change from "algorithm output formats" to "statistics" because it specifies types of statistics, not formats.
* Documentation: clarify component statistics
Explain that ConnectedComponentTypes selects a statistic.
Heritier Kinke [Thu, 2 Jul 2020 01:27:34 +0000 (03:27 +0200)]
forget to look in sub folder of include/openblas
Alexander Alekhin [Wed, 1 Jul 2020 18:14:08 +0000 (18:14 +0000)]
Merge pull request #17723 from pemmanuelviel:pev--remove-duplicate
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:20:02 +0000 (18:20 +0200)]
Fix arguments list in loadindex for histogram intersection
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:52:05 +0000 (18:52 +0200)]
Precompute the divisor to ensure that no kind of compiler would process it on the fly at each call.
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:27:07 +0000 (18:27 +0200)]
Mix of 32 and 64bits vector types prevents vectorisation for distance computation.
Argument "a" is of type ElementType* that is either int* or float*, while b was double*.
Mixing types prevents the possibility to use SSE or AVX instructions.
On implementation without SIMD instructions, this doesn't show any impact on performance.
Pierre-Emmanuel Viel [Wed, 1 Jul 2020 16:15:01 +0000 (18:15 +0200)]
Remove duplicate line
Pierre-Emmanuel Viel [Tue, 30 Jun 2020 22:43:42 +0000 (00:43 +0200)]
Fix genericity of computeNodeStatistics that couldn't compute stats properly on sub-nodes
Yosshi999 [Tue, 30 Jun 2020 06:41:55 +0000 (06:41 +0000)]
use universal SIMD intrinsics for SIFT
Alexander Alekhin [Mon, 29 Jun 2020 20:53:34 +0000 (20:53 +0000)]
Merge pull request #17640 from pemmanuelviel:pev--fix-lsh-bad-any-cast
Pierre-Emmanuel Viel [Sun, 28 Jun 2020 14:55:50 +0000 (16:55 +0200)]
Add test checking we don't throw when creating GenericIndex with LshIndexParams()
Pierre-Emmanuel Viel [Tue, 16 Jun 2020 14:51:41 +0000 (16:51 +0200)]
Fix the 'cvflann::anyimpl::bad_any_cast' error using Lsh
Alexander Alekhin [Sat, 27 Jun 2020 20:17:16 +0000 (20:17 +0000)]
Merge pull request #17636 from okamotoR:3.4
Alexander Alekhin [Sat, 27 Jun 2020 20:08:36 +0000 (20:08 +0000)]
Merge pull request #17567 from dev-tronifier:new_branch
pemmanuelviel [Fri, 26 Jun 2020 22:34:52 +0000 (00:34 +0200)]
Merge pull request #17642 from pemmanuelviel:pev--fixes-and-clean
* Clean: make the use of the indices array length consistent
Either we don't want this method to be used in the future for any other node
than the root node, and so we replace indices_length by size_ and remove it as
argument, or we want to be able to use it potentially for other nodes, and
so using size_ instead of indices_length would have lead to a bug.
* Fix: b was not an address
* Fix: transpose the Flann repo commit "Fixes in accum_dist methods" from Adil Ibragimov
Avoids trying to compute log(ratio) with ratio = 0
* Fix: transpose the Flann repo commit "result_set bugfix" from Jack Rae
* Fix Jack Rae commit as the initial i - 1 index was decremented before entering the loop body
* Clean: transpose the Flann repo commit "Updated comments in lsh_index" from Richard McPherson
* Fix: Transpose the Flann repo commit "Fixing unreachable code in lsh_table.h" from hypevr
* Fix warning the same way it was done in flann standalone repo
* Change the return value in case of unsupported type
dev-tronifier [Wed, 17 Jun 2020 06:30:18 +0000 (12:00 +0530)]
Increased portability of CV_Func
Alexander Alekhin [Fri, 26 Jun 2020 19:22:20 +0000 (19:22 +0000)]
Merge pull request #17638 from pemmanuelviel:pev--avoid-branching-in-loop
Alexander Alekhin [Fri, 26 Jun 2020 17:41:53 +0000 (17:41 +0000)]
Merge pull request #17663 from alalek:backport_17658
Yosshi999 [Thu, 25 Jun 2020 11:34:31 +0000 (20:34 +0900)]
Merge pull request #17618 from Yosshi999:gsoc_sift-better-test
Added/Fixed testcases for SIFT
* merge perf_sift into conventional perf tests
* Fix disabled SIFT scale invariance tests
allows trainIdx duplication in matching scaled keypoints
Ilya Lavrenov [Wed, 24 Jun 2020 20:58:18 +0000 (23:58 +0300)]
Conditional compilation for IR v7 support
backported commit
86905754e482fb265731840dcf9b36e6a2675c0d
Alexander Alekhin [Thu, 25 Jun 2020 09:12:40 +0000 (09:12 +0000)]
Merge pull request #17641 from pemmanuelviel:pev--fix-middleSplit-for-kdtree-single
Alexander Alekhin [Wed, 24 Jun 2020 10:57:37 +0000 (10:57 +0000)]
Merge pull request #17650 from alalek:update_libjpeg-turbo
Alexander Alekhin [Wed, 24 Jun 2020 10:57:07 +0000 (10:57 +0000)]
Merge pull request #17648 from alalek:update_libjpeg
Alexander Alekhin [Wed, 24 Jun 2020 06:28:16 +0000 (06:28 +0000)]
3rdparty: libjpeg-turbo 2.0.4 => 2.0.5
https://github.com/libjpeg-turbo/libjpeg-turbo/releases/tag/2.0.5
Alexander Alekhin [Tue, 23 Jun 2020 20:35:56 +0000 (20:35 +0000)]
3rdparty: libjpeg 9d
http://www.ijg.org/files/jpegsrc.v9d.tar.gz
Alexander Alekhin [Tue, 23 Jun 2020 18:43:50 +0000 (18:43 +0000)]
Merge pull request #17624 from dkurt:dnn_optimize_mish
Alexander Alekhin [Tue, 23 Jun 2020 18:29:55 +0000 (18:29 +0000)]
Merge pull request #17633 from alalek:backport_17616
Pierre-Emmanuel Viel [Sat, 16 May 2020 18:13:00 +0000 (20:13 +0200)]
Fix: error in the dimension used for computeMinMax
Instead of using the current dimension for which we just got a big span,
we were computing Min and Max for the previous dimension stored in cutfeat
(and using 0 instead of the dimension indice for the very first dimension
with "span > (1-eps)max_span")
Pierre-Emmanuel Viel [Sat, 16 May 2020 22:06:47 +0000 (00:06 +0200)]
Optim: test that could be done once has been extracted from the loop