Pierre Moulon 
							
						 
					 
					
						
						
							
						
						901d4995e3 
					 
					
						
						
							
							Fix a typo error  
						
						... 
						
						
						
						Fix a typo error
Conflicts:
	modules/features2d/include/opencv2/features2d.hpp 
						
						
					 
					
						2015-04-25 15:07:17 +02:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						91e21847e2 
					 
					
						
						
							
							Some changes to make migration to 3.0 easier  
						
						
						
						
					 
					
						2014-12-16 13:00:31 +03:00 
						 
				 
			
				
					
						
							
							
								Maksim Shabunin 
							
						 
					 
					
						
						
							
						
						9b55c09999 
					 
					
						
						
							
							Basic doxygen documentation support  
						
						... 
						
						
						
						- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
Conflicts:
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/core/include/opencv2/core.hpp
	modules/core/include/opencv2/core/base.hpp
	modules/core/include/opencv2/core/cuda.inl.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/matx.hpp
	modules/core/include/opencv2/core/types.hpp
	modules/flann/include/opencv2/flann/lsh_table.h
	modules/imgproc/include/opencv2/imgproc.hpp 
						
						
					 
					
						2014-10-23 18:27:26 +04:00 
						 
				 
			
				
					
						
							
							
								berak 
							
						 
					 
					
						
						
							
						
						3500c940d4 
					 
					
						
						
							
							add Bag of Words to python wrapper  
						
						
						
						
					 
					
						2014-06-11 11:50:22 +02:00 
						 
				 
			
				
					
						
							
							
								berak 
							
						 
					 
					
						
						
							
						
						fc610979bb 
					 
					
						
						
							
							export BOW to script wrappers  
						
						
						
						
					 
					
						2014-06-07 16:34:53 +02:00 
						 
				 
			
				
					
						
							
							
								Ilya Lavrenov 
							
						 
					 
					
						
						
							
						
						099ea91823 
					 
					
						
						
							
							typos  
						
						
						
						
					 
					
						2014-03-04 12:47:40 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Alekhin 
							
						 
					 
					
						
						
							
						
						0ee47502d9 
					 
					
						
						
							
							remove CV_EXPORT from templates  
						
						
						
						
					 
					
						2013-09-15 13:48:54 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						57bd485119 
					 
					
						
						
							
							compute method for Feature2D  
						
						
						
						
					 
					
						2013-07-25 16:22:31 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						3677a66403 
					 
					
						
						
							
							line realign  
						
						
						
						
					 
					
						2013-07-04 17:43:38 +04:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						8045093cfb 
					 
					
						
						
							
							GFTT wrapped to python  
						
						
						
						
					 
					
						2013-07-03 22:26:18 +04:00 
						 
				 
			
				
					
						
							
							
								LeonidBeynenson 
							
						 
					 
					
						
						
							
						
						b85a098d9c 
					 
					
						
						
							
							Added float, uint64, and uchar params to Algorithm  
						
						... 
						
						
						
						Made changes to work in cv::Algorithm with parameters of these types.
