Commit Graph

31 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
Andrey Kamaev
f886651cf0 Drop old python samples and tests 2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad Merge branch '2.4' 2013-04-12 15:35:38 +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
Moshe Kaplan
bd042d9cc3 Fixed shebangs, added error checking 2013-03-06 01:41:02 -05:00
Moshe Kaplan
facd580f28 Small changes to Python samples
Update find_obj.py:
    Added additional error checking for the loaded files and modified the detector check to be more pythonic (is versus ==).

    Update common.py:
    Fixed a typo (contais -> contains)
2013-03-04 12:25:35 -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
Alexander Mordvintesv
d9185ec21b added _doc.py -- doc-string ckecking utility
added some sample description
2012-08-22 16:42:19 +03:00
Alexander Mordvintesv
353c69e017 created PlaneTracker (int plane_tracker.py), which implements multitarget planar tracking
rewritten feature_homography.py using it
added plane_ar.py - simple augmented reality sample
2012-08-03 22:17:11 +03:00
Alexander Mordvintesv
ffa8c32348 work on feature_homography.py: multiple targets 2012-08-01 21:41:03 +03:00
Alexander Mordvintsev
84281d284e mdot function in common.py 2012-07-11 05:07:00 +00:00
Alexander Mordvintsev
a2c3c1800a new feature_homography.py sample 2012-07-06 15:42:42 +00:00
Alexander Mordvintsev
889df76ea7 added lappyr.py sample 2012-06-10 08:38:25 +00:00
Alexander Mordvintsev
455349a0eb comments for digits.py sample 2012-06-06 05:52:28 +00:00
Alexander Mordvintsev
e0c1fb5f76 updated video_threaded.py sample:
- switch btw threaded and non-threaded mode
- performance counters
- description
2012-05-28 08:51:50 +00:00
Alexander Mordvintsev
f4f41df756 removed derivLambda param for LK-tracker
linetype -> lineType
2012-05-22 08:43:42 +00:00
Alexander Mordvintsev
58174f6ada Added GIL-release code into python wrappers
Added gabor_threads.py sample
2012-03-07 11:09:27 +00:00
Alexander Mordvintsev
cd9d695f9d fix in RectSelector 2011-09-20 11:49:24 +00:00
Alexander Mordvintsev
a869838807 RectSelector in common.py 2011-09-19 06:28:39 +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
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
Alexander Mordvintsev
514711af14 work on motempl.py sample 2011-07-10 21:23:32 +00:00
Alexander Mordvintsev
d3da43c8e5 distrans.py sample added 2011-07-02 22:21:19 +00:00
Alexander Mordvintsev
f0a4185b1f cv.Line -> cv2.line 2011-07-01 17:50:07 +00:00
Alexander Mordvintsev
84568cb18e python Sketcher utility class 2011-07-01 17:33:29 +00:00
Alexander Mordvintsev
382e154cfd morphology python sample 2011-07-01 08:22:45 +00:00
Alexander Mordvintsev
32825893bd work on obj_detect.py
added square_size cmd line param for calibrate.py
added _coverage.py script to compute cv2 api coverage by samples (just for interest, may be removed later)
2011-06-19 11:33:15 +00:00
Alexander Mordvintsev
1a208fe132 use cv2 function
added color_histogram.py sample
work on VideoSynth (chessboard)
2011-06-15 13:58:40 +00:00
Alexander Mordvintsev
194506397e python helper routines (common.py) added 2011-06-14 15:02:57 +00:00