Commit Graph

8856 Commits

Author SHA1 Message Date
Andrey Pavlenko 055f41c92a Merge pull request #2250 from ilya-lavrenov:tapi_renaming 2014-02-05 09:27:06 +04:00
Ilya Lavrenov 2e8579fe9b cleaned up super_resolution sample from old OCL 2014-02-05 00:28:10 +04:00
Andrey Pavlenko 564f5fcca3 Merge pull request #2280 from ilya-lavrenov:attempt_pvc 2014-02-04 21:22:49 +04:00
Andrey Pavlenko b7ffed7b46 Merge pull request #2279 from alalek:fix_memory_leak_getumat 2014-02-04 20:45:27 +04:00
Ilya Lavrenov c7fe162829 renamed **2 -> ** 2014-02-04 19:55:11 +04:00
Ilya Lavrenov d957e8e40d attempt to fix pure virtual call in Mat::deallocate 2014-02-04 19:50:37 +04:00
Alexander Alekhin 83a2b566a3 fix memory leak for Mat::getUMat() operation 2014-02-04 17:25:09 +04:00
Alexander Alekhin 485635310c core/ocl: OpenCLBufferPool 2014-02-04 16:48:35 +04:00
Andrey Pavlenko 22146e4b18 Merge pull request #2234 from KonstantinMatskevich:ocl_tapi_hog 2014-02-04 16:35:12 +04:00
Andrey Pavlenko bd6620fa87 Merge pull request #2252 from ilya-lavrenov:ocl_ref 2014-02-04 16:34:28 +04:00
Andrey Pavlenko 49db511882 Merge pull request #2268 from ilya-lavrenov:tapi_pow 2014-02-04 16:32:43 +04:00
Elena Gvozdeva 85d519b6c3 fixed 2014-02-04 10:54:02 +04:00
Ilya Lavrenov da5b316b4e minor ocl.cpp refactoring
fix for cv::LUT and cv::transpose
2014-02-04 01:52:48 +04:00
Andrey Pavlenko 92c8b94ba9 Merge pull request #2265 from vpisarev:ocl_facedetect_amd3 2014-02-04 00:39:09 +04:00
Ilya Lavrenov 98b72ff389 optimized cv::pow for integer power 2014-02-03 22:36:57 +04:00
Andrey Pavlenko 9dede73d9f Merge pull request #2153 from scottbreyfogle:constrained-hough-lines 2014-02-03 17:35:15 +04:00
Andrey Pavlenko 810dc262ad Merge pull request #2196 from KonstantinMatskevich:ocl_bugcautching 2014-02-03 17:32:20 +04:00
Andrey Pavlenko b3a48e1eed Merge pull request #2264 from alalek:bug_fix_3470 2014-02-03 17:31:57 +04:00
Roman Donchenko 109e71e4ef Merge pull request #2263 from ilya-lavrenov:include_fix 2014-02-03 17:25:12 +04:00
Vadim Pisarevsky b5d8f4d5e5 Merge pull request #2031 from berak:b_flann_timer_30 2014-02-03 17:00:21 +04:00
Vadim Pisarevsky 7cfb7bc8cd Merge pull request #2120 from prclibo:master 2014-02-03 16:59:04 +04:00
Konstantin Matskevich 3495c5953c fixes 2014-02-03 16:38:06 +04:00
Vadim Pisarevsky de4b1c668d hopefully fixed compile warnings and the doc builder warnings 2014-02-03 16:36:36 +04:00
Roman Donchenko 652a0bd5ce Merge pull request #2262 from SpecLad:merge-2.4 2014-02-03 15:33:41 +04:00
Vadim Pisarevsky 30593ee55e 3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier. 2014-02-03 15:12:27 +04:00
Ilya Lavrenov 9a1e461450 fix for PR 2166 2014-02-03 14:47:32 +04:00
Konstantin Matskevich 5c38519c65 some changes 2014-02-03 14:46:53 +04:00
Konstantin Matskevich 3ea32b87bb perf test 2014-02-03 14:46:52 +04:00
Konstantin Matskevich 9a62df1650 HOG 2014-02-03 14:46:52 +04:00
Alexander Alekhin 91ca834be9 bug fix for issue 3470 2014-02-03 14:46:22 +04:00
Andrey Pavlenko 0fef7f8b96 Merge pull request #2217 from ilya-lavrenov:tapi_superres 2014-02-03 14:38:59 +04:00
Konstantin Matskevich ffeb223150 test for failure 2014-02-03 14:34:02 +04:00
Ilya Lavrenov cc47edb850 more strict checks and reseting state 2014-02-03 14:32:25 +04:00
Konstantin Matskevich aa23a842a1 test for failure 2014-02-03 14:32:25 +04:00
Andrey Pavlenko 13875b5fbc Merge pull request #2257 from ilya-lavrenov:tapi_opencl_game2 2014-02-03 14:26:05 +04:00
Andrey Pavlenko a2fcaccf8b Merge pull request #2258 from ilya-lavrenov:tapi_video 2014-02-03 14:17:49 +04:00
Andrey Pavlenko cb1e4b2ede Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl 2014-02-03 14:10:21 +04:00
Roman Donchenko 2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Roman Donchenko 206df7fdb1 Merge pull request #2255 from ilya-lavrenov:ocl_doc 2014-02-03 12:14:14 +04:00
Roman Donchenko 82330a51bd Merge pull request #2253 from ilya-lavrenov:cuda 2014-02-03 12:12:12 +04:00
Roman Donchenko c967069922 Merge pull request #2254 from ilya-lavrenov:opengl 2014-02-03 12:11:28 +04:00
Ilya Lavrenov e844c08203 some fixes and improvements in cv::matchTemplate 2014-02-02 19:20:37 +04:00
Ilya Lavrenov 31b7cdc695 implemented OpenCL version of cv::updateMotionHistory 2014-02-02 17:52:57 +04:00
Ilya Lavrenov 19f799ba1e fix2 for OpenCL on/off 2014-02-02 15:35:13 +04:00
Ilya Lavrenov 02692f9ac0 fix MACRO 2014-02-01 22:43:41 +04:00
Andrey Pavlenko 75dde49b64 Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game 2014-02-01 22:32:39 +04:00
Ilya Lavrenov 66b2acc8ee removed ocl from allmodules list 2014-02-01 20:55:50 +04:00
Ilya Lavrenov ec3eb14138 unused function in case of unavailable OpenGL 2014-02-01 18:14:10 +04:00
Ilya Lavrenov a6104bd025 fixed unused function in case of unavailable CUDA 2014-02-01 18:11:45 +04:00
Ilya Lavrenov 6ad4823f0c ported superres to T-API 2014-02-01 17:20:18 +04:00