opencv/modules/imgproc/doc
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
..
pics fixed bayer pattern picture in cvtColor() description; corrected formula in getGaussianKernel() 2011-06-14 10:26:24 +00:00
feature_detection.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
filtering.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-19 19:02:36 +04:00
geometric_transformations.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
histograms.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
imgproc.rst merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
miscellaneous_transformations.rst Merge branch 'master' into merge-2.4 2013-08-16 14:14:12 +04:00
motion_analysis_and_object_tracking.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
object_detection.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
structural_analysis_and_shape_descriptors.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00