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

Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/contrib/doc/facerec/facerec_api.rst
	modules/contrib/include/opencv2/contrib/contrib.hpp
	modules/contrib/src/facerec.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/highgui/src/loadsave.cpp
	modules/imgproc/src/pyramids.cpp
	modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
	modules/python/src2/gen.py
	modules/python/test/test.py
	modules/superres/test/test_superres.cpp
	samples/cpp/facerec_demo.cpp

2014-07-08 14:33:56 +04:00

..

opencl

finalizing

2014-03-17 10:42:19 +04:00

test_affine3.cpp

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

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

test_affine3d_estimator.cpp

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

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

test_cameracalibration_artificial.cpp

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

2014-04-08 14:49:20 +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-04-14 16:08:02 +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_fisheye.cpp

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

2014-07-08 14:33:56 +04:00

test_fundam.cpp

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

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

test_homography.cpp

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

2014-04-08 14:49:20 +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

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

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

test_stereomatching.cpp

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

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

test_undistort_badarg.cpp

fixed defects from coverity.com

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

test_undistort_points.cpp

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

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

test_undistort.cpp

fixed defects from coverity.com

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