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

..

_latentsvm.h

Normalize line endings and whitespace

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

_lsvm_distancetransform.h

Normalize line endings and whitespace

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

_lsvm_error.h

refactoring latentSVM

2011-07-12 18:43:41 +00:00

_lsvm_fft.h

Normalize line endings and whitespace

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

_lsvm_matching.h

Normalize line endings and whitespace

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

_lsvm_resizeimg.h

fixed several gcc 4.1 warnings

2010-10-21 18:30:57 +00:00

_lsvm_routine.h

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

_lsvm_tbbversion.h

Normalize line endings and whitespace

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

_lsvm_types.h

Normalize line endings and whitespace

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

_lsvmparser.h

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

cascadedetect.cpp

Merge remote-tracking branch 'origin/2.4'

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

cascadedetect.hpp

Remove all using directives for STL namespace and members

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

datamatrix.cpp

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

distancetransform.cpp

Normalize line endings and whitespace

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

featurepyramid.cpp

Move border type constants and Moments class to core module

2013-04-10 19:14:24 +04:00

fft.cpp

Normalize line endings and whitespace

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

haar.cpp

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

hog.cpp

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

latentsvm.cpp

Make highgui.hpp independent from C API

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

latentsvmdetector.cpp

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

linemod.cpp

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

lsvmparser.cpp

Normalize line endings and whitespace

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

lsvmtbbversion.cpp

Normalize line endings and whitespace

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

matching.cpp

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

normal_lut.i

Initial commit of LINE-MOD source code to objdetect module.

2012-02-26 23:55:18 +00:00

precomp.cpp

"atomic bomb" commit. Reorganized OpenCV directory structure

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

precomp.hpp

Move border type constants and Moments class to core module

2013-04-10 19:14:24 +04:00

resizeimg.cpp

Move border type constants and Moments class to core module

2013-04-10 19:14:24 +04:00

routine.cpp

Normalize line endings and whitespace

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