Roman Donchenko
|
f36f8067bc
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp
|
2013-06-25 15:55:52 +04:00 |
|
yao
|
f1c549fabf
|
revise ocl samples, add tvl1 sample
|
2013-06-19 16:36:23 +08:00 |
|
Andrey Kamaev
|
8406312571
|
Remove C API from OpenCL module
|
2013-04-12 14:37:02 +04:00 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +04:00 |
|
Andrey Kamaev
|
f489eb9a5d
|
Fix build warnings in OpenCL samples
|
2013-01-30 17:25:03 +04:00 |
|
bitwangyaoyao
|
a091f9e4e2
|
bug fix of "squares" sample for ocl module
|
2012-08-16 20:34:24 +08:00 |
|
yao
|
d363d5589c
|
add an "squares" sample for ocl module
|
2012-08-16 16:01:40 +08:00 |
|