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 |
|
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 |
|
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
|
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
|
d7a2081230
|
peopledetect.py sample added (TODO: use builtin svm data instead of people_hog.txt)
some old cv api use cleaning
|
2011-08-12 03:05:31 +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
|
0217ae3a70
|
faster detection and timing in facedetect.py
|
2011-07-11 09:21:27 +00:00 |
|
Alexander Mordvintsev
|
4151a4590e
|
added lk_track.py sample (currently as a comparison between flow tracker implementations)
|
2011-07-08 14:58:22 +00:00 |
|
Alexander Mordvintsev
|
c3ef6e866f
|
facedetect.py sample works
|
2011-07-07 22:33:36 +00:00 |
|
Alexander Mordvintsev
|
9af213bf60
|
work on facedetect sample
|
2011-07-07 16:14:49 +00:00 |
|