Alexander Mordvintsev 
							
						 
					 
					
						
						
							
						
						25b9ac18e6 
					 
					
						
						
							
							fixed Bug  #3143  - flann 'not implemented' error  
						
						
						
						
					 
					
						2013-07-26 17:59:38 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						3939d78336 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/2.4' into merge-2.4  
						
						... 
						
						
						
						Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp 
						
						
					 
					
						2013-07-22 18:38:57 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						28a5c127ea 
					 
					
						
						
							
							Made the Python bindings not use deprecated NumPy 1.7 API.  
						
						
						
						
					 
					
						2013-07-16 14:33:15 +04:00 
						 
				 
			
				
					
						
							
							
								abidrahmank 
							
						 
					 
					
						
						
							
						
						5d863f7516 
					 
					
						
						
							
							drawMatches python bindings  
						
						
						
						
					 
					
						2013-07-11 09:28:37 +05:30 
						 
				 
			
				
					
						
							
							
								Gabe Schwartz 
							
						 
					 
					
						
						
							
						
						bb209193c9 
					 
					
						
						
							
							Updated usage of METH_X definitions for python 3.  
						
						... 
						
						
						
						Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS. 
						
						
					 
					
						2013-06-13 20:10:01 -04:00 
						 
				 
			
				
					
						
							
							
								Gabe Schwartz 
							
						 
					 
					
						
						
							
						
						fb9781b97b 
					 
					
						
						
							
							Updated cv2.cpp to support Python 3 API.  
						
						... 
						
						
						
						Added a header with defines to enable the module to compile with either
python 2 or 3 without changes. 
						
						
					 
					
						2013-06-13 20:10:01 -04:00 
						 
				 
			
				
					
						
							
							
								Gabe Schwartz 
							
						 
					 
					
						
						
							
						
						931ebab822 
					 
					
						
						
							
							Updated generator and parser to support Python 3.  
						
						
						
						
					 
					
						2013-06-13 18:39:47 -04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						b8ed00bd64 
					 
					
						
						
							
							Compile OpenCV with GCC visibility set to hidden  
						
						
						
						
					 
					
						2013-05-13 18:33:20 +04:00 
						 
				 
			
				
					
						
							
							
								Egbert van der Wal 
							
						 
					 
					
						
						
							
						
						dc6a144396 
					 
					
						
						
							
							add (optional) index argument to RetrieveFrame method  
						
						
						
						
					 
					
						2013-05-04 17:18:12 +02:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						298ccf6487 
					 
					
						
						
							
							Turn pyopencv_to and pyopencv_from into templates  
						
						... 
						
						
						
						This protects from unwanted implicit conversions between types at compile time. 
						
						
					 
					
						2013-04-13 01:02:57 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						f886651cf0 
					 
					
						
						
							
							Drop old python samples and tests  
						
						
						
						
					 
					
						2013-04-12 19:37:40 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						b2ba8b9969 
					 
					
						
						
							
							Drop old python interface  
						
						
						
						
					 
					
						2013-04-12 19:37:40 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						3b364330ad 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-04-12 15:35:38 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						5e048d1fa5 
					 
					
						
						
							
							Move C API of opencv_objdetect to separate file  
						
						... 
						
						
						
						Also move cv::linemod to own header 
						
						
					 
					
						2013-04-12 14:37:01 +04:00 
						 
				 
			
				
					
						
							
							
								Roman Donchenko 
							
						 
					 
					
						
						
							
						
						57d4c86b2b 
					 
					
						
						
							
							Fixed the shebang lines on the Python scripts.  
						
						... 
						
						
						
						Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script. 
						
						
					 
					
						2013-04-11 18:37:23 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						199a35a105 
					 
					
						
						
							
							Move C API of opencv_video to separate file  
						
						
						
						
					 
					
						2013-04-11 17:38:33 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						b0e6606b98 
					 
					
						
						
							
							Cleanup core module API  
						
						... 
						
						
						
						* Drop some low level API
