cbalint13 
							
						 
					 
					
						
						
							
						
						fb56d5c482 
					 
					
						
						
							
							Squash all BRISK commits into one.  
						
						
						
						
					 
					
						2015-05-06 11:21:25 +03:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						cf4c79ebdd 
					 
					
						
						
							
							disabled some kernels for Android && NVidia  
						
						
						
						
					 
					
						2015-03-04 14:46:49 +03:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						01d3848f17 
					 
					
						
						
							
							all the tests now pass except for MSER  
						
						
						
						
					 
					
						2014-10-17 14:56:58 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						09df1a286b 
					 
					
						
						
							
							OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet  
						
						
						
						
					 
					
						2014-10-17 14:56:58 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						55188fe991 
					 
					
						
						
							
							world fix  
						
						
						
						
					 
					
						2014-08-05 20:12:35 +04:00 
						 
				 
			
				
					
						
							
							
								vbystricky 
							
						 
					 
					
						
						
							
						
						4286f60387 
					 
					
						
						
							
							Extract imgcodecs module from highgui  
						
						
						
						
					 
					
						2014-07-07 16:28:08 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						6c2d77079f 
					 
					
						
						
							
							Merge pull request  #2487  from ilya-lavrenov:tapi_perf_orb  
						
						
						
						
					 
					
						2014-03-31 18:17:50 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						c53398a438 
					 
					
						
						
							
							performance tests for FAST  
						
						
						
						
					 
					
						2014-03-31 15:03:00 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						b47bec2ed0 
					 
					
						
						
							
							performance tests for ORB  
						
						
						
						
					 
					
						2014-03-13 23:30:02 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						3e854fa6e5 
					 
					
						
						
							
							finished OpenCL port of ORB  
						
						
						
						
					 
					
						2014-03-13 22:56:53 +04:00 
						 
				 
			
				
					
						
							
							
								Konstantin Matskevich 
							
						 
					 
					
						
						
							
						
						133f91f3f2 
					 
					
						
						
							
							added perf test  
						
						
						
						
					 
					
						2014-01-23 07:51: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 
							
						 
					 
					
						
						
							
						
						e9a28f66ee 
					 
					
						
						
							
							Normalized file endings.  
						
						
						
						
					 
					
						2013-08-21 18:59:25 +04: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 
							
						 
					 
					
						
						
							
						
						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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						13b6a3a15e 
					 
					
						
						
							
							Merge branch 2.4  
						
						
						
						
					 
					
						2012-12-24 17:10:07 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						b870b246e1 
					 
					
						
						
							
							Fix memory corruption in batchDistance perf tests  
						
						
						
						
					 
					
						2012-12-22 21:01:57 +04:00 
						 
				 
			
				
					
						
							
							
								Anatoly Baksheev 
							
						 
					 
					
						
						
							
						
						94c310fc14 
					 
					
						
						
							
							added Ptr::operator==  
						
						
						
						
					 
					
						2012-12-15 22:48:50 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e10ee89ec4 
					 
					
						
						
							
							Merge branch 2.4  
						
						
						
						
					 
					
						2012-11-30 19:54:24 +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 
							
						 
					 
					
						
						
							
						
						9719ea93b6 
					 
					
						
						
							
							Merge branch 2.4  
						
						
						
						
					 
					
						2012-11-13 19:54:48 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						a126532cb7 
					 
					
						
						
							
							Fix OS X build warnings  
						
						
						
						
					 
					
						2012-11-09 11:29:52 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						4d059e9e5b 
					 
					
						
						
							
							Merge release 2.4.3  
						
						
						
						
					 
					
						2012-11-02 17:58:02 +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 
							
						 
					 
					
						
						
							
						
						b5ecb1d32d 
					 
					
						
						
							
							Merge pull request  #111  from taka-no-me/algorithm/addParam-short  
						
						
						
						
					 
					
						2012-10-31 16:57:06 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						84934f7bfc 
					 
					
						
						
							
							Fix SHORT data type support in Algorithm  
						
						... 
						
						
						
						* typo in Algorithm::addParam for 'short' data type which results in segmentation fault on ARM
  on attempt to set type property for FAST using setter inherited from Algorithm
* added short type support to read/write methods
* improved some error messages 
						
						
					 
					
						2012-10-26 17:00:13 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						2b0072d823 
					 
					
						
						
							
							Suppress more warnings in gtest on OS X  
						
						
						
						
					 
					
						2012-10-24 20:36:30 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						5a730d09cd 
					 
					
						
						
							
							Fix binary compatibility of opencv_features2d  
						
						
						
						
					 
					
						2012-10-17 02:09:14 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						821de96346 
					 
					
						
						
							
							Adjust thresholds in sanity checks for batchDistance  
						
						
						
						
					 
					
						2012-10-11 20:35:28 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						97640847c5 
					 
					
						
						
							
							Add methods to sort keypoints and corresponding descriptors  
						
						
						
						
					 
					
						2012-10-11 18:25:45 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						5047f2d64d 
					 
					
						
						
							
							Fix perf tests in features2d module  
						
						
						
						
					 
					
						2012-10-09 18:41:27 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						d4cf9e22cc 
					 
					
						
						
							
							Fix terrible perf test for FAST detector  
						
						
						
						
					 
					
						2012-10-09 18:41:26 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						06a13d9ba0 
					 
					
						
						
							
							replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet  
						
						
						
						
					 
					
						2012-10-02 23:07:46 +04:00 
						 
				 
			
				
					
						
							
							
								Daniil Osokin 
							
						 
					 
					
						
						
							
						
						45c49a9088 
					 
					
						
						
							
							Added perf test  
						
						
						
						
					 
					
						2012-08-10 17:37:48 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						640408ebe7 
					 
					
						
						
							
							added FAST<5/8> & FAST<7/12> (by Vincent Rabaud)  
						
						
						
						
					 
					
						2012-07-31 17:17:58 +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 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						957e80abbd 
					 
					
						
						
							
							lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.  
						
						
						
						
					 
					
						2012-03-15 14:36:01 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						65f5343ed5 
					 
					
						
						
							
							Refactored performance tests. TEST_CYCLE macro is renamed to TEST_CYCLE_N; SIMPLE_TEST_CYCLE is renamed to TEST_CYCLE; from now 100 iterations are default for performance tests  
						
						
						
						
					 
					
						2011-12-29 16:46:16 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						3970664e24 
					 
					
						
						
							
							Performance test for FAST features detector  
						
						
						
						
					 
					
						2011-10-28 12:52:20 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						3f22a1c40f 
					 
					
						
						
							
							Performace tests for ORB  
						
						
						
						
					 
					
						2011-10-27 14:46:12 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						22bd127365 
					 
					
						
						
							
							Added performance tests for cv:phase and cv::SURF  
						
						
						
						
					 
					
						2011-10-07 13:55:26 +00:00