opencv/samples/cpp/tutorial_code
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
..
bioinspired retina included in namespace bioinspired + followed suggestions made by Vadim 2013-07-14 19:28:37 +02:00
calib3d Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
core Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
features2D Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
gpu/gpu-basics-similarity refactored Separable Linear Filters 2013-06-14 17:25:56 +04:00
HighGUI Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Histograms_Matching Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
images Erasing two images from cpp/tutorial folder 2011-11-03 06:09:31 +00:00
ImgProc Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
ImgTrans Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
introduction Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
ml Build tutorial codes together with other samples 2012-11-09 10:15:48 +04:00
objectDetection Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
ShapeDescriptors Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
TrackingMotion Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00