17 Commits

Author	SHA1	Message	Date
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	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	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
Moshe Kaplan	bd042d9cc3	Fixed shebangs, added error checking	2013-03-06 01:41:02 -05:00
marina.kolpakova	285d6320be	add #/usr/bin/env python to all python files	2012-11-23 22:57:22 +04:00
OpenCV Buildbot	04384a71e4	Normalize line endings and whitespace	2012-10-17 15:32:23 +04:00
Gary Bradski	dfaabd88fc	added cv2.destroyAllWindows()	2012-03-15 03:45:15 +00:00
Gary Bradski	9164ccbaaf	added 0xFF & in front of every waitKey so that it works on linux	2012-03-14 21:46:34 +00:00
Alexander Mordvintsev	700ef09a23	opt_flow.py sample fixed	2011-09-02 11:54:02 +00:00
Alexander Mordvintsev	fc771363d3	all video processing samples use camera as default source (and fallback to synth in case of capture error)	2011-08-22 13:36:21 +00:00
Vadim Pisarevsky	16ba62dcd5	added COLOR_... enumeration to imgproc.hpp and EVENT_... enumeration to highgui.hpp	2011-07-18 13:05:34 +00:00
Alexander Mordvintsev	ae5dd1d748	math.pi -> np.pi ... squares.py sample added	2011-07-16 18:29:51 +00:00
Vadim Pisarevsky	f2e1a64c1b	fixed "import cv" in the new python samples. corrected Python bindings to match the documentation and vice versa (NOTE: in cv2.stereoCalibrate the parameter ordering has been changed)	2011-07-16 09:35:56 +00:00
Vadim Pisarevsky	386f147597	a few minor fixes in Python samples	2011-07-13 06:19:21 +00:00
Alexander Mordvintsev	edf0b40d42	opt_flow.py demo	2011-07-07 07:55:49 +00:00
Alexander Mordvintsev	136d5b534a	work on optical flow sample	2011-07-06 19:02:40 +00:00