opencv/samples/cpp/tutorial_code/ImgTrans
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
..
CannyDetector_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
copyMakeBorder_demo.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
filter2D_demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Geometric_Transforms_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
HoughCircle_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
HoughLines_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Laplace_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Remap_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Sobel_Demo.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00