Roman Donchenko 799d2dabd6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/core/test/test_arithm.cpp
	modules/cuda/src/cascadeclassifier.cpp
	modules/imgproc/doc/geometric_transformations.rst
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/moments.cpp

2014-04-14 16:08:02 +04:00

..

doc

3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.

2014-02-03 15:12:27 +04:00

include/opencv2

fixing issues from coverity scan 1167937, 1167938, 1167939, 1127248 (http://scan.coverity.com/projects/169?tab=Overview)

2014-02-06 21:33:44 +04:00

perf

dropping legacy modes testing

2014-03-20 22:30:16 +04:00

src

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

2014-04-14 16:08:02 +04:00

test

cv::norm -> cvtest::norm in tests

2014-04-08 14:49:20 +04:00

CMakeLists.txt

Class-specific Extremal Region Filter algorithm as proposed in :

2013-07-20 01:10:05 +02:00