Andrey Pavlenko [Tue, 4 Feb 2014 16:45:27 +0000 (20:45 +0400)]
Merge pull request #2279 from alalek:fix_memory_leak_getumat
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
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
Elena Gvozdeva [Tue, 4 Feb 2014 06:54:02 +0000 (10:54 +0400)]
fixed
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
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
Andrey Pavlenko [Fri, 31 Jan 2014 14:58:01 +0000 (18:58 +0400)]
Merge pull request #2246 from alalek:intersection_loop_bug
Roman Donchenko [Fri, 31 Jan 2014 13:24:21 +0000 (17:24 +0400)]
Merge pull request #2242 from jet47:gpu-test-fix
Vladislav Vinogradov [Fri, 31 Jan 2014 12:20:45 +0000 (16:20 +0400)]
disable gpu CvtColor.*2HSV tests:
possible bug in CPU version
Vladislav Vinogradov [Fri, 31 Jan 2014 12:15:11 +0000 (16:15 +0400)]
disable gpu Subtract_Array test:
possible bug in CPU version
Vladislav Vinogradov [Fri, 31 Jan 2014 12:10:37 +0000 (16:10 +0400)]
disable gpu Canny and HoughCircles perf tests:
it fails because driver terminates CUDA kernels after time out
Vladislav Vinogradov [Fri, 31 Jan 2014 11:52:06 +0000 (15:52 +0400)]
disable NPP for GpuMat methods and for copyMakeBorder
Vladislav Vinogradov [Fri, 31 Jan 2014 11:40:59 +0000 (15:40 +0400)]
disable some gpu tests if library was built without CUFFT
Roman Donchenko [Fri, 31 Jan 2014 10:56:10 +0000 (14:56 +0400)]
Merge pull request #2241 from asmorkalov:ocv_highgui_test_output_fix
Alexander Alekhin [Fri, 31 Jan 2014 10:42:38 +0000 (14:42 +0400)]
imgproc/intersection: fix loop index
Ilya Lavrenov [Fri, 31 Jan 2014 10:39:03 +0000 (14:39 +0400)]
redundant clFinish in upload since clEnqueueWriteBuffer above is already blocked
Roman Donchenko [Fri, 31 Jan 2014 10:24:04 +0000 (14:24 +0400)]
Merge pull request #2240 from jet47:gpu-generalized-hough
Ilya Lavrenov [Fri, 31 Jan 2014 10:00:05 +0000 (14:00 +0400)]
cached commonly used device properties
Roman Donchenko [Fri, 31 Jan 2014 09:56:48 +0000 (13:56 +0400)]
Merge pull request #2238 from asmorkalov:ocv_test_package_reports
Ilya Lavrenov [Fri, 31 Jan 2014 09:19:16 +0000 (13:19 +0400)]
OCL module 2 trash
Vladislav Vinogradov [Fri, 31 Jan 2014 09:19:15 +0000 (13:19 +0400)]
gpu test output files moved from cwd to temp folder
Alexander Smorkalov [Fri, 31 Jan 2014 06:47:01 +0000 (10:47 +0400)]
Reports path fix for opencv_run_all_tests.sh.in script.
Roman Donchenko [Fri, 31 Jan 2014 08:49:18 +0000 (12:49 +0400)]
Merge pull request #2223 from cosminBoaca:add_prob_result_bayes_classifier
Alexander Smorkalov [Fri, 31 Jan 2014 08:49:10 +0000 (12:49 +0400)]
Highgui test output fixes.
Useless output to console fixed;
Test output files moved from cwd to temp folder.
Vladislav Vinogradov [Fri, 31 Jan 2014 08:40:40 +0000 (12:40 +0400)]
disable performance test for gpu generalized hough
Roman Donchenko [Fri, 31 Jan 2014 08:22:24 +0000 (12:22 +0400)]
Merge pull request #2237 from ivylee:lbph_chi_square_alt
Elena Gvozdeva [Fri, 31 Jan 2014 06:46:29 +0000 (10:46 +0400)]
fixed test
Ilya Lavrenov [Thu, 30 Jan 2014 15:37:01 +0000 (19:37 +0400)]
simplified cv::boxFilter OpenCL impl
Ivy Lee [Thu, 30 Jan 2014 21:53:05 +0000 (21:53 +0000)]
Fixed Bug #3514 Incorrect Chi-Square distance used in LBPH FaceRecognizer
Cosmin Boaca [Thu, 30 Jan 2014 14:43:56 +0000 (16:43 +0200)]
Fixed alignment
Cosmin Boaca [Thu, 30 Jan 2014 14:41:38 +0000 (16:41 +0200)]
Fixed alignment
Cosmin Boaca [Thu, 30 Jan 2014 14:38:15 +0000 (16:38 +0200)]
Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier
Andrey Pavlenko [Thu, 30 Jan 2014 13:33:06 +0000 (17:33 +0400)]
Merge pull request #2220 from ilya-lavrenov:tapi_accumulate
Andrey Pavlenko [Thu, 30 Jan 2014 13:28:43 +0000 (17:28 +0400)]
Merge pull request #2226 from ilya-lavrenov:tapi_calcHist
Ilya Lavrenov [Thu, 30 Jan 2014 13:23:56 +0000 (17:23 +0400)]
workaround
Cosmin Boaca [Thu, 30 Jan 2014 11:37:53 +0000 (13:37 +0200)]
Fixed broken alignment
Cosmin Boaca [Thu, 30 Jan 2014 11:32:32 +0000 (13:32 +0200)]
Merge branch 'add_prob_result_bayes_classifier', remote-tracking branch 'upstream/master' into add_prob_result_bayes_classifier
Ilya Lavrenov [Thu, 30 Jan 2014 11:23:11 +0000 (15:23 +0400)]
moved kernelToStr to ocl.hpp
Roman Donchenko [Thu, 30 Jan 2014 09:22:10 +0000 (13:22 +0400)]
Merge pull request #2231 from asmorkalov:android_toolchain_update
Ilya Lavrenov [Wed, 29 Jan 2014 19:00:33 +0000 (23:00 +0400)]
added conditional compilation
projects / profile / ivi / opencv.git / log