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

Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp

2014-03-03 13:45:22 +04:00

..

test_affine3.cpp

fixed -Wshadow and other warnings, added rvec test

2013-12-07 20:33:50 +04:00

test_affine3d_estimator.cpp

Merge commit '43aec5ad' into merge-2.4

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

test_cameracalibration_artificial.cpp

fixed defects from coverity.com

2014-02-23 20:21:08 +04:00

test_cameracalibration_badarg.cpp

deleted excess semicolons, commas

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

test_cameracalibration.cpp

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

2014-03-03 13:45:22 +04:00

test_chessboardgenerator.cpp

Merge commit '43aec5ad' into merge-2.4

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

test_chessboardgenerator.hpp

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

2014-01-14 11:53:59 +04:00

test_chesscorners_badarg.cpp

fixed defects from coverity.com

2014-02-23 20:21:08 +04:00

test_chesscorners_timing.cpp

replaced sprintf with cv::format

2014-01-17 13:01:12 +04:00

test_chesscorners.cpp

fixed defects from Xcode

2014-02-25 17:33:12 +04:00

test_compose_rt.cpp

Normalized file endings.

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

test_cornerssubpix.cpp

fixed defects from coverity.com

2014-02-23 20:21:08 +04:00

test_fundam.cpp

fixed defects from coverity.com

2014-02-23 20:21:08 +04:00

test_homography.cpp

Move C API of opencv_calib3d to separate file

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

test_main.cpp

changed testdata path for calib3d

2014-01-15 15:08:09 +04:00

test_modelest.cpp

War on Whitespace, master edition: file endings.

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

test_posit.cpp

Move C API of opencv_calib3d to separate file

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

test_precomp.hpp

Merge commit '43aec5ad' into merge-2.4

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

test_reproject_image_to_3d.cpp

Merge commit '43aec5ad' into merge-2.4

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

test_solvepnp_ransac.cpp

Fixed some dubious uses of tbb::task_scheduler_init.

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

test_stereomatching.cpp

changed testdata path for calib3d

2014-01-15 15:08:09 +04:00

test_undistort_badarg.cpp

fixed defects from coverity.com

2014-02-23 20:21:08 +04:00

test_undistort_points.cpp

Normalized file endings.

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

test_undistort.cpp

fixed defects from coverity.com

2014-02-23 20:21:08 +04:00