opencv/python2 at 9bf296eeb00e0e235e5122b784711eb805614c98 - opencv - Atria-soft GIT

generic-library/opencv

History

Roman Donchenko f77c68e0fa Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp

2014-03-31 14:42:00 +04:00

..

added texture_flow.py sample

2012-08-19 20:36:50 +03:00

_coverage.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

_doc.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

asift.py

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-03-31 14:42:00 +04:00

browse.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

calibrate.py

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

camshift.py

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

coherence.py

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

color_histogram.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

common.py

Fix mouse handling in python demos

2013-09-20 21:04:07 +02:00

contours.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

deconvolution.py

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

demo.py

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

dft.py

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

digits_adjust.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

digits_video.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

digits.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

distrans.py

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

edge.py

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

facedetect.py

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

facerec_demo.py

Bugfix 3115: Added not to documentation for python version for

2013-09-02 11:59:35 +02:00

feature_homography.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

find_obj.py

Fixed typos in "matching"

2014-03-26 23:29:48 +01:00

fitline.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

floodfill.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

gabor_threads.py

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

gaussian_mix.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

grabcut.py

grabcut.py sample: Allow drawing rect from bottom/right

2014-02-10 16:53:17 +01:00

hist.py

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

houghcircles.py

War on Whitespace, master edition: tabs.

2013-08-27 17:13:53 +04:00

houghlines.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

inpaint.py

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

kmeans.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

lappyr.py

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

letter_recog.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

lk_homography.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

lk_track.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

logpolar.py

Add cv::logPolar, cv::linearPolar, and a python example

2013-09-30 22:31:19 +02:00

morphology.py

War on Whitespace, master edition: trailing spaces.

2013-08-27 13:57:24 +04:00

mosse.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

motempl.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

mouse_and_match.py

mouse_and_match.py missing import cv2

2013-11-24 15:58:13 +01:00

mser.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

opt_flow.py

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

peopledetect.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

plane_ar.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

plane_tracker.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

squares.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

stereo_match.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

texture_flow.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

turing.py

Drop old python samples and tests

2013-04-12 19:37:40 +04:00

video_dmtx.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

video_threaded.py

Fixed the shebang lines on the Python scripts.

2013-04-11 18:37:23 +04:00

video.py

Fixed typo

2013-05-05 16:17:41 +04:00

watershed.py

Merge branch '2.4'

2013-04-12 15:35:38 +04:00