Elena Gvozdeva 4d86804f11 Fixed merge conflicts

2014-01-23 15:31:32 +04:00

..

ocl

Fixed merge conflicts

2014-01-23 15:31:32 +04:00

test_approxpoly.cpp

Normalized file endings.

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

test_bilateral_filter.cpp

Fix bilateralFilter function

2013-08-19 15:52:34 +04:00

test_boundingrect.cpp

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

test_canny.cpp

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

test_color.cpp

War on Whitespace, master edition: trailing spaces.

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

test_connectedcomponents.cpp

War on Whitespace, master edition: file endings.

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

test_contours.cpp

Warning fixes continued

2012-06-09 15:00:04 +00:00

test_convhull.cpp

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

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

test_cvtyuv.cpp

deleted extra semicolons

2014-01-07 02:52:30 +04:00

test_distancetransform.cpp

Merge commit '43aec5ad' into merge-2.4

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

test_emd.cpp

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

test_filter.cpp

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

test_floodfill.cpp

Completely separate C and C++ API of OpenCV core

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

test_grabcut.cpp

Make highgui.hpp independent from C API

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

test_histograms.cpp

Introduce CV_COMP_CHISQR_ALT, an alternative method to calculate ChiSquare Histogram comparison

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

test_houghLines.cpp

Normalized file endings.

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

test_imgproc_umat.cpp

added cv::equalizeHist to T-API

2013-12-13 19:46:20 +04:00

test_imgwarp_strict.cpp

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

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

test_imgwarp.cpp

Fixed a few tests that use uninitialized inputs.

2013-09-06 15:53:42 +04:00

test_intersection.cpp

fixed warnings

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

test_lsd.cpp

deleted excess semicolons, commas

2014-01-18 01:31:33 +04:00

test_main.cpp

added 16-bit support to Bayer2RGB & Bayer2Gray (ticket #686); fixed bug in cv.CreateHist() when no ranges are passed (ticket #990)

2011-06-03 15:45:50 +00:00

test_moments.cpp

hopefully fixed test failures and complains from the doc builder

2013-12-26 22:00:29 +04:00

test_pc.cpp

Fixed phaseCorrelate result for not power of 2 size images #1812 (thanks to Jeff Mast)

2012-05-18 08:33:19 +00:00

test_precomp.hpp

Make highgui.hpp independent from C API

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

test_templmatch.cpp

Move cv::Scalar_ to types.hpp

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

test_thresh.cpp

Normalized file endings.

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

test_watershed.cpp

Normalized file endings.

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