opencv/modules/superres/src
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
..
cuda Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
opencl Add super resolution's OpenCL implementation. 2013-06-26 08:43:23 +08:00
btv_l1_gpu.cpp refactored Separable Linear Filters 2013-06-14 17:25:56 +04:00
btv_l1_ocl.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
btv_l1.cpp Merge branch '2.4' 2013-03-29 19:38:35 +04:00
frame_source.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
input_array_utility.cpp Merge pull request #1122 from SpecLad:merge-2.4 2013-07-21 18:46:27 +04:00
input_array_utility.hpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
optical_flow.cpp Merge remote-tracking branch 'origin/2.4' 2013-08-06 13:56:49 +04:00
precomp.hpp Merge pull request #1110 from SpecLad:config-cleanup 2013-07-30 17:39:35 +04:00
ring_buffer.hpp updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
super_resolution.cpp Merge branch '2.4' 2013-03-29 19:38:35 +04:00