Alexander Alekhin
cb54f4c2ec
Merge pull request #17587 from tomoaki0705:fixCUDAOptflowJetson
2020-06-19 07:21:19 +00:00
Tomoaki Teshima
77fa1a20bf
fix build on Jetson TX1 and TX2
...
* enable_if_t is a c++14 feature
2020-06-19 07:56:37 +09:00
Alexander Alekhin
a7cdc42140
Merge pull request #17581 from tomoaki0705:fixCudaAsync
2020-06-18 20:54:28 +00:00
Alexander Alekhin
a8aa9d5ecb
Merge pull request #17578 from Bleach665:fix_win_eigen_build
2020-06-18 20:52:33 +00:00
Alexander Alekhin
52fbfb3ec0
Merge pull request #17577 from philippefoubert:branch_color_yuv_simd
2020-06-18 20:51:52 +00:00
Philippe FOUBERT
d25293b721
Fix the build of imgproc using MinGW (variables with the same name as symbols defined in MinGW headers)
2020-06-18 20:13:34 +00:00
Tomoaki Teshima
c07af090f5
fix build error on Jetson TX1 and TX2
...
* enable_if_t and is_base_of is c++14 feature
* override is c++11 feature
2020-06-18 21:25:15 +09:00
Yuriy Obukh
456e88a8a4
fix VS Windows build with eigen. https://github.com/opencv/opencv/issues/17548
2020-06-18 14:31:11 +03:00
Alex Cohn
a7cc1159cd
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
2020-06-18 10:40:43 +03:00
Alexander Alekhin
6bd87e8146
Merge pull request #17571 from tomoaki0705:fixAutomaticCC
2020-06-18 07:39:14 +00:00
Alexander Alekhin
42a4c3fba6
Merge pull request #17568 from alalek:cleanup_17527
2020-06-18 07:38:16 +00:00
Tomoaki Teshima
1cba763189
fix build error of automatic CC detection
2020-06-17 22:02:51 +09:00
Alexander Alekhin
d01cbe9320
cudacodec(build): fix detection in CMake, cleanup duplicate includes
2020-06-17 09:09:40 +00:00
NesQl
b10ab79743
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
2020-06-17 09:05:04 +00:00
Alexander Alekhin
619462b029
Merge pull request #17564 from l-bat:fix_yolov4
2020-06-17 08:45:56 +00:00
Liubov Batanina
d93b6be3cc
Changed StridedSlice to VariadicSplit in Region layer
2020-06-17 10:02:53 +03:00
Alexander Alekhin
9755ab160d
Merge pull request #17556 from nglee:dev_optFlowTVL1Async
2020-06-16 20:06:56 +00:00
Namgoo Lee
2043e06102
cuda optflow tvl1 : async safety
...
also modify cuda canny to use createTextureObjectPitch2D, etc.
2020-06-17 01:04:22 +09:00
Alexander Alekhin
c7dcdc0e88
Merge pull request #17557 from alalek:backport_17554
2020-06-15 19:26:11 +00:00
Alexander Alekhin
eb67dc9f50
Merge pull request #17533 from alalek:fix_dumpInputArray_nd_case
2020-06-15 18:38:19 +00:00
Ilya Lavrenov
676b818d6a
Removed plugin dispatcher
...
backport of commit 74113737f3
2020-06-15 18:03:14 +00:00
Namgoo Lee
411ce04f54
CUDA_OptFlow/OpticalFlowDual_TVL1 Asynchronous test
2020-06-16 01:43:51 +09:00
Alexander Alekhin
d321a34f7c
Merge pull request #17527 from tomoaki0705:detectCuvidHeader
2020-06-14 11:08:16 +00:00
Alexander Alekhin
fb1a58ac76
Merge pull request #17537 from Murazaki:patch-1
2020-06-13 18:36:34 +00:00
Alexander Alekhin
1644af841b
Merge pull request #17536 from ilya-lavrenov:remove-error-listener
2020-06-12 22:18:04 +00:00
Mehdi Zakaria Benadel
b0def9617f
Fix typo
...
This typo just made me lose my mind on the conan package update. please merge.
2020-06-12 23:52:06 +02:00
Alexander Alekhin
c2664d912a
Merge pull request #17538 from alalek:dnn_openvino_2020.3.0
2020-06-12 21:24:35 +00:00
Ilya Lavrenov
9697e3ac24
Removed error lisneter usage
2020-06-12 20:29:11 +00:00
Alexander Alekhin
d2a9efd039
dnn: use OpenVINO 2020.3 defines
2020-06-12 20:24:08 +00:00
Alexander Alekhin
442999dcdb
core: fix handling of ND-arrays in dumpInputArray() helpers
2020-06-12 10:23:32 +00:00
Alexander Alekhin
d753ae1489
Merge pull request #17143 from cyyever:detect_mkl_installed_by_nuget
2020-06-12 09:44:42 +00:00
cyy
db3e3be8ee
improve the mkl search procedure
2020-06-12 06:59:27 +00:00
Alexander Alekhin
0c8da03869
Merge pull request #17341 from hunter-college-ossd-spr-2020:3.4-1
2020-06-12 06:58:14 +00:00
Jessica Wong
0417c8c9c7
Added information to OpenCV documentation [MacOS]
...
Added and Edited specific information to the "Installation in MacOS" OpenCV documentation.
Closes #17340
2020-06-11 23:36:06 -04:00
Tomoaki Teshima
d4af89781b
fix corner case of libnvcuvid
...
* detect header automatically and not based on version number
2020-06-11 23:06:18 +09:00
Alexander Alekhin
a8c1cdf88e
Merge pull request #17511 from mshabunin:fix-kw-issues-34
2020-06-10 12:13:06 +00:00
Maksim Shabunin
7a187e9b5e
QRDetectMulti: refactored checkPoints method
2020-06-10 13:48:24 +03:00
Maksim Shabunin
9096b1c768
dnn/NGraph: added nullptr checks
2020-06-10 13:48:24 +03:00
Rasmus
781fbde449
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>
2020-06-10 07:53:18 +00:00
Gourav Roy
1b336bb602
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
2020-06-10 06:53:18 +00:00
Alexander Alekhin
0fb3b8db72
Merge pull request #17504 from alalek:update_ffmpeg_3.4
2020-06-09 07:51:59 +00:00
Alexander Alekhin
b44302382d
ffmpeg/3.4: update FFmpeg wrapper
...
- FFmpeg 3.4.7
2020-06-08 21:03:05 +00:00
Alexander Alekhin
458f1d5ebe
Merge pull request #17501 from alalek:update_version_3.4.11-pre
2020-06-08 19:35:34 +00:00
Alexander Alekhin
a43e3bebe6
pre: OpenCV 3.4.11 (version++)
2020-06-08 18:46:27 +00:00
Alexander Alekhin
f62fe956d1
Merge pull request #17498 from alalek:update_tbb
2020-06-08 18:38:57 +00:00
Alexander Alekhin
852b0226e0
3rdparty: update TBB 2020.1 => 2020.2
...
https://github.com/oneapi-src/oneTBB/releases/tag/v2020.2
2020-06-08 11:04:33 +00:00
Alexander Alekhin
ef3844a177
Merge pull request #17466 from alalek:build_opencv_winpack_dldt_2020.3.0
2020-06-04 17:32:09 +00:00
Alexander Alekhin
476aa443c6
Merge pull request #17432 from tomoaki0705:automaticCC
2020-06-04 17:10:04 +00:00
Fernando Martin
cb0f74ab9f
Merge pull request #17473 from f3rm4rf3r:fixingFourCCDocBrokenLink
...
* - Fixing broken URL to mp4ra website
* - Fixing broken URL to mp4ra website (in C videoio API)
2020-06-04 17:07:54 +00:00
Alexander Alekhin
08d1c54364
Merge pull request #17469 from l-bat:fix_virtual_try_on
2020-06-04 10:32:30 +00:00