Adil Ibragimov 
							
						 
					 
					
						
						
							
						
						8a4a1bb018 
					 
					
						
						
							
							Several type of formal refactoring:  
						
						... 
						
						
						
						1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions 
						
						
					 
					
						2014-08-13 15:21:35 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						55188fe991 
					 
					
						
						
							
							world fix  
						
						
						
						
					 
					
						2014-08-05 20:12:35 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						1ad9827fc4 
					 
					
						
						
							
							removed ERFilter (to be moved to opencv_contrib/modules/text) and lineMOD (to be moved to opencv_contrib/modules/rgbd)  
						
						
						
						
					 
					
						2014-07-28 16:48:53 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						c3329ff79d 
					 
					
						
						
							
							Merge pull request  #2856  from sanchom:master  
						
						
						
						
					 
					
						2014-07-02 14:22:56 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						c4fdf71bb3 
					 
					
						
						
							
							fixed some more compile warnings on Windows  
						
						
						
						
					 
					
						2014-06-25 20:22:56 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						8f2aaff6d7 
					 
					
						
						
							
							fixed compile warnings on Windows  
						
						
						
						
					 
					
						2014-06-25 16:17:52 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						66f2e527b6 
					 
					
						
						
							
							removed extra whitespaces  
						
						
						
						
					 
					
						2014-06-24 23:05:24 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						07c0d50edf 
					 
					
						
						
							
							put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.  
						
						
						
						
					 
					
						2014-06-24 21:16:09 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						3858f2291d 
					 
					
						
						
							
							removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps.  
						
						... 
						
						
						
						some of the stuff will be moved to opencv_contrib module.
in order to make this PR pass buildbot, please, comment off opencv_legacy, opencv_contrib and opencv_softcascade test runs. 
						
						
					 
					
						2014-06-24 19:18:51 +04:00 
						 
				 
			
				
					
						
							
							
								Sancho McCann 
							
						 
					 
					
						
						
							
						
						e1e243588e 
					 
					
						
						
							
							Bugfix: Memory leak in deletion of er_stack nodes of ERFilter.  
						
						
						
						
					 
					
						2014-06-12 11:02:06 -07:00 
						 
				 
			
				
					
						
							
							
								GregoryMorse 
							
						 
					 
					
						
						
							
						
						b1443bc1bc 
					 
					
						
						
							
							WinRT core compatibility fixes  
						
						... 
						
						
						
						Update system.cpp
Update system.cpp
Update ocl.cpp
Update matching.cpp
Update ocl.cpp
Update matching.cpp 
						
						
					 
					
						2014-05-07 06:15:54 +08:00 
						 
				 
			
				
					
						
							
							
								Maks Naumov 
							
						 
					 
					
						
						
							
						
						dba0f9fc8f 
					 
					
						
						
							
							remove unused variable in erGrouping()  
						
						
						
						
					 
					
						2014-04-17 00:16:07 +03:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						799d2dabd6 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/core/test/test_arithm.cpp
	modules/cuda/src/cascadeclassifier.cpp
	modules/imgproc/doc/geometric_transformations.rst
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/moments.cpp 
						
						
					 
					
						2014-04-14 16:08:02 +04:00 
						 
				 
			
				
					
						
							
							
								Maks Naumov 
							
						 
					 
					
						
						
							
						
						9b52b61451 
					 
					
						
						
							
							remove unused variable in HOGDescriptor::groupRectangles()  
						
						
						
						
					 
					
						2014-04-09 22:56:19 +03:00 
						 
				 
			
				
					
						
							
							
								vbystricky 
							
						 
					 
					
						
						
							
						
						1b3651d8ee 
					 
					
						
						
							
							Undo changes ipp to ippicv prefix of function names  
						
						
						
						
					 
					
						2014-04-07 14:30:03 +04:00 
						 
				 
			
				
					
						
							
							
								vbystricky 
							
						 
					 
					
						
						
							
						
						3b03044047 
					 
					
						
						
							
							Fix warning  
						
						
						
						
					 
					
						2014-04-07 14:26:44 +04:00 
						 
				 
			
				
					
						
							
							
								vbystricky 
							
						 
					 
					
						
						
							
						
						01a66a2938 
					 
					
						
						
							
							Prepare codes for ippicv library  
						
						
						
						
					 
					
						2014-04-07 14:24:05 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						ef9669ba1a 
					 
					
						
						
							
							Merge pull request  #2506  from apavlenko:lbp_ocl_use_any_device  
						
						
						
						
					 
					
						2014-03-21 18:24:36 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						d060d30fa0 
					 
					
						
						
							
							enabling OCL LBP branch for all devices  
						
						
						
						
					 
					
						2014-03-20 21:57:34 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Karsakov 
							
						 
					 
					
						
						
							
						
						b14c314fc3 
					 
					
						
						
							
							Fixed incorrect thread synchronizations  
						
						
						
						
					 
					
						2014-03-20 13:03:03 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Karsakov 
							
						 
					 
					
						
						
							
						
						30a8308f8e 
					 
					
						
						
							
							Enabled Intel-specific optimizations for HOG detector.  
						
						
						
						
					 
					
						2014-03-19 17:30:13 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Karsakov 
							
						 
					 
					
						
						
							
						
						4698d62125 
					 
					
						
						
							
							Removed workaround for Intel platform.  
						
						
						
						
					 
					
						2014-03-14 14:18:52 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Karsakov 
							
						 
					 
					
						
						
							
						
						c1dad2178c 
					 
					
						
						
							
							Added Device:: isAMD,isIntel,isNvidia methods.  
						
						
						
						
					 
					
						2014-03-05 14:43:11 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						ce0557ebb8 
					 
					
						
						
							
							fixed defects from Xcode  
						
						
						
						
					 
					
						2014-02-25 17:33:12 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						0ee5c34f40 
					 
					
						
						
							
							Merge pull request  #2324  from vpisarev:fix_facedetect  
						
						
						
						
					 
					
						2014-02-13 11:46:24 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						91587059ad 
					 
					
						
						
							
							tab => spaces  
						
						
						
						
					 
					
						2014-02-12 20:28:55 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						a18bc9651d 
					 
					
						
						
							
							fixed bug reported by Irina K. Also tried to fix LBP detector regression in quality (probably it did not help but still ...)  
						
						
						
						
					 
					
						2014-02-12 17:42:09 +04:00 
						 
				 
			
				
					
						
							
							
								berak 
							
						 
					 
					
						
						
							
						
						3959329ef4 
					 
					
						
						
							
							proper initialization for ccimpl in bool CascadeClassifier::read(const FileNode  
						
						
						
						
					 
					
						2014-02-08 14:42:09 +01:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						22146e4b18 
					 
					
						
						
							
							Merge pull request  #2234  from KonstantinMatskevich:ocl_tapi_hog  
						
						
						
						
					 
					
						2014-02-04 16:35:12 +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 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						30593ee55e 
					 
					
						
						
							
							3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.  
						
						
						
						
					 
					
						2014-02-03 15:12:27 +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 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						37789f015a 
					 
					
						
						
							
							deleted excess semicolons, commas  
						
						
						
						
					 
					
						2014-01-18 01:31:33 +04:00 
						 
				 
			
				
					
						
							
							
								Patrick Tsai 
							
						 
					 
					
						
						
							
						
						b24f7ee57c 
					 
					
						
						
							
							Fix compiler error with Android NDK r8e  
						
						... 
						
						
						
						Original error without the fix:
opencv/modules/objdetect/src/cascadedetect.cpp: In member function 'bool cv::CascadeClassifierImpl::ocl_detectSingleScale(const cv::_InputArray&, cv::Size, int, double, cv::Size)':
/opencv/modules/objdetect/src/cascadedetect.cpp:1215:
error: no matching function for call to 'cv::ocl::Kernel::args(cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, int, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::Size&, int&, float, cv::Rect&, cv::Size&, cv::CascadeClassifierImpl::<anonymous enum>)' 
						
						
					 
					
						2014-01-09 14:49:20 +08:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						9dfb96389c 
					 
					
						
						
							
							Merge commit '4b885e206' into merge-2.4  
						
						
						
						
					 
					
						2013-12-30 16:48:45 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Karsakov 
							
						 
					 
					
						
						
							
						
						6ef0253fb7 
					 
					
						
						
							
							Disabled some IPP implementation since it breaks tests  
						
						
						
						
					 
					
						2013-12-26 19:53:53 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						bc730292bb 
					 
					
						
						
							
							workaround for some strange bug on old Mac.  
						
						
						
						
					 
					
						2013-12-23 21:29:31 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						8998186ce4 
					 
					
						
						
							
							removed extra whitespaces and hopefully fixed the test failures  
						
						
						
						
					 
					
						2013-12-23 18:41:54 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						d084d19779 
					 
					
						
						
							
							added OpenCL optimization for LBP-based face detector  
						
						
						
						
					 
					
						2013-12-23 15:28:50 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						1540910542 
					 
					
						
						
							
							started adding OpenCL acceleration of LBP-based object detectors  
						
						
						
						
					 
					
						2013-12-20 18:39:35 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						242a3d1f19 
					 
					
						
						
							
							2 more fixes to calm down the doc builder  
						
						
						
						
					 
					
						2013-12-19 16:57:02 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						f41f633d2d 
					 
					
						
						
							
							fixed various warnings from the “doc” and other builders  
						
						
						
						
					 
					
						2013-12-19 16:31:30 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						a1784b7320 
					 
					
						
						
							
							converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.  
						
						
						
						
					 
					
						2013-12-19 14:48:42 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						ec3f22cee2 
					 
					
						
						
							
							renamed OpenCL kernel filename; made some final changes  
						
						
						
						
					 
					
						2013-12-19 14:29:28 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						b7553d4e2e 
					 
					
						
						
							
							some attempts to tune the performance  
						
						
						
						
					 
					
						2013-12-19 14:09:44 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						02fb3f0a77 
					 
					
						
						
							
							it finally works!!!  
						
						
						
						
					 
					
						2013-12-17 20:55:49 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						ef509ace43 
					 
					
						
						
							
							trying to debug the new cascade  
						
						
						
						
					 
					
						2013-12-17 14:51:22 +04:00