Commit Graph

25451 Commits

Author SHA1 Message Date
Alexander Alekhin
9d3d5e9d65 Merge pull request #13774 from l-bat:fix-IE-tests 2019-02-15 13:54:24 +00:00
Alexander Alekhin
3c70d966cb Merge pull request #13823 from alalek:core_dispatch_countNonZero 2019-02-14 15:52:21 +00:00
Alexander Alekhin
d9b573795b Merge pull request #13726 from nicolaerosia:android-ffmpeg 2019-02-14 11:40:27 +00:00
Nicolae Rosia
3aaf8dfd11 cmake: allow FFmpeg linking on Android
details: https://github.com/opencv/opencv/pull/13726

In order to help CMake and PkgConfig find FFmpeg you need to:
1) export `PKG_CONFIG_LIBDIR=${SYSROOT}`
where `SYSROOT=${ANDROID_NDK}/sysroot`
2) Add `-DCMAKE_PREFIX_PATH=${FFMPEG_INSTALL_PREFIX}`
3) Append `-DCMAKE_FIND_ROOT_PATH=${FFMPEG_INSTALL_PREFIX}`
2019-02-14 13:58:15 +03:00
Alexander Alekhin
e3633ec4a2 core: dispatch count_non_zero 2019-02-14 13:16:20 +03:00
Alexander Alekhin
0b49680339 core: keep history of count_non_zero.cpp 2019-02-14 13:15:43 +03:00
Alexander Alekhin
439e43a027 core: clone count_non_zero.dispatch.cpp 2019-02-14 13:15:39 +03:00
Alexander Alekhin
af8a3a0b66 core: clone count_non_zero.simd.hpp 2019-02-14 13:15:39 +03:00
Liubov Batanina
183c0fcab1 Changed condition for resize and lrn layers 2019-02-14 13:11:14 +03:00
Alexander Alekhin
bd00471a89 Merge pull request #13808 from tailsu:sd/libtiff-4.0.10 2019-02-14 09:36:10 +00:00
Stefan Dragnev
ff1ec6ccc6 update to libtiff-4.0.10 2019-02-14 09:28:14 +01:00
Alexander Alekhin
86136c0ccc Merge pull request #13796 from alalek:core_dispatch_sum 2019-02-14 08:16:42 +00:00
Alexander Alekhin
087d9745b3 Merge pull request #13807 from tailsu:sd/libpng-1.6.36 2019-02-13 16:19:16 +00:00
Alexander Alekhin
b40a7ffbe4 core: dispatch sum 2019-02-13 18:17:38 +03:00
Stefan Dragnev
094615b2c5 update libpng to 1.6.36
* re-enabled NEON routines for arm64
2019-02-13 14:54:18 +01:00
Alexander Alekhin
c88e6b344b core: keep history of sum.cpp 2019-02-13 13:49:36 +03:00
Alexander Alekhin
6e88bff3e3 core: clone sum.dispatch.cpp 2019-02-13 13:49:29 +03:00
Alexander Alekhin
5aceac6b93 core: clone sum.simd.hpp 2019-02-13 13:49:29 +03:00
Alexander Alekhin
b12e1acdec Merge pull request #13810 from nglee:dev_CudaSafeBlockScan 2019-02-12 21:50:29 +00:00
Namgoo Lee
21eb60f88b cudalegacy: Use safe block scan function 2019-02-13 01:55:02 +09:00
Alexander Alekhin
b1caa4f4d5 Merge pull request #13803 from thangktran:thangktran/fix-misleading-runtime-assertion-calibrateCamera 2019-02-12 14:25:21 +00:00
Alexander Alekhin
9e7014b59f Merge pull request #13799 from dkurt:dnn_ie_future_2 2019-02-12 14:07:42 +00:00
Thang Tran
a1f4e65d03 calib3d: Fix calibrateCamera() misleading error
objectPoints and imagePoints are not checked whether they're empty and
cause checkVector() to fail, thus result in a wrong error message.

