Ilya Lavrenov
16df5b007d
disabled upload and download perf tests
2013-10-30 17:08:57 +04:00
Ilya Lavrenov
c674d3cf49
fixed ocl::norm (with NORM_RELATIVE specified) when norm(src2) == 0
2013-10-30 16:48:12 +04:00
Alexander Alekhin
0104f59feb
ocl: filter2D: fix processing of kernel with double datatype
2013-10-30 16:27:46 +04:00
Roman Donchenko
104b14e0e0
Fixed CMake warnings/bugs caused by #1670 and #1714
...
include() doesn't create a variable scope, so the settings of
CMAKE_MODULE_PATH and CMAKE_FIND_ROOT_PATH_MODE_* were polluting
everything included after OpenCVDetectCUDA.cmake.
Also, FindCUDA includes FindPackageHandleStandardArgs, which includes
CMakeParseArguments, which causes warnings related to policy CMP0017.
Setting it to NEW seems safe enough.
2013-10-30 16:21:50 +04:00
Roman Donchenko
c70fbb95a3
Merge pull request #1712 from alalek:ocl_split
2013-10-30 16:18:50 +04:00
Ilya Lavrenov
8dfde47f89
changed eps in ocl::GaussianBlur test
2013-10-30 16:04:48 +04:00
Alexander Alekhin
7b0f018a74
ocl: adjust worksize for filter2D and boxFilter
2013-10-30 15:30:47 +04:00
Roman Donchenko
4bc105c40b
Merge pull request #1652 from nghiaho12:kalman
2013-10-30 15:11:26 +04:00
Alexander Alekhin
50d2c1066b
ocl: split: update tests and implementation
2013-10-30 14:08:37 +04:00
Roman Donchenko
d07e7897a0
Fixed building with OpenCL, but without the ocl module.
...
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
2013-10-30 14:07:34 +04:00
Roman Donchenko
8a4f1bbbdf
Merge pull request #1714 from jet47:find-cuda-fix
2013-10-30 13:27:41 +04:00
Alexander Smorkalov
994e07db07
Bug #3276 Java bindings binary compatibility is broken in branch 2.4 fixed.
...
New version of Java wrappers' generator uses different wrappers for VideoCapture
on Android and desktop to prevent binary compatibility issues.
2013-10-30 12:51:49 +04:00
Roman Donchenko
d11921f1a4
Merge pull request #1675 from krodyush:opencl-optimization
2013-10-30 12:28:31 +04:00
Roman Donchenko
9f162cb8d3
Merge pull request #1713 from pengx17:patch-2
2013-10-30 12:27:11 +04:00
Vladislav Vinogradov
5e75a22559
fixed find package CUDA for cross-compilation
...
replaced find_host_package with find_package and
set CMAKE_FIND_ROOT_PATH_MODE_LIBRARY to BOTH, because NEVER
doesn't work for CUDA_CUDA_LIBRARY, which is located in
/usr/arm-linux-gnueabihf/lib/libcuda.so for ARM
2013-10-30 12:10:35 +04:00
Jin Ma
7469c2eb9d
fixed a bug when double is not supported.
2013-10-30 14:37:13 +08:00
Peng Xiao
252f13f53e
Fix a typo
2013-10-30 10:36:28 +08:00
Ilya Lavrenov
bf6b5ee925
fixed extrapolation for ocl::cornerMinEigenVal and ocl::cornerHarris; enabled CV_32FC1 for the first function
2013-10-29 19:59:21 +04:00
Roman Donchenko
d6a7a6d503
VideoCapture: copy the captured frame, to avoid dangling Mats
...
Previously, VideoCapture::retrieve would return a Mat that referenced
the internal IplImage. Since the latter is rewritten every time a
frame is captured, it means that if the user captures two frames in a row,
the first frame would reference nothing. Similar if a user captures a frame,
then destroys the VideoCapture instance.
Note that the other branch of the if isn't affected, since flip allocates
a new Mat.
2013-10-29 18:47:08 +04:00
Roman Donchenko
03bbee327b
Merge pull request #1486 from nzjrs:cv2-logpolar
2013-10-29 16:15:57 +04:00
Roman Donchenko
f68b73f831
Merge pull request #1521 from nailbiter:optimCG
2013-10-29 16:14:32 +04:00
Roman Donchenko
334292083e
Merge pull request #1629 from lluisgomez:er_tree_clean_bug_fix
2013-10-29 16:03:51 +04:00
Jin Ma
b6b190df5c
Rewrote moments of opencl version.
2013-10-29 18:05:29 +08:00
Roman Donchenko
957c85e9c4
Merge pull request #1670 from jet47:cuda-cmake-fix
2013-10-29 13:24:14 +04:00
Roman Donchenko
75087580de
Merge pull request #1704 from SpecLad:merge-2.4
2013-10-29 13:13:05 +04:00
Andrey Pavlenko
616db74e49
Merge pull request #1663 from vpisarev:ocl_experiments3
2013-10-29 11:14:16 +04:00
Andrey Pavlenko
c5e8a9a29b
Merge pull request #1702 from alalek:ocl_memory_corruption_check
2013-10-29 11:07:04 +04:00
Andrey Pavlenko
c6a01f2641
Merge pull request #1688 from alalek:ocl_fix_filters
2013-10-29 11:05:10 +04:00
Andrey Pavlenko
ea64589164
Merge pull request #1687 from bitwangyaoyao:2.4_fix
2013-10-29 11:03:34 +04:00
Andrey Pavlenko
f4b8babbc8
Merge pull request #1677 from pengx17:patch-1
2013-10-29 11:00:26 +04:00
Andrey Pavlenko
42c4f91ef4
Merge pull request #1495 from StevenPuttemans:bugfix_3282
2013-10-29 10:51:01 +04:00
Andrey Pavlenko
9bfa346c38
Merge pull request #1544 from ilya-lavrenov:ocl_blendLinear
2013-10-29 10:49:46 +04:00
Andrey Pavlenko
e52459a324
Merge pull request #1708 from ilya-lavrenov:ocl_threshold
2013-10-29 10:43:44 +04:00
Andrey Pavlenko
106d5eda5f
Merge pull request #1700 from ilya-lavrenov:ocl_bitwise_perf
2013-10-29 10:43:27 +04:00
Andrey Pavlenko
acadfcff2d
Merge pull request #1707 from ilya-lavrenov:ocl_morph
2013-10-29 10:38:23 +04:00
Andrey Pavlenko
2b05dc7d1e
Merge pull request #1699 from ilya-lavrenov:ocl_minMax
2013-10-29 10:35:58 +04:00
Andrey Pavlenko
5fa6d70ab0
Merge pull request #1695 from ilya-lavrenov:ocl_showDiff
2013-10-29 10:35:42 +04:00
Ilya Lavrenov
c49c3e0a91
fixed and generalized ocl::blendLinear
2013-10-28 23:56:40 +04:00
Ilya Lavrenov
58be2546ca
fixed OpenCL morph operations for case when kernel does not have zero element
2013-10-28 20:09:49 +04:00
Alexander Alekhin
b10e1e5c7e
ocl: filters: update documentation
2013-10-28 20:09:49 +04:00
Alexander Alekhin
98f73705df
ocl: fix morph filters
2013-10-28 20:09:49 +04:00
Alexander Alekhin
0f95f0d8b3
ocl: rewrite filter2D
2013-10-28 20:09:49 +04:00
Alexander Alekhin
0bf9ece998
ocl: rewrite boxFilter
2013-10-28 20:09:49 +04:00
Alexander Alekhin
cb6ea8bfa1
ocl: update filter tests
2013-10-28 20:09:49 +04:00
Roman Donchenko
529f086b62
Merge pull request #1691 from SpecLad:ffmpeg-test
2013-10-28 19:35:08 +04:00
Alexander Alekhin
447c052e59
ocl: memory corruption check
2013-10-28 19:33:00 +04:00
Roman Donchenko
766a3511c6
Merge pull request #1706 from ilya-lavrenov:example_fix
2013-10-28 19:05:19 +04:00
Andrey Pavlenko
95bd32b516
Merge pull request #1705 from ilya-lavrenov:ocl_flip
2013-10-28 19:02:24 +04:00
Andrey Pavlenko
bb15c00665
Merge pull request #1703 from bitwangyaoyao:2.4_fix1480
2013-10-28 19:01:51 +04:00
Andrey Pavlenko
d3c0b36cd0
Merge pull request #1701 from alalek:ocl_fix_canny
2013-10-28 19:01:13 +04:00
