Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						19f799ba1e
					 | 
					
						
						
							
							fix2 for OpenCL on/off
						
						
						
						
						
						
					 | 
					
						2014-02-02 15:35:13 +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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						25d2ab8a68
					 | 
					
						
						
							
							Merge pull request #2218 from alalek:fix_defects_code_coverity
						
						
						
						
						
						
					 | 
					
						2014-01-31 19:23:02 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						2c35438771
					 | 
					
						
						
							
							Merge pull request #2228 from ilya-lavrenov:tapi_experiments
						
						
						
						
						
						
					 | 
					
						2014-01-31 19:14:19 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						0b57d3717f
					 | 
					
						
						
							
							Merge pull request #2244 from ilya-lavrenov:tapi_device_cache
						
						
						
						
						
						
					 | 
					
						2014-01-31 19:04:30 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						d15bf6261a
					 | 
					
						
						
							
							redundant clFinish in upload since clEnqueueWriteBuffer above is already blocked
						
						
						
						
						
						
					 | 
					
						2014-01-31 14:39:03 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						50cf152977
					 | 
					
						
						
							
							cached commonly used device properties
						
						
						
						
						
						
					 | 
					
						2014-01-31 14:00:05 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						1ab1594d00
					 | 
					
						
						
							
							workaround
						
						
						
						
						
						
					 | 
					
						2014-01-30 17:26:56 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						372cdac07c
					 | 
					
						
						
							
							moved kernelToStr to ocl.hpp
						
						
						
						
						
						
					 | 
					
						2014-01-30 15:23:11 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						86353eb541
					 | 
					
						
						
							
							fix for PR 2196
						
						
						
						
						
						
					 | 
					
						2014-01-30 01:47:25 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						6d64907f18
					 | 
					
						
						
							
							async
						
						
						
						
						
						
					 | 
					
						2014-01-30 00:19:18 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						384a28622d
					 | 
					
						
						
							
							added cv::calcHist to T-API (only for CV_8UC1 with 256 bins)
						
						
						
						
						
						
					 | 
					
						2014-01-29 20:19:15 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Alekhin
							
						 
					 | 
					
						
						
							
						
						f91f55927e
					 | 
					
						
						
							
							fix memory management problem
						
						
						
						
						
						
					 | 
					
						2014-01-29 19:59:01 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Alekhin
							
						 
					 | 
					
						
						
							
						
						5474935a81
					 | 
					
						
						
							
							fixes for defects from code coverity
						
						
						
						
						
						
					 | 
					
						2014-01-28 20:24:10 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						fff5a6c058
					 | 
					
						
						
							
							Merge pull request #2213 from ilya-lavrenov:tapi_buildPyramid
						
						
						
						
						
						
					 | 
					
						2014-01-28 16:31:30 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Donchenko
							
						 
					 | 
					
						
						
							
						
						84c29745f2
					 | 
					
						
						
							
							Merge pull request #2211 from SpecLad:merge-2.4
						
						
						
						
						
						
					 | 
					
						2014-01-28 12:44:29 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						6deda99f07
					 | 
					
						
						
							
							Merge pull request #2207 from ilya-lavrenov:tapi_macro
						
						
						
						
						
						
					 | 
					
						2014-01-27 18:56:06 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						48a084c236
					 | 
					
						
						
							
							OpenCL version of cv::buildPyramid
						
						
						
						
						
						
					 | 
					
						2014-01-27 18:42:44 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						d9b24457fa
					 | 
					
						
						
							
							Merge pull request #2208 from alalek:ocl_dynload_warn
						
						
						
						
						
						
					 | 
					
						2014-01-27 18:24:14 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Donchenko
							
						 
					 | 
					
						
						
							
						
						bbc35d609d
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4
						
						
						
						
						
						
						
						Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt 
						
						
					 | 
					
						2014-01-27 15:28:14 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Alekhin
							
						 
					 | 
					
						
						
							
						
						1ff9a8ef52
					 | 
					
						
						
							
							core/ocl: added warning about incompatible configuration
						
						
						
						
						
						
					 | 
					
						2014-01-27 13:52:52 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						321782b9b7
					 | 
					
						
						
							
							added macro with ability of returning values
						
						
						
						
						
						
					 | 
					
						2014-01-27 12:32:26 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						f767077a41
					 | 
					
						
						
							
							fixed condition
						
						
						
						
						
						
					 | 
					
						2014-01-27 12:00:53 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						2dd294cc84
					 | 
					
						
						
							
							fixed cv::split; enabled test
						
						
						
						
						
						
					 | 
					
						2014-01-27 12:00:53 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						fa5492343a
					 | 
					
						
						
							
							added STD_VECTOR_UMAT support to _OutputArray::create
						
						
						
						
						
						
					 | 
					
						2014-01-27 11:59:59 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						a64d3c1744
					 | 
					
						
						
							
							Merge pull request #2155 from vbystricky:ocl_calcOpticalFlowPyrLK
						
						
						
						
						
						
					 | 
					
						2014-01-25 17:08:07 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						3f61007563
					 | 
					
						
						
							
							Merge pull request #2191 from ilya-lavrenov:tapi_macro
						
						
						
						
						
						
					 | 
					
						2014-01-25 16:32:54 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						7f785e0a11
					 | 
					
						
						
							
							refactored core using new macro
						
						
						
						
						
						
					 | 
					
						2014-01-24 23:59:00 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								vbystricky
							
						 
					 | 
					
						
						
							
						
						33fc46cdec
					 | 
					
						
						
							
							Validate parameters for using OpenCL version, before upload UMat
						
						
						
						
						
						
					 | 
					
						2014-01-24 17:37:50 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								vbystricky
							
						 
					 | 
					
						
						
							
						
						4152135e63
					 | 
					
						
						
							
							Fix error with some opencl functions on the build WITH_OPENCL=OFF
						
						
						
						
						
						
					 | 
					
						2014-01-24 17:37:50 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								vbystricky
							
						 
					 | 
					
						
						
							
						
						c57e427fba
					 | 
					
						
						
							
							Move OpticalFlowPyrLK from ocl module to video module
						
						
						
						
						
						
					 | 
					
						2014-01-24 17:37:50 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						cc514ac7a9
					 | 
					
						
						
							
							added new macros useful for tracking whether OpenCL impl run or not
						
						
						
						
						
						
					 | 
					
						2014-01-24 17:16:40 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						5424c55565
					 | 
					
						
						
							
							Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher
						
						
						
						
						
						
					 | 
					
						2014-01-24 16:50:03 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						b0caa588ec
					 | 
					
						
						
							
							Merge pull request #2190 from KonstantinMatskevich:ocl_dumpinfo
						
						
						
						
						
						
					 | 
					
						2014-01-24 16:44:19 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Konstantin Matskevich
							
						 
					 | 
					
						
						
							
						
						ae827a638c
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2014-01-24 14:01:31 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Konstantin Matskevich
							
						 
					 | 
					
						
						
							
						
						f90e41d54e
					 | 
					
						
						
							
							dumpinfo
						
						
						
						
						
						
					 | 
					
						2014-01-22 17:04:44 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Konstantin Matskevich
							
						 
					 | 
					
						
						
							
						
						ca5689e0db
					 | 
					
						
						
							
							BFMatcher
						
						
						
						
						
						
						
						match