Fixes: https://github.com/opencv/opencv/issues/6002
2019-02-12 16:23:34 +03:00
Alexander Alekhin
f3d62c94b1 Merge pull request #13800 from dkurt:fix_nvidia_caffe 2019-02-12 13:02:22 +00:00
Alexander Alekhin
2e28ff78c1 Merge pull request #13780 from alalek:core_dispatch_convertTo 2019-02-12 12:08:30 +00:00
Dmitry Kurtaev
1606137df2 Read raw floats data from Caffe models 2019-02-11 20:08:17 +03:00
Dmitry Kurtaev
0711dab09d Fix Intel's Inference Engine backend from future. Second try. 2019-02-11 19:47:57 +03:00
Alexander Alekhin
5f57842575 Merge pull request #13794 from alalek:backport_13786 2019-02-11 14:05:43 +00:00
Alexander Alekhin
4e16ec2826 Merge pull request #13793 from vertextau:tutorial-fix 2019-02-11 12:39:35 +00:00
klemens
5d9c6723ee spelling fixes
backport 997b7b18af
2019-02-11 15:35:10 +03:00
Liubov Batanina
6b4becfd03 Enabled tests on IE backend 2019-02-11 12:39:28 +03:00
Oleh
c8777da2d6
Update video_input_psnr_ssim.markdown 2019-02-11 10:45:16 +02:00
Alexander Alekhin
b17c1c6721 Merge pull request #13782 from paroj:pypath 2019-02-09 15:26:11 +00:00
Alexander Alekhin
f8786c9bf4 Merge pull request #13783 from alalek:fix_13741 2019-02-09 15:25:48 +00:00
Pavel Rojtberg
f0ef4b2246 python: sys.path[0] is reserved for the main script 2019-02-08 17:24:31 +01:00
Alexander Alekhin
d32d576d6d core: dispatch convert_scale 2019-02-08 18:32:10 +03:00
Alexander Alekhin
39b90ae9fb core: dispatch convert 2019-02-08 18:32:10 +03:00
Alexander Alekhin
757d8ac8f7 Merge pull request #13769 from savuor:cvtColor_tests_16u_32f 2019-02-08 15:29:35 +00:00
Alexander Alekhin
5e2a81dc26 Merge pull request #13766 from dkurt:dnn_mask_rcnn_atrous 2019-02-08 15:23:46 +00:00
Alexander Alekhin
52050ebe32 Merge pull request #13760 from AnastasiaaSenina:fix-bug 2019-02-08 15:22:17 +00:00
Alexander Alekhin
33d477e049 core: keep history of convert_scale.cpp 2019-02-08 16:39:13 +03:00
Alexander Alekhin
c4abdb8050 core: clone convert_scale.dispatch.cpp 2019-02-08 16:38:50 +03:00
Alexander Alekhin
0af9e19be7 core: clone convert_scale.simd.hpp 2019-02-08 16:35:52 +03:00
Alexander Alekhin
b6a0acb8f6 core: keep history of convert.cpp 2019-02-08 16:29:54 +03:00
Alexander Alekhin
5527c41468 core: clone convert.dispatch.cpp 2019-02-08 16:29:16 +03:00
Alexander Alekhin
1629e29b98 core: clone convert.simd.hpp 2019-02-08 16:27:59 +03:00
Alexander Alekhin
3091d10b00 Merge pull request #13746 from allnes:fix_step_dnn 2019-02-08 10:18:43 +00:00
Alexander Alekhin
8f7e92e466 Merge pull request #13764 from nglee:dev_CudaCLAHE16bitSupport 2019-02-08 10:13:11 +00:00
AnastasiaaSenina
d7b1f28a90 fixed bug: added threshold for variables 'rotate_a', ' rotate_c' 2019-02-08 13:06:23 +03:00
Rostislav Vasilikhin
4e679e1cc5 disabled 16u and 32f perf tests 2019-02-07 19:26:36 +03:00