Roman Donchenko 9c83f6c4fb Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp

2013-11-05 16:38:23 +04:00

..

_geom.h

converted few more comp. geometry functions to C++

2013-01-22 16:54:31 +04:00

accum.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

approx.cpp

refactored approxpoly

2013-01-17 00:11:08 +04:00

canny.cpp

fixed ipp-related warnings

2013-10-05 14:54:00 +04:00

clahe.cpp

Boring changes - imgproc.

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

color.cpp

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

2013-10-15 20:08:52 +04:00

connectedcomponents.cpp

Merge pull request #1348 from SpecLad:merge-2.4

2013-08-28 13:41:41 +04:00

contours.cpp

Boring changes - imgproc.

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

convhull.cpp

Fix stack corruption in cvConvexHull2 and heap corruption in OutputArray::create

2013-04-01 15:24:35 +04:00

corner.cpp

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

cornersubpix.cpp

made several minor fixes as pointed out by Andrey

2013-02-14 15:36:20 +04:00

demosaicing.cpp

Remove more old definitions from internal.hpp

2013-04-01 16:32:08 +04:00

deriv.cpp

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

2013-10-15 20:08:52 +04:00

distransform.cpp

fixed compile errors and warnings when building master branch with IPP enabled

2013-09-20 16:02:15 +04:00

emd.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

featureselect.cpp

Remove inline sorting algorithms from core headers

2013-03-28 17:22:50 +04:00

filter.cpp

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

floodfill.cpp

Android NDK r9 support. x64 NDK support fix for MacOS X.

2013-10-03 11:36:12 +04:00

gabor.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

gcgraph.hpp

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

generalized_hough.cpp

Boring changes - imgproc.

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

geometry.cpp

Drop outdated definitions from internal.hpp

2013-04-01 15:24:35 +04:00

grabcut.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

histogram.cpp

Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison

2013-08-12 13:51:52 +04:00

hough.cpp

Boring changes - imgproc.

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

imgwarp.cpp

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

2013-11-05 16:38:23 +04:00

intersection.cpp

fixed warnings

2013-10-08 12:46:43 +04:00

linefit.cpp

War on Whitespace, master edition: trailing spaces.

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

lsd.cpp

fixed warnings

2013-10-08 12:46:43 +04:00

matchcontours.cpp

War on Whitespace, master edition: trailing spaces.

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

min_enclosing_triangle.cpp

Removed static variables which were not read-only and used more function parameters instead.

2013-09-19 18:32:03 +01:00

moments.cpp

War on Whitespace, master edition: trailing spaces.

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

morph.cpp

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

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

phasecorr.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

precomp.hpp

Remove HAVE_CVCONFIG_H - it's always defined.

2013-07-10 16:02:07 +04:00

pyramids.cpp

War on Whitespace, master edition: trailing spaces.

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

rotcalipers.cpp

War on Whitespace, master edition: file endings.

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

samplers.cpp

fixed compile errors and warnings when building master branch with IPP enabled

2013-09-20 16:02:15 +04:00

segmentation.cpp

War on Whitespace, master edition: file endings.

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

shapedescr.cpp

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

2013-07-22 18:38:57 +04:00

smooth.cpp

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

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

subdivision2d.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

sumpixels.cpp

fixed ipp-related warnings

2013-10-05 14:54:00 +04:00

tables.cpp

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

templmatch.cpp

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

2013-07-16 11:52:41 +04:00

thresh.cpp

converted flood fill, getrectsubpix & cornersubpix to C++

2013-02-11 23:49:10 +04:00

undistort.cpp

Merge pull request #511 from aritzlc:master

2013-02-27 19:33:01 +04:00

utils.cpp

Move border type constants and Moments class to core module

2013-04-10 19:14:24 +04:00