Roman Donchenko 029fce10c9 Merge remote-tracking branch 'origin/2.4' ...

Conflicts:
	3rdparty/libjasper/CMakeLists.txt
	cmake/OpenCVDetectOpenCL.cmake
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/imgproc/src/floodfill.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_or.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/precomp.hpp
	modules/python/src2/api
	modules/ts/src/ts_func.cpp
	samples/gpu/bgfg_segm.cpp

2013-05-21 17:19:23 +04:00

..

_facedetection.h

Normalize line endings and whitespace

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

_featuretree.h

a LOT of obsolete stuff has been moved to the legacy module.

2012-03-30 12:19:25 +00:00

_kdtree.hpp

Fix OS X build warnings

2012-10-22 20:33:14 +04:00

_matrix.h

Normalize line endings and whitespace

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

_vectrack.h

Move C++ basic structures to separate header and inverse dependency from C API

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

_vm.h

Extract common base header for C and C++ APIs

2013-03-15 10:38:38 +04:00

3dtracker.cpp

Move C API of opencv_calib3d to separate file

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

auxutils.cpp

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

bgfg_acmmm2003.cpp

Normalize line endings and whitespace

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

bgfg_codebook.cpp

a LOT of obsolete stuff has been moved to the legacy module.

2012-03-30 12:19:25 +00:00

bgfg_common.cpp

Normalize line endings and whitespace

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

bgfg_estimation.cpp

Normalize line endings and whitespace

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

bgfg_gaussmix.cpp

refactored video module; use the new-style algorithms now

2013-03-20 19:51:49 +04:00

blobtrack.cpp

Normalize line endings and whitespace

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

blobtrackanalysis.cpp

moved some old stuff to the legacy module; merge "compat_c.h" headers and moved to the legacy as well. moved implementation of many non-critical/obsolete inline functions and methods to .cpp to improve Opencv build time

2010-11-26 17:58:20 +00:00

blobtrackanalysishist.cpp

Fixed number of warnings. Fixed mingw64 build.

2012-06-12 14:46:12 +00:00

blobtrackanalysisior.cpp

moved some old stuff to the legacy module; merge "compat_c.h" headers and moved to the legacy as well. moved implementation of many non-critical/obsolete inline functions and methods to .cpp to improve Opencv build time

2010-11-26 17:58:20 +00:00

blobtrackanalysistrackdist.cpp

Updated warning options for GCC; fixed new warnings.

2012-06-20 12:27:02 +00:00

blobtrackgen1.cpp

moved some old stuff to the legacy module; merge "compat_c.h" headers and moved to the legacy as well. moved implementation of many non-critical/obsolete inline functions and methods to .cpp to improve Opencv build time

2010-11-26 17:58:20 +00:00

blobtrackgenyml.cpp

Fix build warnings from gcc 4.8

2013-05-13 17:07:30 +04:00

blobtrackingauto.cpp

fixed potential dereference of null pointer

2013-04-01 11:31:56 +04:00

blobtrackingcc.cpp

Warning fixes continued

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

blobtrackingccwithcr.cpp

Fixed number of warnings. Fixed mingw64 build.

2012-06-12 14:46:12 +00:00

blobtrackinglist.cpp

moved some old stuff to the legacy module; merge "compat_c.h" headers and moved to the legacy as well. moved implementation of many non-critical/obsolete inline functions and methods to .cpp to improve Opencv build time

2010-11-26 17:58:20 +00:00

blobtrackingmsfg.cpp

Set stricter warning rules for gcc

2012-06-07 17:21:29 +00:00

blobtrackingmsfgs.cpp

Fixed number of warnings. Fixed mingw64 build.

2012-06-12 14:46:12 +00:00

blobtrackpostprockalman.cpp

Move C API of opencv_video to separate file

2013-04-11 17:38:33 +04:00

blobtrackpostproclinear.cpp

Fixed number of warnings. Fixed mingw64 build.

2012-06-12 14:46:12 +00:00

blobtrackpostproclist.cpp

moved some old stuff to the legacy module; merge "compat_c.h" headers and moved to the legacy as well. moved implementation of many non-critical/obsolete inline functions and methods to .cpp to improve Opencv build time

2010-11-26 17:58:20 +00:00

calcimagehomography.cpp

Normalize line endings and whitespace

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

calibfilter.cpp

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

calonder.cpp

Move cv::Mat out of core.hpp

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

camshift.cpp

Move C API of opencv_video to separate file

2013-04-11 17:38:33 +04:00

clique.cpp

Normalize line endings and whitespace

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

compat.cpp

Move C API of opencv_calib3d to separate file

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

condens.cpp

