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
Andrey Pavlenko
1cc58f9770
Merge pull request #1698 from ilya-lavrenov:ocl_warp
2013-10-28 18:59:08 +04:00
Ilya Lavrenov
7afbae57ba
fixed ocl::minMax for FP-types
2013-10-28 18:49:16 +04:00
Ilya Lavrenov
eb2f8a2948
ocl tests: show diff when cv::countNonZero(diff) > 0
2013-10-28 18:20:02 +04:00
Ilya Lavrenov
1f7f9c9682
rewrote and generalized ocl::threshold
2013-10-28 18:11:24 +04:00
Ilya Lavrenov
e70dfe5a50
fixed OpenCL morph operations for case when kernel does not have zero element
2013-10-28 16:46:41 +04:00
Ilya Lavrenov
ee8f0a3f36
ocl example typo
2013-10-28 14:09:30 +04:00
Ilya Lavrenov
cf5df1a7e7
fixed ocl::flip
2013-10-28 13:57:29 +04:00
Roman Donchenko
d3bcf609f1
Merge pull request #1657 from KonstantinMatskevich:ocldistanceToCenters
2013-10-28 13:46:32 +04:00
Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
yao
0fd872bfa9
fix bug #1480
2013-10-28 17:36:43 +08:00
yao
632452cdd8
fix the mismatch running on cpu devices
2013-10-28 16:32:46 +08:00
Roman Donchenko
88f5ef9acc
Merge pull request #1696 from apavlenko:fix_typo_GpuMaterials
2013-10-28 12:18:42 +04:00
Peng Xiao
ab2bd58f5c
Fixed a missing barrier.
2013-10-28 14:17:59 +08:00
Vladislav Vinogradov
06c1f9a329
added own version of FindCUDA.cmake
2013-10-28 10:09:16 +04:00
konstantin
973137c78e
fix bugs on host and device sides for imgprog_sobel3.cl
2013-10-28 00:14:07 +04:00
Alexander Alekhin
eb4f50ca59
ocl: Canny: port CUDA-based implementation of edgesHysteresisLocal
2013-10-28 00:10:47 +04:00
Ilya Lavrenov
900c303636
added performance tests for ocl::bitwise_or and ocl::bitwose_xor
2013-10-27 20:08:50 +04:00
Alexander Alekhin
9e527fc9f4
ocl: Canny: replace unsafe buffer to oclMat
2013-10-27 18:55:42 +04:00
Ilya Lavrenov
839245e420
fixed tests for ocl::warpAffine and ocl::warpPerspective
2013-10-27 14:49:37 +04:00
konstantin
ddd2b106fb
rename imageproc_sobel2.cl -> imageproc_sobel3.cl for consistency
2013-10-25 21:44:01 +04:00
Roman Donchenko
c1223f8dac
Merge pull request #1697 from SpecLad:sdk-redux
2013-10-25 20:32:04 +04:00
Andrey Pavlenko
66e5be2d64
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
2013-10-25 19:47:38 +04:00
Andrey Pavlenko
fc64a4071c
Merge pull request #1689 from ilya-lavrenov:ocl_bilateralFilter
2013-10-25 19:41:56 +04:00
Andrey Pavlenko
4e57f92e6e
Merge pull request #1692 from ilya-lavrenov:ocl_separableFilter
2013-10-25 19:39:21 +04:00
Andrey Pavlenko
d60924f4f2
Merge pull request #1694 from apavlenko:fix_typo
2013-10-25 19:35:19 +04:00
Andrey Pavlenko
92c43a8646
Merge pull request #1693 from ilya-lavrenov:ocl_adaptiveBilateralFilter
2013-10-25 19:34:33 +04:00
Roman Donchenko
90f8906e1e
Merge pull request #1690 from SpecLad:cmake-2.8.12
2013-10-25 19:24:58 +04:00
Roman Donchenko
c016c43d25
Fixed Android SDK build - again.
2013-10-25 19:12:32 +04:00
Andrey Pavlenko
2e5db6e56c
fixing typo
2013-10-25 18:53:24 +04:00
Andrey Pavlenko
2b6fca68bf
fixing typo
2013-10-25 18:00:46 +04:00
Roman Donchenko
55ede74022
Merge pull request #1680 from alalek:cmake_fix_android_builds
2013-10-25 17:32:34 +04:00
Ilya Lavrenov
e1596d69cc
fixed extrapolation in ocl::adaptiveBilateralFilter
2013-10-25 17:29:21 +04:00
Alexander Alekhin
7a8f9fe746
cmake: fix android installation for different NDK ABIs
2013-10-25 17:17:00 +04:00
Ilya Lavrenov
b33a62beb0
fixed separable filter extrapolation
2013-10-25 17:08:44 +04:00
Vadim Pisarevsky
485d36d3c0
changed InputArray's enumeration constant for UMat, since it may potentially conflict with existing OpenCL module. refactored Kernel's setArg API (now UMat is passed to a kernel as a structure, as Alexander A suggested). removed Kernel's cleanup callback from the external API; now each kernel keeps track of used matrices and they are dereferenced after it's complete.
2013-10-25 16:46:03 +04:00
Roman Donchenko
36b5180aa1
Another FFmpeg fix from master.
...
From commit dd74a851
, to be exact. Now cap_ffmpeg.cpp should actually
build if HAVE_FFMPEG is true.
Also modified some gpu sources in a similar manner.
2013-10-25 16:08:14 +04:00