Roman Donchenko
|
9d8d70d6ca
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
|
2013-12-16 15:02:12 +04:00 |
|
Alexander Alekhin
|
17ca7f9545
|
ocl: add support for initialization from user-provided OpenCL handles
|
2013-12-12 19:59:22 +04:00 |
|
Alexander Alekhin
|
5ecf759742
|
core/ocl: update dynamic runtime
|
2013-12-11 15:56:54 +04:00 |
|
Vadim Pisarevsky
|
161c3b71e6
|
hopefully, now opencv_test_imgproc should pass
|
2013-12-02 18:27:08 +04:00 |
|
Vadim Pisarevsky
|
d7f4a223cf
|
fixed several compile errors/warnings; reacted on the PR comments
|
2013-12-01 20:58:30 +04:00 |
|
Vadim Pisarevsky
|
6da5d21331
|
fixed many bugs related to Mat::getUMat(), asynchronous kernel execution etc. Also, played a bit with ocl::cvtColor vs cv::cvtColor performance
|
2013-12-01 03:12:19 +04:00 |
|
Andrey Pavlenko
|
2b6fca68bf
|
fixing typo
|
2013-10-25 18:00:46 +04:00 |
|
Alexander Alekhin
|
d26f62569d
|
ocl: fix compilation warnings, update openCLExecuteKernelInterop
|
2013-10-10 00:15:02 +04:00 |
|