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

Conflicts:
	cmake/OpenCVModule.cmake
	doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	doc/tutorials/features2d/feature_homography/feature_homography.rst
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/arithm.cpp
	modules/gpu/perf/perf_video.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/java/generator/src/cpp/VideoCapture.cpp
	modules/nonfree/src/opencl/surf.cl
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/python/src2/cv2.cpp
	samples/gpu/CMakeLists.txt
	samples/gpu/super_resolution.cpp

2013-08-19 19:02:36 +04:00

..

bagofwords.cpp

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

2013-07-22 18:38:57 +04:00

blobdetector.cpp

Added #include <limits> to files that were missing it.

2013-05-06 22:45:11 -04:00

brief.cpp

Move border type constants and Moments class to core module

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

brisk.cpp

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

2013-07-16 11:52:41 +04:00

descriptors.cpp

compute method for Feature2D

2013-07-25 16:22:31 +04:00

detectors.cpp

Merge remote-tracking branch 'origin/2.4'

2013-06-05 15:42:07 +04:00

draw.cpp

Move border type constants and Moments class to core module

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

dynamic.cpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

evaluation.cpp

Move border type constants and Moments class to core module

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

fast_score.cpp

Fix gcc build error introduced in a9f36df

2012-10-10 13:24:49 +04:00

fast_score.hpp

Fix binary compatibility of opencv_features2d

2012-10-17 02:09:14 +04:00

fast.cpp

Move border type constants and Moments class to core module

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

features2d_init.cpp

Drop cv:: prefix from cv::String used inside the cv namespace

2013-03-22 22:14:50 +04:00

freak.cpp

Move border type constants and Moments class to core module

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

generated_16.i

added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings

2011-07-19 12:27:07 +00:00

generated_32.i

added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings

2011-07-19 12:27:07 +00:00

generated_64.i

added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings

2011-07-19 12:27:07 +00:00

keypoint.cpp

Merge branch '2.4'

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

matchers.cpp

Added #include <limits> to files that were missing it.

2013-05-06 22:45:11 -04:00

mser.cpp

Added #include <limits> to files that were missing it.

2013-05-06 22:45:11 -04:00

orb.cpp

Move border type constants and Moments class to core module

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

precomp.hpp

Remove HAVE_CVCONFIG_H - it's always defined.

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

stardetector.cpp

Move border type constants and Moments class to core module

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