Normalize line endings and whitespace

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

contourtree.cpp

Normalize line endings and whitespace

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

correspond.cpp

Normalize line endings and whitespace

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

corrimages.cpp

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

createhandmask.cpp

Drop outdated definitions from internal.hpp

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

decomppoly.cpp

Normalize line endings and whitespace

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

dominants.cpp

Normalize line endings and whitespace

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

dpstereo.cpp

Fix OS X build warnings

2012-10-22 20:33:14 +04:00

eigenobjects.cpp

Drop outdated definitions from internal.hpp

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

em.cpp

Move cv::Mat out of core.hpp

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

enmin.cpp

Normalize line endings and whitespace

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

enteringblobdetection.cpp

Fixed number of warnings. Fixed mingw64 build.

2012-06-12 14:46:12 +00:00

enteringblobdetectionreal.cpp

Set stricter warning rules for gcc

2012-06-07 17:21:29 +00:00

epilines.cpp

Merge branch '2.4'

2013-04-05 21:11:59 +04:00

extendededges.cpp

Fixed mingw build.

2012-06-08 03:15:08 +00:00

face.cpp

Normalize line endings and whitespace

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

face.h

Normalize line endings and whitespace

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

facedetection.cpp

Fixed number of warnings. Fixed mingw64 build.

2012-06-12 14:46:12 +00:00

facedetection.h

Normalize line endings and whitespace

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

facetemplate.cpp

Normalize line endings and whitespace

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

facetemplate.h

Normalize line endings and whitespace

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

features2d.cpp

Remove all using directives for STL namespace and members

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

featuretree.cpp

a LOT of obsolete stuff has been moved to the legacy module.

2012-03-30 12:19:25 +00:00

findface.cpp

Normalize line endings and whitespace

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

findhandregion.cpp

Normalize line endings and whitespace

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

hmm1d.cpp

Normalize line endings and whitespace

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

hmm.cpp

Fixed number of warnings. Fixed mingw64 build.

2012-06-12 14:46:12 +00:00

hmmobs.cpp

Normalize line endings and whitespace

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

image.cpp

Making all dependencies from highgui module optional

2012-06-26 07:29:36 +00:00

kdtree.cpp

Fix build warnings from gcc 4.8

2013-05-13 17:07:30 +04:00

lcm.cpp

Move C++ basic structures to separate header and inverse dependency from C API

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

lee.cpp

Updated warning options for GCC; fixed new warnings.

2012-06-20 12:27:02 +00:00

levmar.cpp

Set stricter warning rules for gcc

2012-06-07 17:21:29 +00:00

levmarprojbandle.cpp

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

levmartrif.cpp

Set stricter warning rules for gcc

2012-06-07 17:21:29 +00:00

lines.cpp

Normalize line endings and whitespace

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

lmeds.cpp

Fix several warnings about uninitialized variables from gcov build

2013-02-15 17:28:23 +04:00

lsh.cpp

Normalize line endings and whitespace

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

morphcontours.cpp

Move C++ basic structures to separate header and inverse dependency from C API

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

morphing.cpp

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

oneway.cpp

Make highgui.hpp independent from C API

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

optflowbm.cpp

Move cv::Size_

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

optflowhs.cpp

a LOT of obsolete stuff has been moved to the legacy module.

2012-03-30 12:19:25 +00:00

optflowlk.cpp

Normalize line endings and whitespace

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

pgh.cpp

Normalize line endings and whitespace

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

planardetect.cpp

Move C API of opencv_calib3d to separate file

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

precomp.cpp

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

precomp.hpp

Make core/internal.hpp a private header

2013-04-01 17:29:10 +04:00

prewarp.cpp

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

pyrsegmentation.cpp

Drop outdated definitions from internal.hpp

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

scanlines.cpp

Fix several warnings about uninitialized variables from gcov build

2013-02-15 17:28:23 +04:00

segment.cpp

Move C++ basic structures to separate header and inverse dependency from C API

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

snakes.cpp

Drop outdated definitions from internal.hpp

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

spilltree.cpp

Normalize line endings and whitespace

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

stereogc.cpp

Remove all using directives for STL namespace and members

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

subdiv2.cpp

Move cv::Scalar_ to types.hpp

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

testseq.cpp

Drop outdated definitions from internal.hpp

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

texture.cpp

Fixed few more warnings/bugs.

2012-06-20 21:09:27 +00:00

trifocal.cpp

Minimize usages of legacy C API inside the library

2013-04-16 12:00:02 +04:00

vecfacetracking.cpp

Drop outdated definitions from internal.hpp

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

video.cpp

Normalize line endings and whitespace

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