opencv/samples/cpp/tutorial_code/Histograms_Matching
Roman Donchenko cc05493730 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectAndroidSDK.cmake
	cmake/OpenCVGenAndroidMK.cmake
	cmake/OpenCVModule.cmake
	cmake/templates/OpenCV.mk.in
	cmake/templates/OpenCVConfig.cmake.in
	doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
	modules/cudabgsegm/src/cuda/mog.cu
	modules/imgproc/perf/opencl/perf_filters.cpp
	modules/imgproc/src/opencl/filterSep_singlePass.cl
	modules/nonfree/CMakeLists.txt
	modules/nonfree/perf/perf_precomp.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/opencl/bgfg_mog.cl
	modules/superres/CMakeLists.txt
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/cuda/btv_l1_gpu.cu
	modules/superres/src/frame_source.cpp
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	samples/gpu/CMakeLists.txt
	samples/gpu/brox_optical_flow.cpp
	samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
..
calcBackProject_Demo1.cpp Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
calcBackProject_Demo2.cpp Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
calcHist_Demo.cpp Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
compareHist_Demo.cpp fixed h / s ranges in histogram_calculation tutorial 2014-03-17 11:01:02 +01:00
EqualizeHist_Demo.cpp Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00
MatchTemplate_Demo.cpp Applied all fixes related to translating C to C++ code 2013-11-17 20:34:50 +01:00