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 |
|
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 |
|
Marina Kolpakova
|
162f9fd7ea
|
merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811
|
2012-06-28 17:07:17 +00:00 |
|
Gary Bradski
|
dfaabd88fc
|
added cv2.destroyAllWindows()
|
2012-03-15 03:45:15 +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 |
|
Alexander Mordvintsev
|
5b00763bb0
|
work on demo.py shell
|
2011-08-20 19:54:03 +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
|
d3da43c8e5
|
distrans.py sample added
|
2011-07-02 22:21:19 +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
|
b6c19d365f
|
switched from argparse to getopt for compatibility with Python 2.6
|
2011-06-11 21:11:02 +00:00 |
|
Alexander Mordvintsev
|
927b5c88ea
|
python cv2:
simple video capture and synth framework stub
edge detection sample
|
2011-06-07 13:45:31 +00:00 |
|