Alexander Alekhin [Fri, 19 Jun 2020 07:33:50 +0000 (07:33 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 19 Jun 2020 07:21:19 +0000 (07:21 +0000)]
Merge pull request #17587 from tomoaki0705:fixCUDAOptflowJetson
Tomoaki Teshima [Thu, 18 Jun 2020 22:56:37 +0000 (07:56 +0900)]
fix build on Jetson TX1 and TX2
* enable_if_t is a c++14 feature
Alexander Alekhin [Thu, 18 Jun 2020 20:54:28 +0000 (20:54 +0000)]
Merge pull request #17581 from tomoaki0705:fixCudaAsync
Alexander Alekhin [Thu, 18 Jun 2020 20:52:33 +0000 (20:52 +0000)]
Merge pull request #17578 from Bleach665:fix_win_eigen_build
Alexander Alekhin [Thu, 18 Jun 2020 20:51:52 +0000 (20:51 +0000)]
Merge pull request #17577 from philippefoubert:branch_color_yuv_simd
Philippe FOUBERT [Thu, 18 Jun 2020 09:48:43 +0000 (11:48 +0200)]
Fix the build of imgproc using MinGW (variables with the same name as symbols defined in MinGW headers)
Tomoaki Teshima [Thu, 18 Jun 2020 12:25:15 +0000 (21:25 +0900)]
fix build error on Jetson TX1 and TX2
* enable_if_t and is_base_of is c++14 feature
* override is c++11 feature
Yuriy Obukh [Thu, 18 Jun 2020 11:31:11 +0000 (14:31 +0300)]
fix VS Windows build with eigen. https://github.com/opencv/opencv/issues/17548
Alex Cohn [Thu, 18 Jun 2020 07:40:43 +0000 (10:40 +0300)]
Merge pull request #17573 from alexcohn:fix/android_windows_build
* fixing #17572
https://github.com/opencv/opencv/issues/17572 Build for Android failed: "can't concat str to bytes"
on Windows 10 64bit with python 3.6.6
* similar to changes in platforms/winpack_dldt/build_package.py
Alexander Alekhin [Thu, 18 Jun 2020 07:39:14 +0000 (07:39 +0000)]
Merge pull request #17571 from tomoaki0705:fixAutomaticCC
Alexander Alekhin [Thu, 18 Jun 2020 07:38:16 +0000 (07:38 +0000)]
Merge pull request #17568 from alalek:cleanup_17527
Tomoaki Teshima [Wed, 17 Jun 2020 13:02:51 +0000 (22:02 +0900)]
fix build error of automatic CC detection
Alexander Alekhin [Tue, 16 Jun 2020 02:14:04 +0000 (02:14 +0000)]
cudacodec(build): fix detection in CMake, cleanup duplicate includes
Yashas Samaga B L [Wed, 17 Jun 2020 09:07:52 +0000 (14:37 +0530)]
Merge pull request #17534 from YashasSamaga:cuda4dnn-remove-unused-funcs
cuda4dnn: reduce CUDA version requirements to at least CUDA 9.2
* remove half2 specializations
* do not remove atomicAdd for half in CUDA 10 and below
* remove fp16.hpp
NesQl [Wed, 17 Jun 2020 09:05:04 +0000 (17:05 +0800)]
Merge pull request #17468 from liqi-c:sharedlib_build_problem
TEngine installation rules fix for static build
* Modify cmake config error for -DBUILD_SHARED_LIBS=OFF
* Modify for not install tengine include directory
* Update compile error.
* move install command to tengine/CMakeLists.txt
* rm include dir when make install,only build static lib will install libtengine.a
Alexander Alekhin [Wed, 17 Jun 2020 08:45:55 +0000 (08:45 +0000)]
Merge pull request #17564 from l-bat:fix_yolov4
Alexander Alekhin [Wed, 17 Jun 2020 07:58:35 +0000 (07:58 +0000)]
Merge pull request #17555 from komakai:objc-fix-sift
Liubov Batanina [Tue, 16 Jun 2020 17:09:25 +0000 (20:09 +0300)]
Changed StridedSlice to VariadicSplit in Region layer
Alexander Alekhin [Tue, 16 Jun 2020 20:06:56 +0000 (20:06 +0000)]
Merge pull request #17556 from nglee:dev_optFlowTVL1Async
Alexander Alekhin [Tue, 16 Jun 2020 19:53:51 +0000 (19:53 +0000)]
Merge pull request #17561 from thatoddmailbox:android-fix-disable-samples
Pinaev Danil [Tue, 16 Jun 2020 19:48:09 +0000 (22:48 +0300)]
Merge pull request #16772 from aDanPin:dp/performance_render_tests
Added g-api render performance tests
* Add render performance tests for BGROCV
* Add render NV12 performance tests
* Review response
* Review response
* Review response
* Review response
* Review response
* Review response
* Just a small fix
* Final review response I hope)
* Review response
* Review response
* Review response
* Review response
* Review response
* Review response
Namgoo Lee [Tue, 16 Jun 2020 16:04:22 +0000 (01:04 +0900)]
cuda optflow tvl1 : async safety
also modify cuda canny to use createTextureObjectPitch2D, etc.
Alex Studer [Tue, 16 Jun 2020 04:11:26 +0000 (00:11 -0400)]
platforms/android: fix --no_samples_build flag not working
Giles Payne [Mon, 15 Jun 2020 23:15:27 +0000 (08:15 +0900)]
Cleanup unneeded raw pointer handling code
Alexander Alekhin [Mon, 15 Jun 2020 19:26:11 +0000 (19:26 +0000)]
Merge pull request #17557 from alalek:backport_17554
Alexander Alekhin [Mon, 15 Jun 2020 18:38:19 +0000 (18:38 +0000)]
Merge pull request #17533 from alalek:fix_dumpInputArray_nd_case
Ilya Lavrenov [Mon, 15 Jun 2020 13:02:52 +0000 (16:02 +0300)]
Removed plugin dispatcher
backport of commit
74113737f3710069e5ae2daff09e77c824dd5a2b
Alexander Alekhin [Mon, 15 Jun 2020 18:02:03 +0000 (18:02 +0000)]
Merge pull request #17554 from ilya-lavrenov:plugin-dispatcher
Namgoo Lee [Mon, 15 Jun 2020 16:43:51 +0000 (01:43 +0900)]
CUDA_OptFlow/OpticalFlowDual_TVL1 Asynchronous test
Giles Payne [Mon, 15 Jun 2020 14:17:19 +0000 (23:17 +0900)]
Use cv::Ptr instead of raw pointers
Giles Payne [Mon, 15 Jun 2020 14:16:22 +0000 (23:16 +0900)]
Fix testFitEllipse test
Giles Payne [Mon, 15 Jun 2020 14:15:05 +0000 (23:15 +0900)]
Fix framework_name option in build script
Ilya Lavrenov [Mon, 15 Jun 2020 13:02:52 +0000 (16:02 +0300)]
Removed plugin dispatcher
Alexander Alekhin [Sun, 14 Jun 2020 11:08:53 +0000 (11:08 +0000)]
Merge pull request #17540 from YashasSamaga:cuda4dnn-update-mish
Alexander Alekhin [Sun, 14 Jun 2020 11:08:16 +0000 (11:08 +0000)]
Merge pull request #17527 from tomoaki0705:detectCuvidHeader
Alexander Alekhin [Sat, 13 Jun 2020 18:36:34 +0000 (18:36 +0000)]
Merge pull request #17537 from Murazaki:patch-1
YashasSamaga [Sat, 13 Jun 2020 11:23:27 +0000 (16:53 +0530)]
improve mish performance and accuracy
Alexander Alekhin [Fri, 12 Jun 2020 22:20:50 +0000 (22:20 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 12 Jun 2020 22:18:04 +0000 (22:18 +0000)]
Merge pull request #17536 from ilya-lavrenov:remove-error-listener
Mehdi Zakaria Benadel [Fri, 12 Jun 2020 18:59:43 +0000 (20:59 +0200)]
Fix typo
This typo just made me lose my mind on the conan package update. please merge.
Alexander Alekhin [Fri, 12 Jun 2020 21:24:34 +0000 (21:24 +0000)]
Merge pull request #17538 from alalek:dnn_openvino_2020.3.0
Ilya Lavrenov [Fri, 12 Jun 2020 17:27:21 +0000 (20:27 +0300)]
Removed error lisneter usage
Alexander Alekhin [Tue, 7 Apr 2020 13:17:21 +0000 (16:17 +0300)]
dnn: use OpenVINO 2020.3 defines
Alexander Alekhin [Fri, 12 Jun 2020 10:07:58 +0000 (10:07 +0000)]
core: fix handling of ND-arrays in dumpInputArray() helpers
Alexander Alekhin [Fri, 12 Jun 2020 09:44:42 +0000 (09:44 +0000)]
Merge pull request #17143 from cyyever:detect_mkl_installed_by_nuget
cyy [Sat, 29 Feb 2020 10:59:43 +0000 (18:59 +0800)]
improve the mkl search procedure
Alexander Alekhin [Fri, 12 Jun 2020 06:58:14 +0000 (06:58 +0000)]
Merge pull request #17341 from hunter-college-ossd-spr-2020:3.4-1
Alexander Alekhin [Fri, 12 Jun 2020 06:55:34 +0000 (06:55 +0000)]
Merge pull request #17528 from YashasSamaga:cuda4dnn-fix-tests43
Jessica Wong [Thu, 21 May 2020 12:36:19 +0000 (08:36 -0400)]
Added information to OpenCV documentation [MacOS]
Added and Edited specific information to the "Installation in MacOS" OpenCV documentation.
Closes #17340
Tomoaki Teshima [Thu, 11 Jun 2020 14:06:18 +0000 (23:06 +0900)]
fix corner case of libnvcuvid
* detect header automatically and not based on version number
YashasSamaga [Thu, 11 Jun 2020 14:01:48 +0000 (19:31 +0530)]
allow multiple inputs to resize, fix tests
Alexander Alekhin [Wed, 10 Jun 2020 12:13:06 +0000 (12:13 +0000)]
Merge pull request #17511 from mshabunin:fix-kw-issues-34
Maksim Shabunin [Mon, 8 Jun 2020 13:39:23 +0000 (16:39 +0300)]
QRDetectMulti: refactored checkPoints method
Maksim Shabunin [Mon, 8 Jun 2020 18:57:27 +0000 (21:57 +0300)]
dnn/NGraph: added nullptr checks
Rasmus [Wed, 10 Jun 2020 07:53:18 +0000 (09:53 +0200)]
Merge pull request #17368 from themightyoarfish:cv2eigen-doc
* Add documentation about usage of cv2eigen functions in eigen.hpp
* Fixed Doxygen syntax.
Co-authored-by: Alexander Smorkalov <smorkalov.a.m@gmail.com>
Alexander Alekhin [Wed, 10 Jun 2020 07:01:04 +0000 (07:01 +0000)]
Merge pull request #17492 from cyyever:fix_data_race
Gourav Roy [Wed, 10 Jun 2020 06:53:18 +0000 (12:23 +0530)]
Merge pull request #16955 from themechanicalcoder:text_recognition
* add text recognition sample
* fix pylint warning
* made changes according to the c++ example
* fix errors
* add text recognition sample
* update text detection sample
Alexander Alekhin [Tue, 9 Jun 2020 11:11:39 +0000 (11:11 +0000)]
Merge pull request #17509 from mshabunin:fix-kw-issues
Alexander Alekhin [Tue, 9 Jun 2020 09:31:16 +0000 (09:31 +0000)]
Merge pull request #17507 from alalek:update_ffmpeg_4.4
Maksim Shabunin [Mon, 8 Jun 2020 13:39:23 +0000 (16:39 +0300)]
QRDetectMulti: refactored checkPoints method
Maksim Shabunin [Mon, 8 Jun 2020 18:57:27 +0000 (21:57 +0300)]
dnn/NGraph: added nullptr checks
Alexander Alekhin [Tue, 9 Jun 2020 07:51:59 +0000 (07:51 +0000)]
Merge pull request #17504 from alalek:update_ffmpeg_3.4
cyy [Tue, 9 Jun 2020 07:49:31 +0000 (15:49 +0800)]
use C++11 static variables as memory barrier
Alexander Alekhin [Tue, 9 Jun 2020 02:54:52 +0000 (02:54 +0000)]
ffmpeg/4.4: update FFmpeg wrapper
- FFmpeg 4.2.3
Alexander Alekhin [Tue, 9 Jun 2020 07:39:10 +0000 (07:39 +0000)]
Merge pull request #17506 from alalek:update_version_4.4.0-pre
Alexander Alekhin [Tue, 9 Jun 2020 02:27:13 +0000 (02:27 +0000)]
pre: OpenCV 4.4.0 (version++)
Alexander Alekhin [Mon, 8 Jun 2020 21:03:05 +0000 (21:03 +0000)]
ffmpeg/3.4: update FFmpeg wrapper
- FFmpeg 3.4.7
Alexander Alekhin [Mon, 8 Jun 2020 19:50:55 +0000 (19:50 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 8 Jun 2020 19:35:34 +0000 (19:35 +0000)]
Merge pull request #17501 from alalek:update_version_3.4.11-pre
Alexander Alekhin [Mon, 8 Jun 2020 18:46:27 +0000 (18:46 +0000)]
pre: OpenCV 3.4.11 (version++)
Alexander Alekhin [Mon, 8 Jun 2020 18:38:56 +0000 (18:38 +0000)]
Merge pull request #17498 from alalek:update_tbb
Giles Payne [Mon, 8 Jun 2020 18:32:53 +0000 (03:32 +0900)]
Merge pull request #17165 from komakai:objc-binding
Objc binding
* Initial work on Objective-C wrapper
* Objective-C generator script; update manually generated wrappers
* Add Mat tests
* Core Tests
* Imgproc wrapper generation and tests
* Fixes for Imgcodecs wrapper
* Miscellaneous fixes. Swift build support
* Objective-C wrapper build/install
* Add Swift wrappers for videoio/objdetect/feature2d
* Framework build;iOS support
* Fix toArray functions;Use enum types whenever possible
* Use enum types where possible;prepare test build
* Update test
* Add test runner scripts for iOS and macOS
* Add test scripts and samples
* Build fixes
* Fix build (cmake 3.17.x compatibility)
* Fix warnings
* Fix enum name conflicting handling
* Add support for document generation with Jazzy
* Swift/Native fast accessor functions
* Add Objective-C wrapper for calib3d, dnn, ml, photo and video modules
* Remove IntOut/FloatOut/DoubleOut classes
* Fix iOS default test platform value
* Fix samples
* Revert default framework name to opencv2
* Add converter util functions
* Fix failing test
* Fix whitespace
* Add handling for deprecated methods;fix warnings;define __OPENCV_BUILD
* Suppress cmake warnings
* Reduce severity of "jazzy not found" log message
* Fix incorrect #include of compatibility header in ios.h
* Use explicit returns in subscript/get implementation
* Reduce minimum required cmake version to 3.15 for Objective-C/Swift binding
Alexander Alekhin [Mon, 8 Jun 2020 18:07:08 +0000 (18:07 +0000)]
Merge pull request #17497 from alalek:fix_ffmpeg_wrapper_build
Alexander Alekhin [Mon, 8 Jun 2020 11:04:33 +0000 (11:04 +0000)]
3rdparty: update TBB 2020.1 => 2020.2
https://github.com/oneapi-src/oneTBB/releases/tag/v2020.2
Alexander Alekhin [Mon, 8 Jun 2020 09:17:13 +0000 (09:17 +0000)]
videoio: fix plugins build
Alexander Alekhin [Sat, 6 Jun 2020 19:37:11 +0000 (19:37 +0000)]
Merge pull request #17485 from sitic:stitching
Alexander Alekhin [Fri, 5 Jun 2020 19:54:41 +0000 (19:54 +0000)]
Merge pull request #17471 from asmorkalov:as/video_capability_check
Maksim Shabunin [Fri, 5 Jun 2020 17:55:53 +0000 (20:55 +0300)]
Merge pull request #17431 from mshabunin:support-vtk9
* Added VTK 9 support
Jan Lebert [Fri, 5 Jun 2020 17:35:26 +0000 (19:35 +0200)]
Fix '--help' of stitching_detailed.py sample
Fixes the help for `--features`, previously listed all possible values as default value.
Also adds the default value to the help for two other arguments
Alexander Alekhin [Fri, 5 Jun 2020 10:37:48 +0000 (10:37 +0000)]
Merge pull request #17474 from komakai:ndk-side-by-side
Alexander Alekhin [Thu, 4 Jun 2020 21:51:22 +0000 (00:51 +0300)]
Merge pull request #17350 from AsyaPronina:gapi_ocv_stateful_kernel
Enable stateful kernels in G-API OCV Backend
AsyaPronina [Thu, 4 Jun 2020 16:55:49 +0000 (19:55 +0300)]
Enable stateful kernels in G-API OCV Backend
Alexander Alekhin [Thu, 4 Jun 2020 17:55:00 +0000 (17:55 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 4 Jun 2020 17:32:08 +0000 (17:32 +0000)]
Merge pull request #17466 from alalek:build_opencv_winpack_dldt_2020.3.0
Alexander Alekhin [Thu, 4 Jun 2020 17:10:04 +0000 (17:10 +0000)]
Merge pull request #17432 from tomoaki0705:automaticCC
Fernando Martin [Thu, 4 Jun 2020 17:07:54 +0000 (18:07 +0100)]
Merge pull request #17473 from f3rm4rf3r:fixingFourCCDocBrokenLink
* - Fixing broken URL to mp4ra website
* - Fixing broken URL to mp4ra website (in C videoio API)
Giles Payne [Thu, 4 Jun 2020 12:07:30 +0000 (21:07 +0900)]
Add handling for Android "NDK (Side by side)"
Alexander Alekhin [Thu, 4 Jun 2020 10:32:30 +0000 (10:32 +0000)]
Merge pull request #17469 from l-bat:fix_virtual_try_on
Alexander Alekhin [Thu, 4 Jun 2020 08:47:43 +0000 (08:47 +0000)]
Merge pull request #17455 from mshabunin:check-count-non-zero
Alexander Smorkalov [Thu, 4 Jun 2020 06:59:09 +0000 (09:59 +0300)]
Skip some GAPI tests if VideoCapture is not capable to playback video.
Liubov Batanina [Thu, 4 Jun 2020 06:36:52 +0000 (09:36 +0300)]
Fixed virtual try on sample
Alexander Alekhin [Wed, 3 Jun 2020 23:46:08 +0000 (23:46 +0000)]
build: winpack_dldt with dldt 2020.3.0
https://github.com/openvinotoolkit/openvino/releases/tag/2020.3.0
Maksim Shabunin [Tue, 2 Jun 2020 14:53:30 +0000 (17:53 +0300)]
Added countNonZero test for big arrays and disable IPP for some cases
Alexander Alekhin [Wed, 3 Jun 2020 12:55:55 +0000 (12:55 +0000)]
Merge pull request #17369 from themightyoarfish:doc-essential-matrix-different-cameras
Alexander Alekhin [Tue, 2 Jun 2020 12:42:04 +0000 (12:42 +0000)]
Merge pull request #17430 from alalek:issue_17257
Alexander Alekhin [Tue, 2 Jun 2020 12:40:06 +0000 (12:40 +0000)]
Merge pull request #17447 from alalek:dnn_ie_extract_layers
Rasmus Diederichsen [Mon, 25 May 2020 13:06:05 +0000 (15:06 +0200)]
Add instructions for how to use findEssentialMat() when camera matrices are different
Alexander Alekhin [Mon, 1 Jun 2020 20:43:35 +0000 (20:43 +0000)]
dnn(ie): fix layers extraction
Tomoaki Teshima [Mon, 1 Jun 2020 20:07:53 +0000 (05:07 +0900)]
select the architecture based on nvcc result
* cache the result
* DRY
* brush up based on review