* Remove outdated overloads
* Utilize Input/OutputArray 
						
						
					 
					
						2013-04-09 13:36:32 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						69648f0a6f 
					 
					
						
						
							
							Make photo.hpp independent from C API  
						
						
						
						
					 
					
						2013-04-08 15:47:29 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						0738ea7d0f 
					 
					
						
						
							
							Make highgui.hpp independent from C API  
						
						
						
						
					 
					
						2013-04-08 15:47:29 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						67073daf19 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-04-05 21:11:59 +04:00 
						 
				 
			
				
					
						
							
							
								Dustin Spicuzza 
							
						 
					 
					
						
						
							
						
						64b5784c0b 
					 
					
						
						
							
							Catch exceptions when large allocations fail  
						
						
						
						
					 
					
						2013-04-05 00:43:10 -04:00 
						 
				 
			
				
					
						
							
							
								Andrey Pavlenko 
							
						 
					 
					
						
						
							
						
						75ea10e6ff 
					 
					
						
						
							
							fix for  #2806  (missing 'nu03' field of moments)  
						
						
						
						
					 
					
						2013-04-02 12:14:43 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						715fa3303e 
					 
					
						
						
							
							Move cv::Mat out of core.hpp  
						
						
						
						
					 
					
						2013-04-01 15:24:34 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						5e7ab8baf3 
					 
					
						
						
							
							Move cv::Scalar_ to types.hpp  
						
						
						
						
					 
					
						2013-04-01 15:24:33 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						20534c9beb 
					 
					
						
						
							
							Merge pull request  #692  from vpisarev:refactor_calib3d_stereo  
						
						
						
						
					 
					
						2013-03-26 18:38:16 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						44157c421f 
					 
					
						
						
							
							fixed python test failures (modified stereo correspondence test to use cv2.* stuff), fixed docs  
						
						
						
						
					 
					
						2013-03-25 00:42:46 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						be7bbe3aa9 
					 
					
						
						
							
							Drop cv:: prefix from cv::String used inside the cv namespace  
						
						
						
						
					 
					
						2013-03-22 22:14:50 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						707d3e0a62 
					 
					
						
						
							
							Python wrapper is adapted for cv::String  
						
						
						
						
					 
					
						2013-03-22 22:14:30 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						82d7292ee7 
					 
					
						
						
							
							Merge pull request  #680  from vpisarev:c2cpp_video_take2  
						
						
						
						
					 
					
						2013-03-22 19:34:53 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						40dd25d6c2 
					 
					
						
						
							
							restored CV_EXPORTS_W in the background subtraction classes  
						
						
						
						
					 
					
						2013-03-22 01:29:33 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						bbae05413d 
					 
					
						
						
							
							Merge pull request  #682  from vpisarev/python_str_fix  
						
						... 
						
						
						
						repaired std::string handling 
						
						
					 
					
						2013-03-21 08:57:39 -07:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						4e1619d8ee 
					 
					
						
						
							
							repaired std::string handling  
						
						
						
						
					 
					
						2013-03-21 11:30:38 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						07e0f7bf59 
					 
					
						
						
							
							refactored video module; use the new-style algorithms now  
						
						
						
						
					 
					
						2013-03-20 19:51:49 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						89356ff16d 
					 
					
						
						
							
							Move non-CV functionality from core.hpp to separate utility.hpp header  
						
						
						
						
					 
					
						2013-03-20 17:56:06 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						e75df56317 
					 
					
						
						
							
							Unified handling of InputOutputArrays in Python wrapper generator  
						
						... 
						
						
						
						This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.
As result following python functions changes signatures in non-trivial way:
* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate
And the following functions become return their modified inputs as a return
value:
* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed 
						
						
					 
					
						2013-03-15 17:44:49 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						a1c456b7c3 
					 
					
						
						
							
							Extract common base header for C and C++ APIs  
						
						
						
						
					 
					
						2013-03-15 10:38:38 +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 
							
						 
					 
					
						
						
							
						
						9b7dfd677d 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-03-11 18:50:19 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						980fc93b4d 
					 
					
						
						
							
							Fix clang + ccache build warnings  
						
						
						
						
					 
					
						2013-03-11 18:41:22 +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 
						 
				 
			
				
					
						
							
							
								cuda-geek 
							
						 
					 
					
						
						
							
						
						f52ce6529b 
					 
					
						
						
							
							Merge pull request  #322  from cuda-geek:training  
						
						
						
						
					 
					
						2013-02-01 18:45:12 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						cc538ddfa6 
					 
					
						
						
							
							changes related with code review  
						
						
						
						
					 
					
						2013-02-01 17:47:05 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						61079547f0 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-02-01 14:59:40 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						f7ac73998a 
					 
					
						
						
							
							code review fixes  
						
						
						
						
					 
					
						2013-02-01 14:36:06 +04:00 
						 
				 
			
				
					
						
							
							
								marina.kolpakova 
							
						 
					 
					
						
						
							
						
						f3227c3f1a 
					 
					
						
						
							
							merged ICFPreprocessor and Channels -> ChannelFeatureBuilder  
						
						
						
						
					 
					
						2013-02-01 14:36:06 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						79e278c008 
					 
					
						
						
							
							applied patch  #2587  
						
						
						
						
					 
					
						2013-01-31 16:19:20 +04:00 
						 
				 
			
				
					
						
							
							
								Andrey Kamaev 
							
						 
					 
					
						
						
							
						
						78a338159d 
					 
					
						
						
							
							Merge branch '2.4'  
						
						
						
						
					 
					
						2013-01-29 14:17:13 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						4044fbcb33 
					 
					
						
						
							
							hopefully fixed handling of 'long' Python type in OpenCV bindings (bug  #2193 ). added the corresponding test  
						
						
						
						
					 
					
						2013-01-28 21:03:59 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						2320ec76b4 
					 
					
						
						
							
							Extended python bindings to support scalar values and tuples in place of InputArray (i.e. Mat) - ticket  #2658 . Added tests for  #2611 ,  #2505 ,  #2658  
						
						
						
						
					 
					
						2013-01-28 20:45:00 +04:00 
						 
				 
			
				
					
						
							
							
								Vadim Pisarevsky 
							
						 
					 
					
						
						
							
						
						cd46a674d1 
					 
					
						
						
							
							applied patch  #2611  that also likely  fixes   #2505  
						
						
						
						
					 
					
						2013-01-28 18:30:20 +04:00