Roman Donchenko
|
f77c68e0fa
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
|
2014-03-31 14:42:00 +04:00 |
|
Andrey Pavlenko
|
fa5705613d
|
splitting plain and OCL tests for SURF.
|
2014-03-26 17:18:05 +04:00 |
|
Andrey Pavlenko
|
259b9e093c
|
disabling failing tests
|
2014-03-24 10:12:02 +04:00 |
|
Andrey Pavlenko
|
5421d741bc
|
making OCL tests conform to the comon style
|
2014-03-24 10:08:44 +04:00 |
|
Vadim Pisarevsky
|
22f42a639f
|
fixed doc builder warnings; make sure the tests give reasonable results when OpenCL is not available
|
2014-03-05 18:48:19 +04:00 |
|
Vadim Pisarevsky
|
60ce2b2e9f
|
modified SURF's performance test to test OpenCL version as well
|
2014-03-05 17:10:51 +04:00 |
|
Andrey Kamaev
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
Andrey Kamaev
|
932204d197
|
Added thresholds to some sanity checks
|
2012-12-12 20:14:20 +04:00 |
|
Andrey Kamaev
|
d970a9159e
|
Add sanity checks to nonfree module
|
2012-10-09 19:17:58 +04:00 |
|
Vadim Pisarevsky
|
06a13d9ba0
|
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
|
2012-10-02 23:07:46 +04:00 |
|
Vadim Pisarevsky
|
957e80abbd
|
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
|
2012-03-15 14:36:01 +00:00 |
|