radiusMatch 
						
						
					 | 
					
						2014-01-22 15:31:26 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vladislav Vinogradov
							
						 
					 | 
					
						
						
							
						
						dda999545c
					 | 
					
						
						
							
							fix GpuMat::copyTo method with mask:
						
						
						
						
						
						
						
						fill destination matrix with zeros if it was reallocated 
						
						
					 | 
					
						2014-01-22 10:40:14 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						5d818c010e
					 | 
					
						
						
							
							Merge pull request #2156 from ilya-lavrenov:tapi_reduce
						
						
						
						
						
						
					 | 
					
						2014-01-22 10:12:08 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						99942e8043
					 | 
					
						
						
							
							Merge pull request #2166 from ilya-lavrenov:tapi_gftt
						
						
						
						
						
						
					 | 
					
						2014-01-21 22:29:41 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						bfa382cf9d
					 | 
					
						
						
							
							fixed copying UMat -> std::vector
						
						
						
						
						
						
					 | 
					
						2014-01-21 14:37:22 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilya Lavrenov
							
						 
					 | 
					
						
						
							
						
						ae4be413c3
					 | 
					
						
						
							
							added perf tests for cv::reduce
						
						
						
						
						
						
					 | 
					
						2014-01-21 14:18:38 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						801d2d0a32
					 | 
					
						
						
							
							Merge pull request #2167 from ilya-lavrenov:tapi_kern_warn
						
						
						
						
						
						
					 | 
					
						2014-01-20 23:33:55 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Donchenko
							
						 
					 | 
					
						
						
							
						
						a509819b21
					 | 
					
						
						
							
							Merge pull request #2163 from ilya-lavrenov:tapi_channels
						
						
						
						
						
						
					 | 
					
						2014-01-20 18:48:52 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Donchenko
							
						 
					 | 
					
						
						
							
						
						9dc93ce328
					 | 
					
						
						
							
							Merge pull request #2176 from SpecLad:merge-2.4
						
						
						
						
						
						
					 | 
					
						2014-01-20 18:04:56 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Pavlenko
							
						 
					 | 
					
						
						
							
						
						69ba0c53ad
					 | 
					
						
						
							
							Merge pull request #2165 from ilya-lavrenov:tapi_upload
						
						
						
						
						
						
					 | 
					
						2014-01-20 15:18:56 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Donchenko
							
						 
					 | 
					
						
						
							
						
						e45fd939c2
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4
						
						
						
						
						
						
						
						Conflicts:
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in 
						
						
					 | 
					
						2014-01-20 15:10:19 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |