Commit Graph

25466 Commits

Author SHA1 Message Date
Alexander Alekhin
8cedc052ca Merge pull request #13841 from dkurt:dnn_ie_future_3 2019-02-19 14:19:36 +00:00
Alexander Alekhin
6e34d2778f Merge pull request #13865 from lsr0:flann_cudacc 2019-02-19 14:03:54 +00:00
Lindsay Roberts
7c72e095fa Fix Flann compilation under nvcc + NEON
All <arm_neon.h> includes in core/cv_cpu_dispatch.h are protected by an
ifndef __CUDACC__ to prevent attempting to use neon intrinsics when
compiling cuda kernels (.cu) -- this prevents hard errors such as
  error: identifier "__builtin_neon_qi" is undefined

Add this same protection to flann/dist.h to fix compilation involving
flann.hpp.
2019-02-19 15:11:01 +02:00
Alexander Alekhin
aebb66682b Merge pull request #13857 from LaurentBerger:bug13853 2019-02-19 10:34:30 +00:00
Dmitry Kurtaev
ca5976e3d4 Fix IE backend considering future changes. 2019-02-18 19:26:04 +03:00
LaurentBerger
9e94212eac Solves bug 13853 2019-02-18 17:15:05 +01:00
Alexander Alekhin
3bba5b5a31 Merge pull request #13850 from nglee:dev_FixCudaStereoBMHangRace 2019-02-18 14:50:03 +00:00
Alexander Alekhin
9b71f5fd54 Merge pull request #13835 from catree:real_time_pose_tutorial_keypoints_matching 2019-02-18 14:39:10 +00:00
Alexander Alekhin
428720f490 Merge pull request #13833 from alalek:core_dispatch_matmul 2019-02-18 13:38:44 +00:00
catree
3c92d40f6e Fix arguments parsing. Add possibility to choose between different features type. Add keypoints matching visualization. Auto format code. 2019-02-18 14:15:44 +01:00
Alexander Alekhin
cd66f6e3db core: dispatch matmul
- gemm: keep baseline only (lapack is 10x+ faster, lets reduce binary size)
- transform / distTransform
- scaleAdd (32f/64f only)
- Mahalanobis: keep baseline only (no perf tests)
- mulTransposed: keep baseline only (no perf tests)
- dot
2019-02-18 14:36:46 +03:00
Namgoo Lee
1a961660d8 cuda::StereoBM - fix hanging and racing issue
- Fix hanging issue on 2080 Ti
- Fix racing issue
2019-02-18 06:03:12 +00:00
Alexander Alekhin
9d3d5e9d65 Merge pull request #13774 from l-bat:fix-IE-tests 2019-02-15 13:54:24 +00:00
Alexander Alekhin
fbde57dba8 core: keep history of matmul.cpp 2019-02-14 19:07:41 +03:00
Alexander Alekhin
dcee7b1605 core: clone matmul.dispatch.cpp 2019-02-14 19:07:37 +03:00
Alexander Alekhin
b769ad2c23 core: clone matmul.simd.hpp 2019-02-14 19:07:37 +03: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