Andrey Pavlenko [Fri, 7 Feb 2014 07:33:49 +0000 (11:33 +0400)]
Merge pull request #2251 from ilya-lavrenov:tapi_sqrboxfilter
Andrey Pavlenko [Thu, 6 Feb 2014 17:38:22 +0000 (21:38 +0400)]
Merge pull request #2287 from ilya-lavrenov:mat_step
Andrey Pavlenko [Thu, 6 Feb 2014 17:37:57 +0000 (21:37 +0400)]
Merge pull request #2289 from ilya-lavrenov:umat_expr
Ilya Lavrenov [Fri, 31 Jan 2014 20:05:05 +0000 (00:05 +0400)]
added cv::sqrBoxFilter to T-API
Roman Donchenko [Thu, 6 Feb 2014 12:47:15 +0000 (16:47 +0400)]
Merge pull request #2269 from Nerei:qt5_vtk_guards
Ilya Lavrenov [Wed, 5 Feb 2014 12:01:15 +0000 (16:01 +0400)]
condition for Mat step
Andrey Pavlenko [Thu, 6 Feb 2014 08:55:04 +0000 (12:55 +0400)]
Merge pull request #2278 from KonstantinMatskevich:ocl_toinputarray
Ilya Lavrenov [Wed, 5 Feb 2014 15:35:00 +0000 (19:35 +0400)]
added perf test
Ilya Lavrenov [Wed, 5 Feb 2014 15:10:02 +0000 (19:10 +0400)]
implemented umat expressions
Roman Donchenko [Wed, 5 Feb 2014 13:47:26 +0000 (17:47 +0400)]
Merge pull request #2002 from abak:stereo_calibrate
Roman Donchenko [Wed, 5 Feb 2014 10:00:20 +0000 (14:00 +0400)]
Merge tag '3.0-ocl-tp2' (-s ours)
OpenCV 3.0 OpenCL Technical Preview 2
Roman Donchenko [Wed, 5 Feb 2014 09:57:04 +0000 (13:57 +0400)]
Set status to -tp2.
Konstantin Matskevich [Wed, 5 Feb 2014 09:51:14 +0000 (13:51 +0400)]
fixes2
Andrey Pavlenko [Wed, 5 Feb 2014 09:37:05 +0000 (13:37 +0400)]
Merge pull request #2284 from KonstantinMatskevich:ocl_test_cascade
Konstantin Matskevich [Wed, 5 Feb 2014 08:06:48 +0000 (12:06 +0400)]
update test for cascade
Konstantin Matskevich [Wed, 5 Feb 2014 07:31:25 +0000 (11:31 +0400)]
fixed docs2
Andrey Pavlenko [Wed, 5 Feb 2014 07:07:19 +0000 (11:07 +0400)]
Merge pull request #2281 from vpisarev:ocl_surf
Konstantin Matskevich [Wed, 5 Feb 2014 06:55:26 +0000 (10:55 +0400)]
removed CV_IN/OUT
Konstantin Matskevich [Wed, 5 Feb 2014 06:49:56 +0000 (10:49 +0400)]
fixed docs
Konstantin Matskevich [Wed, 5 Feb 2014 05:59:04 +0000 (09:59 +0400)]
fixes
Andrey Pavlenko [Wed, 5 Feb 2014 05:27:06 +0000 (09:27 +0400)]
Merge pull request #2250 from ilya-lavrenov:tapi_renaming
Ilya Lavrenov [Fri, 31 Jan 2014 17:00:16 +0000 (21:00 +0400)]
cleaned up super_resolution sample from old OCL
Vadim Pisarevsky [Tue, 4 Feb 2014 17:50:04 +0000 (21:50 +0400)]
fixed warnings/errors from GCC
Andrey Pavlenko [Tue, 4 Feb 2014 17:22:49 +0000 (21:22 +0400)]
Merge pull request #2280 from ilya-lavrenov:attempt_pvc
Vadim Pisarevsky [Tue, 4 Feb 2014 17:19:31 +0000 (21:19 +0400)]
fixed warnings from OCL and DOC builders
Andrey Pavlenko [Tue, 4 Feb 2014 16:45:27 +0000 (20:45 +0400)]
Merge pull request #2279 from alalek:fix_memory_leak_getumat
Vadim Pisarevsky [Tue, 4 Feb 2014 16:41:11 +0000 (20:41 +0400)]
undone change in ocl.hpp (explicit Image2D constructor)
Vadim Pisarevsky [Tue, 4 Feb 2014 16:00:51 +0000 (20:00 +0400)]
SURF kind of works (let's see if the tests pass)
Ilya Lavrenov [Fri, 31 Jan 2014 16:23:01 +0000 (20:23 +0400)]
renamed **2 -> **
Ilya Lavrenov [Tue, 4 Feb 2014 15:47:58 +0000 (19:47 +0400)]
attempt to fix pure virtual call in Mat::deallocate
Andrey Pavlenko [Tue, 4 Feb 2014 15:13:07 +0000 (19:13 +0400)]
Merge pull request #2192 from alalek:buffer_pool
Alexander Alekhin [Tue, 4 Feb 2014 13:23:26 +0000 (17:23 +0400)]
fix memory leak for Mat::getUMat() operation
Konstantin Matskevich [Tue, 4 Feb 2014 12:34:18 +0000 (16:34 +0400)]
features2d
Alexander Alekhin [Thu, 16 Jan 2014 14:30:39 +0000 (18:30 +0400)]
core/ocl: OpenCLBufferPool
Andrey Pavlenko [Tue, 4 Feb 2014 12:35:11 +0000 (16:35 +0400)]
Merge pull request #2234 from KonstantinMatskevich:ocl_tapi_hog
Andrey Pavlenko [Tue, 4 Feb 2014 12:34:27 +0000 (16:34 +0400)]
Merge pull request #2252 from ilya-lavrenov:ocl_ref
Andrey Pavlenko [Tue, 4 Feb 2014 12:32:42 +0000 (16:32 +0400)]
Merge pull request #2268 from ilya-lavrenov:tapi_pow
Andrey Pavlenko [Tue, 4 Feb 2014 12:32:11 +0000 (16:32 +0400)]
Merge pull request #2275 from ElenaGvozdeva:ocl_matchTemplate
Konstantin Matskevich [Tue, 4 Feb 2014 07:09:29 +0000 (11:09 +0400)]
drawing
Elena Gvozdeva [Tue, 4 Feb 2014 06:54:02 +0000 (10:54 +0400)]
fixed
Vadim Pisarevsky [Mon, 3 Feb 2014 23:21:03 +0000 (03:21 +0400)]
very preliminary port of SURF to T-API (compiles but certainly does not work)
Ilya Lavrenov [Sat, 1 Feb 2014 11:07:03 +0000 (15:07 +0400)]
minor ocl.cpp refactoring
fix for cv::LUT and cv::transpose
Andrey Pavlenko [Mon, 3 Feb 2014 20:39:09 +0000 (00:39 +0400)]
Merge pull request #2265 from vpisarev:ocl_facedetect_amd3
Ilya Lavrenov [Mon, 3 Feb 2014 13:38:28 +0000 (17:38 +0400)]
optimized cv::pow for integer power
Andrey Pavlenko [Mon, 3 Feb 2014 13:35:14 +0000 (17:35 +0400)]
Merge pull request #2153 from scottbreyfogle:constrained-hough-lines
Andrey Pavlenko [Mon, 3 Feb 2014 13:32:20 +0000 (17:32 +0400)]
Merge pull request #2196 from KonstantinMatskevich:ocl_bugcautching
Andrey Pavlenko [Mon, 3 Feb 2014 13:31:57 +0000 (17:31 +0400)]
Merge pull request #2264 from alalek:bug_fix_3470
Roman Donchenko [Mon, 3 Feb 2014 13:25:12 +0000 (17:25 +0400)]
Merge pull request #2263 from ilya-lavrenov:include_fix
Vadim Pisarevsky [Mon, 3 Feb 2014 13:00:21 +0000 (17:00 +0400)]
Merge pull request #2031 from berak:b_flann_timer_30
Vadim Pisarevsky [Mon, 3 Feb 2014 12:58:57 +0000 (16:58 +0400)]
Merge pull request #2120 from prclibo:master
Konstantin Matskevich [Fri, 31 Jan 2014 15:33:02 +0000 (19:33 +0400)]
fixes
Vadim Pisarevsky [Mon, 3 Feb 2014 12:36:36 +0000 (16:36 +0400)]
hopefully fixed compile warnings and the doc builder warnings
Roman Donchenko [Mon, 3 Feb 2014 11:33:40 +0000 (15:33 +0400)]
Merge pull request #2262 from SpecLad:merge-2.4
Vadim Pisarevsky [Mon, 3 Feb 2014 11:12:27 +0000 (15:12 +0400)]
3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.
Ilya Lavrenov [Mon, 3 Feb 2014 10:47:32 +0000 (14:47 +0400)]
fix for PR 2166
Konstantin Matskevich [Fri, 31 Jan 2014 04:46:27 +0000 (08:46 +0400)]
some changes
Konstantin Matskevich [Thu, 30 Jan 2014 12:26:54 +0000 (16:26 +0400)]
perf test
Konstantin Matskevich [Thu, 30 Jan 2014 12:25:41 +0000 (16:25 +0400)]
HOG
Alexander Alekhin [Mon, 3 Feb 2014 10:46:22 +0000 (14:46 +0400)]
bug fix for issue 3470
Andrey Pavlenko [Mon, 3 Feb 2014 10:38:59 +0000 (14:38 +0400)]
Merge pull request #2217 from ilya-lavrenov:tapi_superres
Konstantin Matskevich [Thu, 23 Jan 2014 13:54:53 +0000 (17:54 +0400)]
test for failure
Ilya Lavrenov [Sun, 2 Feb 2014 11:31:14 +0000 (15:31 +0400)]
more strict checks and reseting state
Konstantin Matskevich [Thu, 23 Jan 2014 13:54:53 +0000 (17:54 +0400)]
test for failure
Andrey Pavlenko [Mon, 3 Feb 2014 10:26:05 +0000 (14:26 +0400)]
Merge pull request #2257 from ilya-lavrenov:tapi_opencl_game2
Andrey Pavlenko [Mon, 3 Feb 2014 10:17:49 +0000 (14:17 +0400)]
Merge pull request #2258 from ilya-lavrenov:tapi_video
Andrey Pavlenko [Mon, 3 Feb 2014 10:10:20 +0000 (14:10 +0400)]
Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl
Roman Donchenko [Mon, 3 Feb 2014 09:23:59 +0000 (13:23 +0400)]
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
Roman Donchenko [Mon, 3 Feb 2014 08:14:14 +0000 (12:14 +0400)]
Merge pull request #2255 from ilya-lavrenov:ocl_doc
Roman Donchenko [Mon, 3 Feb 2014 08:12:11 +0000 (12:12 +0400)]
Merge pull request #2253 from ilya-lavrenov:cuda
Roman Donchenko [Mon, 3 Feb 2014 08:11:27 +0000 (12:11 +0400)]
Merge pull request #2254 from ilya-lavrenov:opengl
Ilya Lavrenov [Sat, 1 Feb 2014 19:34:54 +0000 (23:34 +0400)]
some fixes and improvements in cv::matchTemplate
Ilya Lavrenov [Sun, 2 Feb 2014 13:47:06 +0000 (17:47 +0400)]
implemented OpenCL version of cv::updateMotionHistory
Anatoly Baksheev [Sun, 26 Jan 2014 10:41:16 +0000 (14:41 +0400)]
modified viz module header layout for 2.4 compatibility
Anatoly Baksheev [Sun, 26 Jan 2014 10:40:32 +0000 (14:40 +0400)]
added guard against linking qt5 and VTK together
Ilya Lavrenov [Sun, 2 Feb 2014 11:33:10 +0000 (15:33 +0400)]
fix2 for OpenCL on/off
Ilya Lavrenov [Sat, 1 Feb 2014 18:43:41 +0000 (22:43 +0400)]
fix MACRO
Andrey Pavlenko [Sat, 1 Feb 2014 18:32:39 +0000 (22:32 +0400)]
Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game
Ilya Lavrenov [Sat, 1 Feb 2014 17:49:03 +0000 (21:49 +0400)]
one more ocl deletion
Ilya Lavrenov [Sat, 1 Feb 2014 16:55:50 +0000 (20:55 +0400)]
removed ocl from allmodules list
Ilya Lavrenov [Sat, 1 Feb 2014 14:14:10 +0000 (18:14 +0400)]
unused function in case of unavailable OpenGL
Ilya Lavrenov [Sat, 1 Feb 2014 14:11:19 +0000 (18:11 +0400)]
fixed unused function in case of unavailable CUDA
Ilya Lavrenov [Wed, 22 Jan 2014 15:13:29 +0000 (19:13 +0400)]
ported superres to T-API
Scott Breyfogle [Fri, 31 Jan 2014 22:27:51 +0000 (14:27 -0800)]
Merge remote-tracking branch 'original/master' into constrained-hough-lines
Scott Breyfogle [Fri, 31 Jan 2014 22:26:45 +0000 (14:26 -0800)]
Add static cast to hough lines
Roman Donchenko [Fri, 31 Jan 2014 16:49:04 +0000 (20:49 +0400)]
Merge pull request #2249 from jet47:gpu-tests-disable
Roman Donchenko [Fri, 31 Jan 2014 16:48:52 +0000 (20:48 +0400)]
Merge pull request #2248 from jet47:gpu-npp-disable
Roman Donchenko [Fri, 31 Jan 2014 16:48:37 +0000 (20:48 +0400)]
Merge pull request #2247 from jet47:gpu-test-cufft
Andrey Pavlenko [Fri, 31 Jan 2014 15:38:57 +0000 (19:38 +0400)]
Merge pull request #2219 from ilya-lavrenov:createHanningWindow
Ilya Lavrenov [Tue, 28 Jan 2014 19:10:43 +0000 (23:10 +0400)]
optimized createHanningWindow
Andrey Pavlenko [Fri, 31 Jan 2014 15:25:00 +0000 (19:25 +0400)]
Merge pull request #2219 from ilya-lavrenov:createHanningWindow
Andrey Pavlenko [Fri, 31 Jan 2014 15:23:01 +0000 (19:23 +0400)]
Merge pull request #2218 from alalek:fix_defects_code_coverity
Andrey Pavlenko [Fri, 31 Jan 2014 15:22:37 +0000 (19:22 +0400)]
Merge pull request #2216 from ElenaGvozdeva:ocl_MOG2
Andrey Pavlenko [Fri, 31 Jan 2014 15:22:18 +0000 (19:22 +0400)]
Merge pull request #2202 from ilya-lavrenov:tapi_GFTTDetector
Andrey Pavlenko [Fri, 31 Jan 2014 15:17:16 +0000 (19:17 +0400)]
Merge pull request #2232 from ilya-lavrenov:ABF_drop
Ilya Lavrenov [Thu, 30 Jan 2014 09:13:33 +0000 (13:13 +0400)]
removed ABF
Andrey Pavlenko [Fri, 31 Jan 2014 15:14:18 +0000 (19:14 +0400)]
Merge pull request #2228 from ilya-lavrenov:tapi_experiments
Andrey Pavlenko [Fri, 31 Jan 2014 15:08:26 +0000 (19:08 +0400)]
Merge pull request #2243 from ilya-lavrenov:ocl2trash
Andrey Pavlenko [Fri, 31 Jan 2014 15:04:49 +0000 (19:04 +0400)]
Merge pull request #2236 from ilya-lavrenov:tapi_boxfilter
Andrey Pavlenko [Fri, 31 Jan 2014 15:04:30 +0000 (19:04 +0400)]
Merge pull request #2244 from ilya-lavrenov:tapi_device_cache
Andrey Pavlenko [Fri, 31 Jan 2014 15:04:07 +0000 (19:04 +0400)]
Merge pull request #2245 from ilya-lavrenov:redundant_sync
projects / profile / ivi / opencv.git / log