Also fixed SimpleBlobDetector -- now it can be created by
cv::Algorithm::create and it can work with cv::Algorithm::set/get. 
						
						
					 
					
						2013-02-04 20:25:18 +04:00 
						 
				 
			
				
					
						
							
							
								Ilya Lysenkov 
							
						 
					 
					
						
						
							
						
						7745c8806c 
					 
					
						
						
							
							Added info() method in descriptor matchers ( #2330 )  
						
						
						
						
					 
					
						2013-02-01 02:23:40 +04:00 
						 
				 
			
				
					
						
							
							
								OpenCV Buildbot 
							
						 
					 
					
						
						
							
						
						04384a71e4 
					 
					
						
						
							
							Normalize line endings and whitespace  
						
						
						
						
					 
					
						2012-10-17 15:32:23 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						5a730d09cd 
					 
					
						
						
							
							Fix binary compatibility of opencv_features2d  
						
						
						
						
					 
					
						2012-10-17 02:09:14 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						a8c5e35619 
					 
					
						
						
							
							some more fixes towards binary compatibility  
						
						
						
						
					 
					
						2012-10-09 15:56:16 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						84087a8566 
					 
					
						
						
							
							fixed crash in Python's SURF wrapper (bug  #2325 )  
						
						
						
						
					 
					
						2012-09-11 16:47:25 +04:00 
						 
				 
			
				
					
						
							
							
								Vincent Rabaud 
							
						 
					 
					
						
						
							
						
						84c4797030 
					 
					
						
						
							
							revert orientation computation in jeypoint detection for efficiency (like done originally)  
						
						
						
						
					 
					
						2012-08-30 16:28:39 +04:00 
						 
				 
			
				
					
						
							
							
								Vincent Rabaud 
							
						 
					 
					
						
						
							
						
						13ded36ecb 
					 
					
						
						
							
							initial addition of BRISK with some tests  
						
						
						
						
					 
					
						2012-08-30 16:28:39 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						633a8bfacc 
					 
					
						
						
							
							fixed many warnings (modified pull request 13)  
						
						
						
						
					 
					
						2012-08-28 18:15:14 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						640408ebe7 
					 
					
						
						
							
							added FAST<5/8> & FAST<7/12> (by Vincent Rabaud)  
						
						
						
						
					 
					
						2012-07-31 17:17:58 +04:00 
						 
				 
			
				
					
						
							
							
								Maria Dimashova 
							
						 
					 
					
						
						
							
						
						6dc5cd15ed 
					 
					
						
						
							
							specified KeyPoint::angle in rst doc and code comment  
						
						
						
						
					 
					
						2012-07-14 15:36:35 +00:00 
						 
				 
			
				
					
						
							
							
								Maria Dimashova 
							
						 
					 
					
						
						
							
						
						017895dd93 
					 
					
						
						
							
							filtered MSER keypoints that have centers out of image  
						
						
						
						
					 
					
						2012-07-12 17:51:12 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						c5669448a3 
					 
					
						
						
							
							work on features2d python interface  
						
						
						
						
					 
					
						2012-07-11 17:13:43 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						c6705fbe20 
					 
					
						
						
							
							exposed ORB features to python  
						
						
						
						
					 
					
						2012-07-06 15:41:57 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						d9c74f63e1 
					 
					
						
						
							
							All tests writing temporary files are updated to use cv::tempfile() function  
						
						
						
						
					 
					
						2012-06-25 11:24:06 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						74707ec7ae 
					 
					
						
						
							
							added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)  
						
						
						
						
					 
					
						2012-06-24 01:37:55 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						2990f23e0c 
					 
					
						
						
							
							grid-adapted feature detector made a proper Algorithm (ticket  #1874 )  
						
						
						
						
					 
					
						2012-06-01 09:10:53 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						05de6302fd 
					 
					
						
						
							
							Fixed documentation: corrected parameter names  
						
						
						
						
					 
					
						2012-05-29 10:36:19 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						eb2f1f81ed 
					 
					
						
						
							
							Fixed hundreds of documentation problems  
						
						
						
						
					 
					
						2012-05-28 07:36:14 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						e703e8f5a6 
					 
					
						
						
							
							exposed MSER to python again  
						
						
						
						
					 
					
						2012-05-22 15:53:39 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						d5a0088bbe 
					 
					
						
						
							
							merged 2.4 into trunk  
						
						
						
						
					 
					
						2012-04-30 14:33:52 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						2fd1e2ea57 
					 
					
						
						
							
							merged all the latest changes from 2.4 to trunk  
						
						
						
						
					 
					
						2012-04-13 21:50:59 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						ce89d00fcf 
					 
					
						
						
							
							Implemented missed AlgorithmInfo for BRIEF  
						
						
						
						
					 
					
						2012-03-29 03:06:59 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						0c381e2a9f 
					 
					
						
						
							
							increased the default number of pyramid layers in ORB; updated test data  
						
						
						
						
					 
					
						2012-03-20 14:20:06 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						d60623279c 
					 
					
						
						
							
							switched to non-constant references in Algorithm::addParam, which is more safe.  
						
						
						
						
					 
					
						2012-03-17 09:50:47 +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 
						 
				 
			
				
					
						
							
							
								Ilya Lysenkov 
							
						 
					 
					
						
						
							
						
						df6a95ed87 
					 
					
						
						
							
							Wraped SimpleBlobDetector for Python  
						
						
						
						
					 
					
						2012-03-12 11:39:48 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						f2d2c8db77 
					 
					
						
						
							
							exposed SurfFeatureDetector and SurfDescriptorExtractor to python  
						
						
						
						
					 
					
						2011-11-29 12:24:38 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						2e9f5c434b 
					 
					
						
						
							
							added improved ORB implementation, convex-convex polygon intersection, eigen2x2 low-level function ...  
						
						
						
						
					 
					
						2011-11-08 12:01:49 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						b74116e694 
					 
					
						
						
							
							unified norm computing; added generalized Hamming distance  
						
						
						
						
					 
					
						2011-10-11 15:13:53 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						028c44531f 
					 
					
						
						
							
							wrapped FlannBasedMatcher (and extended DescriptorMatcher wrapper)  
						
						... 
						
						
						
						updated feature_homography.py sample to use new features 
						
						
					 
					
						2011-09-15 11:10:06 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						b679ebc1b4 
					 
					
						
						
							
							python DescriptorExtractor.compute now returns filtered keypoints  
						
						... 
						
						
						
						wrapped StarFeatureDetector and GridAdaptedFeatureDetector 
						
						
					 
					
						2011-09-15 08:07:37 +00:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						82da7f18d8 
					 
					
						
						
							
							replaced "unsigned int" -> "unsigned" to make Python/Java wrapper generator work correctly  
						
						
						
						
					 
					
						2011-09-14 14:29:30 +00:00 
						 
				 
			
				
					
						
							
							
								Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						d50cc51070 
					 
					
						
						
							
							handling Ptr<> arguments and return values in Python wrappers  
						
						... 
						
						
						
						partially wrapped features2d framework
added feature_homography.py sample 
						
						
					 
					
						2011-09-07 09:38:22 +00:00 
						 
				 
			
				
					
						
							
							
								Maria Dimashova 
							
						 
					 
					
						
						
							
						
						81cb7b2c5e 
					 
					
						
						
							
							added read/write methods for SimpleBlobDetector and DenseFeatureDetector; added their creation to FeatureDetector::create method ( #1290 )  
						
						
						
						
					 
					
						2011-08-10 09:17:37 +00:00 
						 
				 
			
				
					
						
							
							
								Maria Dimashova 
							
						 
					 
					
						
						
							
						
						4839bfb1a5 
					 
					
						
						
							
							fixed grammar of the comment  
						
						
						
						
					 
					
						2011-08-08 14:03:37 +00:00 
						 
				 
			
				
					
						
							
							
								Maria Dimashova 
							
						 
					 
					
						
						
							
						
						fcd999ae6e 
					 
					
						
						
							
							added SL2 (squared L2 distance) and implemented the descriptors matching in L2 using SL2  
						
						
						
						
					 
					
						2011-08-08 13:18:12 +00:00 
						 
				 
			
				
					
						
							
							
								Maria Dimashova 
							
						 
					 
					
						
						
							
						
						7db3dd4f0a 
					 
					
						
						
							
							fixed comment and doc on L2  
						
						
						
						
					 
					
						2011-08-05 14:05:41 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						874196e384 
					 
					
						
						
							
							Implemented read/write methods for FlannBasedMatcher; fixed features2d wrappers for java  
						
						
						
						
					 
					
						2011-08-04 14:13:07 +00:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						13185ad8f7 
					 
					
						
						
							
							Implemented read/write methods for BriefDescriptorExtractor class  
						
						
						
						
					 
					
						2011-08-04 09:56:10 +00:00