Roman Donchenko
|
029fce10c9
|
Merge remote-tracking branch 'origin/2.4'
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
|
2013-05-21 17:19:23 +04:00 |
|
peng xiao
|
bb4b410512
|
Add ocl::PlatformName to ocl::Info.
|
2013-04-25 15:00:50 +08:00 |
|
yao
|
40d0e0eda0
|
use host data when DEVICE_MEM_UHP is set (the risk of vary align size is owned by users)
|
2013-04-13 14:58:49 +08:00 |
|
Andrey Kamaev
|
b0933dd473
|
Merge pull request #803 from taka-no-me:split_c_cpp3
|
2013-04-12 15:01:48 +04:00 |
|
Andrey Kamaev
|
8406312571
|
Remove C API from OpenCL module
|
2013-04-12 14:37:02 +04:00 |
|
peng xiao
|
aec7a67d0f
|
Fix a bug of ocl::Canny when src/dst using the same buffer.
|
2013-04-12 11:10:47 +08:00 |
|
peng xiao
|
242955ce22
|
Format ocl::Canny header
|
2013-04-12 11:01:56 +08:00 |
|
peng xiao
|
77501f3ed0
|
ocl: Add dft based convolve implementation.
Match template in ocl module now can be utilized with dft based
convolve. Note this feature needs OpenCV to be built with clAmdFft
library.
|
2013-04-08 15:19:44 +08:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
Andrey Kamaev
|
49f6dad13f
|
Move cv::KeyPoint and cv::DMatch to core
|
2013-03-26 16:08:43 +04:00 |
|
Andrey Kamaev
|
be7bbe3aa9
|
Drop cv:: prefix from cv::String used inside the cv namespace
|
2013-03-22 22:14:50 +04:00 |
|
Andrey Kamaev
|
2ad7b97f1c
|
All modules (except ocl and gpu) compiles and pass tests
|
2013-03-22 22:14:26 +04:00 |
|
Andrey Kamaev
|
1ca8f33b4e
|
Merge branch '2.4'
|
2013-03-21 23:11:54 +04:00 |
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
2013-03-13 17:26:56 +04:00 |
|