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

Conflicts:
	CMakeLists.txt
	modules/calib3d/src/calibration.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/clahe.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp

2013-10-28 13:38:25 +04:00

..

calib3d_init.cpp

War on Whitespace, master edition: trailing spaces.

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

calibinit.cpp

Boring changes - calib3d.

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

calibration.cpp

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

2013-10-28 13:38:25 +04:00

checkchessboard.cpp

Move C API of opencv_calib3d to separate file

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

circlesgrid.cpp

fix bug #3277 (findCirclesGrid failures):

2013-09-24 14:45:13 +04:00

circlesgrid.hpp

Finalize core headers reorganization

2013-04-03 14:10:03 +04:00

compat_ptsetreg.cpp

Boring changes - calib3d.

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

compat_stereo.cpp

Move C API of opencv_calib3d to separate file

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

epnp.cpp

Merge commit '43aec5ad' into merge-2.4

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

epnp.h

Move C API of opencv_calib3d to separate file

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

five-point.cpp

Boring changes - calib3d.

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

fundam.cpp

Boring changes - calib3d.

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

levmarq.cpp

Boring changes - calib3d.

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

p3p.cpp

Merge commit '43aec5ad' into merge-2.4

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

p3p.h

Normalized file endings.

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

polynom_solver.cpp

Remove all using directives for STL namespace and members

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

polynom_solver.h

Normalize line endings and whitespace

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

posit.cpp

Move C API of opencv_calib3d to separate file

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

precomp.hpp

Remove HAVE_CVCONFIG_H - it's always defined.

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

ptsetreg.cpp

Boring changes - calib3d.

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

quadsubpix.cpp

Move C API of opencv_calib3d to separate file

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

solvepnp.cpp

Merge commit '43aec5ad' into merge-2.4

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

stereobm.cpp

Boring changes - calib3d.

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

stereosgbm.cpp

Boring changes - calib3d.

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

triangulate.cpp

Boring changes - calib3d.

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