Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						aa5326c231 
					 
					
						
						
							
							cv::norm -> cvtest::norm in tests  
						
						... 
						
						
						
						Conflicts:
	modules/core/src/stat.cpp 
						
						
					 
					
						2014-04-08 14:49:20 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						32eb38ec98 
					 
					
						
						
							
							fixed defects from coverity.com  
						
						
						
						
					 
					
						2014-02-23 20:21:08 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						fee2ed37fc 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp 
						
						
					 
					
						2014-01-14 11:53:59 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						6b9ebcbf3d 
					 
					
						
						
							
							deleted extra semicolons  
						
						
						
						
					 
					
						2014-01-07 02:52:30 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						09d25e11c6 
					 
					
						
						
							
							fixed bug  #3341  
						
						
						
						
					 
					
						2013-12-30 16:47:54 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						e9a28f66ee 
					 
					
						
						
							
							Normalized file endings.  
						
						
						
						
					 
					
						2013-08-21 18:59:25 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						6b5ac42a9b 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml 
						
						
					 
					
						2013-08-13 12:56:39 +04:00 
						 
				 
			
				
					
						
							
							
								kdrobnyh 
							
						 
					 
					
						
						
							
						
						4dfd40bec0 
					 
					
						
						
							
							Add IPP mean and sum functions  
						
						
						
						
					 
					
						2013-07-25 21:27:35 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						67073daf19 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-04-05 21:11:59 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						715fa3303e 
					 
					
						
						
							
							Move cv::Mat out of core.hpp  
						
						
						
						
					 
					
						2013-04-01 15:24:34 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						6f68640d4d 
					 
					
						
						
							
							Multiple fixes for WinRT  
						
						... 
						
						
						
						Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled; 
						
						
					 
					
						2013-03-26 17:19:52 -07:00 
						 
				 
			
				
					
						
							
							
								Kirill Kornyakov 
							
						 
					 
					
						
						
							
						
						74e5650350 
					 
					
						
						
							
							Reenabled second test  
						
						
						
						
					 
					
						2013-02-11 16:53:41 +04:00 
						 
				 
			
				
					
						
							
							
								Kirill Kornyakov 
							
						 
					 
					
						
						
							
						
						7071bd63ab 
					 
					
						
						
							
							Added two tests to highlight bug  #2788  
						
						
						
						
					 
					
						2013-02-11 15:25:15 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						99c666691e 
					 
					
						
						
							
							Restore core multiply/divide depth to CV_64F value.  
						
						... 
						
						
						
						After setting depth to CV_32F for non double types this produces difference in results. I've attached test that reproduce this issue.The issue was found during anali broken GPU tests  for multiply/device functions. 
						
						
					 
					
						2012-10-21 11:20:39 +04:00 
						 
				 
			
				
					
						
							
							
								Marina Kolpakova 
							
						 
					 
					
						
						
							
						
						162f9fd7ea 
					 
					
						
						
							
							merged the trunk r8735:8766, r8769, r8777:8780, r8790  and r8800:8811  
						
						
						
						
					 
					
						2012-06-28 17:07:17 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						bd0e0b5800 
					 
					
						
						
							
							Merged the trunk r8589:8653 - all changes related to build warnings  
						
						
						
						
					 
					
						2012-06-15 13:04:17 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						c3577a288b 
					 
					
						
						
							
							Merged the trunk r8291:8321  
						
						
						
						
					 
					
						2012-05-18 12:34:01 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						09140c2fc6 
					 
					
						
						
							
							Reenabled OpponentSIFT test;  
						
						... 
						
						
						
						Changed compiler flags for 32-bit MSVC;
Fixed handling of "d" suffix of debug binaries in run.py. 
						
						
					 
					
						2012-04-26 21:37:27 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						b8e70ea6c9 
					 
					
						
						
							
							NORM_L2SQR added too (ticket  #1840 )  
						
						
						
						
					 
					
						2012-04-23 12:29:23 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						40f2c716af 
					 
					
						
						
							
							added NORM_HAMMING* support to cv::norm (ticket  #1840 )  
						
						
						
						
					 
					
						2012-04-23 12:19:02 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						2a626e1a2d 
					 
					
						
						
							
							fixed input array initialization in ArithmMaskUninitialized test (thanks to Alexander!)  
						
						
						
						
					 
					
						2012-04-09 14:51:08 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						700c1665c9 
					 
					
						
						
							
							Fixed 2 spontaneously failing tests  
						
						
						
						
					 
					
						2012-03-29 03:05:41 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						bf12855007 
					 
					
						
						
							
							fixed mask operations with uninitialized output array, added the corresponding test (ticket  #1286 )  
						
						
						
						
					 
					
						2012-03-28 09:07:00 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						691d392312 
					 
					
						
						
							
							Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005.  
						
						
						
						
					 
					
						2012-02-16 20:29:35 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						ce81868ba4 
					 
					
						
						
							
							Fixed cv::norm accuracy test allowed error  
						
						
						
						
					 
					
						2011-12-19 15:15:40 +00:00 
						 
				 
			
				
					
						
							
							
								Kirill Kornyakov 
							
						 
					 
					
						
						
							
						
						03002fff54 
					 
					
						
						
							
							Optimized version of 32F Norm function demands bigger MaxErr value, because it calculates norm in floats instead of double.  
						
						
						
						
					 
					
						2011-11-21 11:48:56 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						ff5e97c8e4 
					 
					
						
						
							
							added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings  
						
						
						
						
					 
					
						2011-07-19 12:27:07 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						cc9a1bb62f 
					 
					
						
						
							
							propagated some more fixes from 2.3 branch to the trunk  
						
						
						
						
					 
					
						2011-06-30 12:06:26 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						abeeb40d46 
					 
					
						
						
							
							a big patch; use special proxy types (Input/OutputArray, Input/OutputArrayOfArrays) for passing in vectors, matrices etc.  
						
						
						
						
					 
					
						2011-04-17 13:14:45 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						d9ab1d2b92 
					 
					
						
						
							
							fixed build on Windows with MSVC2010  
						
						
						
						
					 
					
						2011-02-09 22:45:45 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						77529b1fa6 
					 
					
						
						
							
							fixed bugs in CartToPolarToCart test  
						
						
						
						
					 
					
						2011-02-09 21:37:33 +00: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 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						be4251c143 
					 
					
						
						
							
							fixed compile problems when Makefiles are used  
						
						
						
						
					 
					
						2011-01-11 12:14:31 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						d2c2c07ad2 
					 
					
						
						
							
							updated the new arithmetic tests  
						
						
						
						
					 
					
						2011-01-11 11:55:58 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						97d9a672cc 
					 
					
						
						
							
							moved gtest to modules; added some gtest-based tests  
						
						
						
						
					 
					
						2010-12-28 16:24:23 +00:00