opencv/modules/stitching/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
..
autocalib.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
blenders.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
camera.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
exposure_compensate.cpp Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
matchers.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
motion_estimators.cpp defined uint for non-windows platforms too. replaced isnan for cvIsNaN. 2013-08-14 17:16:52 +02:00
precomp.hpp Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
seam_finders.cpp Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
stitcher.cpp added handling of camera parameters estimation errors (#3122) 2013-07-03 15:20:14 +04:00
util.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
warpers.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00