Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp

2013-09-10 11:30:19 +04:00

..

androidcamera

Merge commit '43aec5ad' into merge-2.4

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

bioinspired

retina_ocl.cpp: removed two unused arrays.

2013-09-06 12:34:37 +04:00

calib3d

Fixed some dubious uses of tbb::task_scheduler_init.

2013-09-05 19:03:00 +04:00

contrib

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

2013-09-10 11:30:19 +04:00

core

restored original behaviour or release functions for (Buffer and Texture)

2013-09-09 10:57:45 +04:00

cudev

War on Whitespace, master edition: file endings.

2013-08-27 14:23:26 +04:00

features2d

Boring changes - features2d.

2013-09-05 18:26:44 +04:00

flann

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

2013-09-10 11:30:19 +04:00

gpu

added missing gpu::matchTemplate implementation for non-CUDA build

2013-09-09 10:51:44 +04:00

gpuarithm

Boring changes - gpuarithm.

2013-09-05 19:02:58 +04:00

gpubgsegm

Boring changes - gpubgsegm.

2013-09-05 19:02:58 +04:00

gpucodec

removed detail:: prefix int video_reader

2013-09-09 10:57:51 +04:00

gpufeatures2d

Nuked the rest of the precomp.cpp files.

2013-09-02 19:53:45 +04:00

gpufilters

Boring changes - gpufilters.

2013-09-05 19:02:58 +04:00

gpuimgproc

Boring changes - gpuimgproc.

2013-09-05 19:02:58 +04:00

gpulegacy

Boring changes - gpulegacy.

2013-09-05 19:02:59 +04:00

gpuoptflow

Nuked the rest of the precomp.cpp files.

2013-09-02 19:53:45 +04:00

gpustereo

Boring changes - gpustereo.

2013-09-05 19:02:59 +04:00

gpuwarping

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

2013-09-10 11:30:19 +04:00

highgui

Boring changes - highgui.

2013-09-05 18:26:43 +04:00

imgproc

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

2013-09-10 11:30:19 +04:00

java

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

2013-09-10 11:30:19 +04:00

legacy

Made Filestorage able to not own its CvFileStorage instance.

2013-09-05 19:03:00 +04:00

ml

Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.

2013-09-05 19:03:00 +04:00

nonfree

Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.

2013-09-05 19:03:00 +04:00

objdetect

changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.

2013-09-06 19:10:53 +02:00

ocl

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

2013-09-10 11:30:19 +04:00

optim

Nuked the rest of the precomp.cpp files.

2013-09-02 19:53:45 +04:00

photo

Boring changes - photo.

2013-09-05 19:02:58 +04:00

python

Adapt Python bindings to the new Ptr.

2013-09-05 19:03:00 +04:00

softcascade

Added to CV_INIT_ALGORITHM a Ptr creation function, for convenience.

2013-09-05 19:03:00 +04:00

stitching

Boring changes - stitching.

2013-09-05 19:02:58 +04:00

superres

Boring changes - superres.

2013-09-05 19:02:58 +04:00

ts

Merge commit '43aec5ad' into merge-2.4

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

video

Boring changes - video.

2013-09-05 19:02:58 +04:00

videostab

Boring changes - videostab.

2013-09-05 19:02:58 +04:00

world

Deleted all trailing whitespace.

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

CMakeLists.txt

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

2013-06-10 18:18:01 +04:00

refman.rst.in

Made reference manual table of contents autogenerated

2012-05-30 14:06:47 +00:00