Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						8fdab9f631
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-04-17 12:07:17 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						40d0e0eda0
					 | 
					
						
						
							
							use host data when DEVICE_MEM_UHP is set (the risk of vary align size is owned by users)
						
						
						
						
						
						
					 | 
					
						2013-04-13 14:58:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						3b364330ad
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-04-12 15:35:38 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						b0933dd473
					 | 
					
						
						
							
							Merge pull request #803 from taka-no-me:split_c_cpp3
						
						
						
						
						
						
					 | 
					
						2013-04-12 15:01:48 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						8406312571
					 | 
					
						
						
							
							Remove C API from OpenCL module
						
						
						
						
						
						
					 | 
					
						2013-04-12 14:37:02 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								peng xiao
							
						 
					 | 
					
						
						
							
						
						aec7a67d0f
					 | 
					
						
						
							
							Fix a bug of ocl::Canny when src/dst using the same buffer.
						
						
						
						
						
						
					 | 
					
						2013-04-12 11:10:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								peng xiao
							
						 
					 | 
					
						
						
							
						
						242955ce22
					 | 
					
						
						
							
							Format ocl::Canny header
						
						
						
						
						
						
					 | 
					
						2013-04-12 11:01:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						9ba25e9d09
					 | 
					
						
						
							
							Merge pull request #742 from bitwangyaoyao:2.4_fix
						
						
						
						
						
						
					 | 
					
						2013-04-11 11:33:45 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						913e6833d5
					 | 
					
						
						
							
							Merge pull request #785 from taka-no-me:split_c_cpp2
						
						
						
						
						
						
					 | 
					
						2013-04-09 08:53:50 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						288a0634c2
					 | 
					
						
						
							
							Make imgproc.hpp independent from C API
						
						
						
						
						
						
					 | 
					
						2013-04-08 15:47:28 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								peng xiao
							
						 
					 | 
					
						
						
							
						
						77501f3ed0
					 | 
					
						
						
							
							ocl: Add dft based convolve implementation.
						
						
						
						
						
						
						
						Match template in ocl module now can be utilized with dft based
convolve. Note this feature needs OpenCV to be built with clAmdFft
library. 
						
						
					 | 
					
						2013-04-08 15:19:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						67073daf19
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-04-05 21:11:59 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						5022bc8c25
					 | 
					
						
						
							
							move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()
						
						
						
						
						
						
					 | 
					
						2013-04-05 09:17:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								peng xiao
							
						 
					 | 
					
						
						
							
						
						7758322fd3
					 | 
					
						
						
							
							Fix some build errors.
						
						
						
						
						
						
					 | 
					
						2013-04-03 16:42:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								peng xiao
							
						 
					 | 
					
						
						
							
						
						ecea583afd
					 | 
					
						
						
							
							Add ocl::stereobp function.
						
						
						
						
						
						
						
						OpenCL StereoBeliefPropagation, ported from GPU implementation. 
						
						
					 | 
					
						2013-04-03 15:57:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						fd4a6f0af0
					 | 
					
						
						
							
							make the sparse method give correct results on CPU ocl
						
						
						
						
						
						
						
						Add CL_CPU to supportsFeature check
