Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						da2790249e 
					 
					
						
						
							
							added NORM_L2SQR type to cv::norm  
						
						
						
						
					 
					
						2014-01-10 18:45:52 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						2e5e278271 
					 
					
						
						
							
							added cv::PSNR performance test  
						
						
						
						
					 
					
						2014-01-10 18:45:40 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						a01e81c8f7 
					 
					
						
						
							
							added some performance tests  
						
						
						
						
					 
					
						2014-01-10 18:45:40 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						5a9900481a 
					 
					
						
						
							
							Merge pull request  #2105  from ilya-lavrenov:norm  
						
						
						
						
					 
					
						2014-01-10 18:12:08 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						9899cf7519 
					 
					
						
						
							
							fixed cv::mixChannels perf test  
						
						
						
						
					 
					
						2014-01-09 14:26:44 +04:00 
						 
				 
			
				
					
						
							
							
								Max Khardin 
							
						 
					 
					
						
						
							
						
						699eda46b6 
					 
					
						
						
							
							Remove three sneaky tabs  
						
						
						
						
					 
					
						2014-01-04 20:09:30 +08:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						3a4d4080f4 
					 
					
						
						
							
							fixed overflow for cv::norm NORM_L2  
						
						
						
						
					 
					
						2014-01-04 15:20:50 +04:00 
						 
				 
			
				
					
						
							
							
								Max Khardin 
							
						 
					 
					
						
						
							
						
						34b05794d6 
					 
					
						
						
							
							Fix source code indents  
						
						
						
						
					 
					
						2014-01-04 19:01:32 +08:00 
						 
				 
			
				
					
						
							
							
								Max Khardin 
							
						 
					 
					
						
						
							
						
						214e9d4b12 
					 
					
						
						
							
							Add performance tests for elementwise multiplication  
						
						
						
						
					 
					
						2014-01-04 18:56:32 +08:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						bb7e96311e 
					 
					
						
						
							
							disabled cv::split perf test  
						
						
						
						
					 
					
						2013-12-27 21:57:20 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						31e6251793 
					 
					
						
						
							
							added new perf tests to core  
						
						
						
						
					 
					
						2013-12-27 20:02:12 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						d7c22343aa 
					 
					
						
						
							
							added perf tests for T-API core functions  
						
						
						
						
					 
					
						2013-12-25 18:19:40 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						7d9150460a 
					 
					
						
						
							
							core/ocl: added perf test infra + "Add" perf test  
						
						
						
						
					 
					
						2013-12-03 18:43:50 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						9218f4976c 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp 
						
						
					 
					
						2013-09-02 19:44:51 +04:00 
						 
				 
			
				
					
						
							
							
								kdrobnyh 
							
						 
					 
					
						
						
							
						
						f4aa7ff919 
					 
					
						
						
							
							Add IPP support in meanStdDev, minMaxIdx, norm functions  
						
						
						
						
					 
					
						2013-08-29 21:09:19 +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 
							
						 
					 
					
						
						
							
						
						4d06c4c7b6 
					 
					
						
						
							
							Merge commit '43aec5ad^' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/contrib/src/inputoutput.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpuarithm/perf/perf_element_operations.cpp
	modules/gpuarithm/src/element_operations.cpp
	modules/ts/src/precomp.hpp 
						
						
					 
					
						2013-08-27 13:23:26 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						43aec5ad4a 
					 
					
						
						
							
							Merge pull request  #1318  from SpecLad:wow  
						
						
						
						
					 
					
						2013-08-22 11:49:45 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						e9a28f66ee 
					 
					
						
						
							
							Normalized file endings.  
						
						
						
						
					 
					
						2013-08-21 18:59:25 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Smorkalov 
							
						 
					 
					
						
						
							
						
						b15addec70 
					 
					
						
						
							
							C4447 warning about main function format suppressed.  
						
						
						
						
					 
					
						2013-08-21 07:24:46 -07:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						f76dd99299 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp 
						
						
					 
					
						2013-08-19 19:02:36 +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 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						d9f71b762f 
					 
					
						
						
							
							Deleted almost all of the precomp.cpp files.  
						
						... 
						
						
						
						Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time. 
						
						
					 
					
						2013-08-08 12:43:07 +04:00 
						 
				 
			
				
					
						
							
							
								kdrobnyh 
							
						 
					 
					
						
						
							
						
						4dfd40bec0 
					 
					
						
						
							
							Add IPP mean and sum functions  
						
						
						
						
					 
					
						2013-07-25 21:27:35 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						13cd0a0502 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4'  
						
						... 
						
						
						
						Original pull requests:
	#996  from jet47:gpu-nvcuvid-libraries
	#995  from jet47:fix-bug-2985
	#999  from snosov1:unreliable-results-fix
	#1005  from alekcac:doc_fix
	#1004  from jet47:fix-bug-3068
	#987  from jet47:bug-3085-fix
	#969  from pengx17:2.4_binary_cache
	#929  from dominikrose:mingw-libdc1394-2-windows
	#1000  from ivan-korolev:fix_sift_bug_2892
	#1001  from ivan-korolev:fix_stitching_bug_2405
	#998  from asmorkalov:android_cmake_mips_fix
	#993  from ivan-korolev:fix_videostab_bug_3023
	#988  from snosov1:3071-fix
	#986  from pengx17:2.4_initiated_context
	#982  from pengx17:2.4_fix_two_bugs
	#981  from SeninAndrew:ximea_camera_support_fix
	#991  from asmorkalov:android_javadoc_fix
	#972  from jet47:mog2-params-bug-2168
	#980  from SpecLad:include-config
	#973  from pengx17:2.4_oclclahe
	#903  from aks2:2.4
	#968  from asmorkalov:android_na_cproj_fix
	#971  from SpecLad:matchers-ctor
	#970  from asmorkalov:dshow_valid_check_fix
	#965  from apavlenko:fix_java_empty_mats
Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp 
						
						
					 
					
						2013-06-19 15:25:37 +04:00 
						 
				 
			
				
					
						
							
							
								Sergei Nosov 
							
						 
					 
					
						
						
							
						
						c90abb6a03 
					 
					
						
						
							
							add multiruns to fix "unreliable results" error  
						
						
						
						
					 
					
						2013-06-13 21:14:42 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						8fdab9f631 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-04-17 12:07:17 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						96b008cd29 
					 
					
						
						
							
							Eliminate the need of ::testsing::ValuesIn() for CV_ENUM  
						
						... 
						
						
						
						Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS 
						
						
					 
					
						2013-04-15 19:39:49 +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 
						 
				 
			
				
					
						
							
							
								Anna Kogan 
							
						 
					 
					
						
						
							
						
						a567c03fdf 
					 
					
						
						
							
							Switched to TEST_CYCLE_MULTIRUN for fast tests  
						
						
						
						
					 
					
						2013-02-20 17:05:54 +04:00 
						 
				 
			
				
					
						
							
							
								Anna Kogan 
							
						 
					 
					
						
						
							
						
						ed4c687d45 
					 
					
						
						
							
							Increased time limits, eliminated extra params  
						
						
						
						
					 
					
						2013-01-31 16:18:52 +04:00 
						 
				 
			
				
					
						
							
							
								Anna Kogan 
							
						 
					 
					
						
						
							
						
						4e21f42714 
					 
					
						
						
							
							increased time-limits  
						
						
						
						
					 
					
						2012-11-28 18:17:33 +04:00 
						 
				 
			
				
					
						
							
							
								Anna Kogan 
							
						 
					 
					
						
						
							
						
						8877066846 
					 
					
						
						
							
							increased time-limits  
						
						
						
						
					 
					
						2012-11-28 18:17:33 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						a126532cb7 
					 
					
						
						
							
							Fix OS X build warnings  
						
						
						
						
					 
					
						2012-11-09 11:29:52 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						63ee26adda 
					 
					
						
						
							
							Merge pull request  #127  from cuda-geek/apple2clang  
						
						
						
						
					 
					
						2012-11-02 14:29:39 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						7a5b9a6b7f 
					 
					
						
						
							
							replase __APPLE__ marco with __clang__  
						
						
						
						
					 
					
						2012-11-01 19:34:05 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e3be5f138a 
					 
					
						
						
							
							Fixed sanity checks in several performance tests  
						
						
						
						
					 
					
						2012-11-01 16:29:30 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						2b0072d823 
					 
					
						
						
							
							Suppress more warnings in gtest on OS X  
						
						
						
						
					 
					
						2012-10-24 20:36:30 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						b45a870d9a 
					 
					
						
						
							
							Limit 32S data in perf test for addWeighted to avoid integer overflow  
						
						
						
						
					 
					
						2012-10-23 12:07:32 +04:00 
						 
				 
			
				
					
						
							
							
								OpenCV Buildbot 
							
						 
					 
					
						
						
							
						
						04384a71e4 
					 
					
						
						
							
							Normalize line endings and whitespace  
						
						
						
						
					 
					
						2012-10-17 15:32:23 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						8d7ac8ad19 
					 
					
						
						
							
							minor ending fix  
						
						
						
						
					 
					
						2012-10-12 14:46:18 +04:00 
						 
				 
			
				
					
						
							
							
								daniil.osokin 
							
						 
					 
					
						
						
							
						
						a245161de6 
					 
					
						
						
							
							added perf test for kmeans  
						
						
						
						
					 
					
						2012-10-10 12:51:11 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						2446c9329f 
					 
					
						
						
							
							Remove bad perf test for cvRound  
						
						
						
						
					 
					
						2012-10-08 18:40:41 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						8c8ebd9ca6 
					 
					
						
						
							
							Fix sanity checks for arithmetic tests on CV_32S data  
						
						
						
						
					 
					
						2012-10-08 18:06:17 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						3bad6ac0ee 
					 
					
						
						
							
							This reverts commit  738d3fef38.  
						
						
						
						
					 
					
						2012-09-19 18:03:50 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Kapustin 
							
						 
					 
					
						
						
							
						
						738d3fef38 
					 
					
						
						
							
							1. New function ActualScalarDepth was added  
						
						... 
						
						
						
						2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added 
						
						
					 
					
						2012-09-19 17:08:25 +04:00 
						 
				 
			
				
					
						
							
							
								Daniil Osokin 
							
						 
					 
					
						
						
							
						
						45c49a9088 
					 
					
						
						
							
							Added perf test  
						
						
						
						
					 
					
						2012-08-10 17:37:48 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e900952b87 
					 
					
						
						
							
							quiet most of the OSX build warnings  
						
						
						
						
					 
					
						2012-07-05 12:56:31 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						47a4e87784 
					 
					
						
						
							
							Ignored warnings from gtest with precompiled headers enabled  
						
						
						
						
					 
					
						2012-06-08 14:54:17 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						49a1ba6038 
					 
					
						
						
							
							Set stricter warning rules for gcc  
						
						
						
						
					 
					
						2012-06-07 17:21:29 +00:00