opencv/modules/imgproc/doc
Roman Donchenko 95a55453df Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/calib3d/perf/perf_pnp.cpp
	modules/contrib/src/imagelogpolprojection.cpp
	modules/contrib/src/templatebuffer.hpp
	modules/core/perf/opencl/perf_gemm.cpp
	modules/cudafeatures2d/doc/feature_detection_and_description.rst
	modules/cudafeatures2d/perf/perf_features2d.cpp
	modules/cudafeatures2d/src/fast.cpp
	modules/cudafeatures2d/test/test_features2d.cpp
	modules/features2d/doc/feature_detection_and_description.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/imgproc/perf/opencl/perf_blend.cpp
	modules/imgproc/perf/opencl/perf_color.cpp
	modules/imgproc/perf/opencl/perf_moments.cpp
	modules/imgproc/perf/opencl/perf_pyramid.cpp
	modules/objdetect/perf/opencl/perf_hogdetect.cpp
	modules/ocl/perf/perf_arithm.cpp
	modules/ocl/perf/perf_bgfg.cpp
	modules/ocl/perf/perf_blend.cpp
	modules/ocl/perf/perf_brute_force_matcher.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/perf/perf_gftt.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_imgwarp.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_matrix_operation.cpp
	modules/ocl/perf/perf_ml.cpp
	modules/ocl/perf/perf_moments.cpp
	modules/ocl/perf/perf_opticalflow.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/video/src/lkpyramid.cpp
	modules/video/src/precomp.hpp
	samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
..
pics Merge remote-tracking branch 'upstream/master' 2013-09-26 23:08:23 +10:00
feature_detection.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-11 17:20:01 +04:00
filtering.rst removed ABF 2014-01-31 19:15:40 +04:00
geometric_transformations.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
histograms.rst Merge pull request #1248 from vkocheganov:chi_square_alt 2013-08-28 11:44:41 +04:00
imgproc.rst merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
miscellaneous_transformations.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-03-03 13:45:22 +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 Normalized file endings. 2013-08-21 18:59:25 +04:00
structural_analysis_and_shape_descriptors.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-03 17:35:21 +04:00