simplify the logic of pyrlk 
						
						
					 | 
					
						2013-04-03 13:23:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						f3254b28f2
					 | 
					
						
						
							
							use clflush replaces clfinish
						
						
						
						
						
						
					 | 
					
						2013-04-02 14:41:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						f77a375354
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-03-29 19:38:35 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						49f6dad13f
					 | 
					
						
						
							
							Move cv::KeyPoint and cv::DMatch to core
						
						
						
						
						
						
					 | 
					
						2013-03-26 16:08:43 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								peng xiao
							
						 
					 | 
					
						
						
							
						
						0c19a07bf4
					 | 
					
						
						
							
							Add a function to query ocl device info
						
						
						
						
						
						
						
						Currently the function only supports wavefront size query 
						
						
					 | 
					
						2013-03-26 15:36:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						be7bbe3aa9
					 | 
					
						
						
							
							Drop cv:: prefix from cv::String used inside the cv namespace
						
						
						
						
						
						
					 | 
					
						2013-03-22 22:14:50 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						2ad7b97f1c
					 | 
					
						
						
							
							All modules (except ocl and gpu) compiles and pass tests
						
						
						
						
						
						
					 | 
					
						2013-03-22 22:14:26 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						1ca8f33b4e
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-03-21 23:11:54 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						4bd721ad3b
					 | 
					
						
						
							
							Fix build errors
						
						
						
						
						
						
					 | 
					
						2013-03-21 18:37:34 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						7b8ad4cb04
					 | 
					
						
						
							
							Refactor OpenCL initialization and allow to use ocl module witout explicit setup
						
						
						
						
						
						
					 | 
					
						2013-03-21 18:18:15 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						6846f881a2
					 | 
					
						
						
							
							Move OpenCL SURF to nonfree module
						
						
						
						
						
						
					 | 
					
						2013-03-21 17:59:35 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						a42a0f5fca
					 | 
					
						
						
							
							Added compatibility headers
						
						
						
						
						
						
					 | 
					
						2013-03-13 17:26:56 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						ad5cddc007
					 | 
					
						
						
							
							Main module headers are moved 1 level up
						
						
						
						
						
						
						
						e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp> 
						
						
					 | 
					
						2013-03-13 17:26:56 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						0f0a4c3099
					 | 
					
						
						
							
							add stereoBM function
						
						
						
						
						
						
					 | 
					
						2013-03-11 17:10:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						891d7da6ee
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-02-28 11:17:06 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						0a8711d76b
					 | 
					
						
						
							
							Merge pull request #576 from bitwangyaoyao:2.4_customMat2
						
						
						
						
						
						
					 | 
					
						2013-02-27 19:33:54 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						9ccf27c7f5
					 | 
					
						
						
							
							add interfaces enable custom oclMat device memory type
						
						
						
						
						
						
					 | 
					
						2013-02-27 17:32:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						6df23428af
					 | 
					
						
						
							
							Add moments function
						
						
						
						
						
						
					 | 
					
						2013-02-27 13:45:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						2a6fb2867e
					 | 
					
						
						
							
							Remove all using directives for STL namespace and members
						
						
						
						
						
						
						
						Made all STL usages explicit to be able automatically find all usages of
particular class or function. 
						
						
					 | 
					
						2013-02-25 15:04:17 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						0b8a6da817
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-02-22 17:33:30 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						c17e9ef7ba
					 | 
					
						
						
							
							Repair binary compatibility of ocl module
						
						
						
						
						
						
					 | 
					
						2013-02-22 01:58:01 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						429ae44ae3
					 | 
					
						
						
							
							add openCLExecuteKernelInterop method
						
						
						
						
						
						
					 | 
					
						2013-02-20 17:46:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						637397f621
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-02-20 12:31:16 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						c6f6f9ab35
					 | 
					
						
						
							
							Merge pull request #451 from bitwangyaoyao:2.4_operator
						
						
						
						
						
						
					 | 
					
						2013-02-18 18:04:44 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						9613135e8d
					 | 
					
						
						
							
							fix compiling errors on Linux
						
						
						
						
						
						
						
						more operators use oclMatExpr 
						
						
					 | 
					
						2013-02-16 18:41:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						69fd2d8273
					 | 
					
						
						
							
							add oclMatExpr class to prevent extra allocations
						
						
						
						
						
						
					 | 
					
						2013-02-16 11:05:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						0b365f6aa5
					 | 
					
						
						
							
							add +-*/ operators to oclMat
						
						
						
						
						
						
					 | 
					
						2013-02-08 11:41:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						c527340cb6
					 | 
					
						
						
							
							Merge branch 2.4
						
						
						
						
						
						
					 | 
					
						2013-02-04 17:15:55 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						a639a1ae5c
					 | 
					
						
						
							
							add setDeviceEx interface
						
						
						
						
						
						
						
						simplify the logic of save binary 
						
						
					 | 
					
						2013-02-04 15:06:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						57d3152cd0
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-01-31 14:35:27 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						f489eb9a5d
					 | 
					
						
						
							
							Fix build warnings in OpenCL samples
						
						
						
						
						
						
					 | 
					
						2013-01-30 17:25:03 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						f4e27bcbbc
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-01-25 16:30:36 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						9509dfd1de
					 | 
					
						
						
							
							Fix OpenCL build warnings
						
						
						
						
						
						
					 | 
					
						2013-01-25 16:19:59 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yao
							
						 
					 | 
					
						
						
							
						
						f6d82773f9
					 | 
					
						
						
							
							fix bug #2674
						
						
						
						
						
						
					 | 
					
						2013-01-23 14:48:04 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Suenghoon Park
							
						 
					 | 
					
						
						
							
						
						06da75ffe0
					 | 
					
						
						
							
							Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough
						
						
						
						
						
						
					 | 
					
						2013-01-15 12:21:25 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |