Mansour Moufid 
							
						 
					 
					
						
						
							
						
						b99f7a29df 
					 
					
						
						
							
							Cast some image coordinates and sizes to double.  
						
						... 
						
						
						
						Conflicts:
	modules/gpu/perf/perf_imgproc.cpp
Cast a long integer to double explicitly.
Conflicts:
	modules/python/src2/cv2.cpp
Cast some matrix sizes to type int.
Change some vector mask types to unsigned.
Conflicts:
	modules/core/src/arithm.cpp 
						
						
					 
					
						2015-04-25 18:54:53 +02:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						2c4bbb313c 
					 
					
						
						
							
							Merge commit '43aec5ad' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py 
						
						
					 
					
						2013-08-27 13:26:44 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						e9a28f66ee 
					 
					
						
						
							
							Normalized file endings.  
						
						
						
						
					 
					
						2013-08-21 18:59:25 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e5a33723fc 
					 
					
						
						
							
							Move C API of opencv_calib3d to separate file  
						
						
						
						
					 
					
						2013-04-11 21:00:17 +04:00 
						 
				 
			
				
					
						
							
							
								OpenCV Buildbot 
							
						 
					 
					
						
						
							
						
						81f826db2b 
					 
					
						
						
							
							Normalize line endings and whitespace  
						
						
						
						
					 
					
						2012-10-17 15:57:49 +04:00 
						 
				 
			
				
					
						
							
							
								OpenCV Buildbot 
							
						 
					 
					
						
						
							
						
						04384a71e4 
					 
					
						
						
							
							Normalize line endings and whitespace  
						
						
						
						
					 
					
						2012-10-17 15:32:23 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						061b49e0b2 
					 
					
						
						
							
							reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.  
						
						
						
						
					 
					
						2011-02-09 20:55:11 +00:00