review.tizen.org Git - profile/ivi/opencv.git/commit

projects / profile / ivi / opencv.git / commit

author	Roman Donchenko <roman.donchenko@itseez.com>
	Mon, 19 Aug 2013 10:08:34 +0000 (14:08 +0400)
committer	Roman Donchenko <roman.donchenko@itseez.com>
	Mon, 19 Aug 2013 15:02:36 +0000 (19:02 +0400)
commit	f76dd992994bbdff68bd6841ac7b5d2a2407f756
tree	f1e098a9d5b79e42c4532d8a0d879987b48a37f0	tree \| snapshot
parent	473ca0849d377e69eb54e85b30ff9208206cc72f	commit \| diff
parent	bed3512dd53e714e86436f5f64d801a4fd31e8b7	commit \| diff

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

66 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsGUI.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsVideo.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVModule.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVPCHSupport.cmake	diff1 \|	diff2 \|	blob \| history
cmake/templates/cvconfig.h.cmake	diff1 \|	diff2 \|	blob \| history
doc/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_detection/feature_detection.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_homography/feature_homography.rst	diff1 \|	diff2 \|	blob \| history
modules/core/doc/basic_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/persistence.hpp	diff1 \|	\|	blob \| history
modules/core/include/opencv2/core/version.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/convert.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/matmul.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/stat.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_io.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpubgsegm/perf/perf_bgsegm.cpp	diff1 \|	\|	blob \| history
modules/gpubgsegm/test/test_bgsegm.cpp	diff1 \|	\|	blob \| history
modules/gpucodec/perf/perf_video.cpp	diff1 \|	\|	blob \| history
modules/highgui/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/highgui/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_ffmpeg.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_ffmpeg_impl.hpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_qtkit.mm	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/doc/filtering.rst	diff1 \|	diff2 \|	blob \| history
modules/imgproc/include/opencv2/imgproc.hpp	diff1 \|	\|	blob \| history
modules/imgproc/src/pyramids.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/generator/gen_java.py	diff1 \|	diff2 \|	blob \| history
modules/java/test/src/org/opencv/test/OpenCVTestCase.java	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/opencl/surf.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl.hpp	diff1 \|	\|	blob \| history
modules/ocl/perf/main.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_canny.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_color.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_gftt.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_hough.cpp	diff1 \|	\|	blob \| history
modules/ocl/perf/perf_imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_match_template.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_precomp.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/color.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/filtering.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/main.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_brute_force_matcher.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_color.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_fft.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_hough.cpp	diff1 \|	\|	blob \| history
modules/ocl/test/test_imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_kmeans.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_moments.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_objdetect.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/utility.cpp	diff1 \|	diff2 \|	blob \| history
modules/python/src2/cv2.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/simpleflow.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
samples/gpu/super_resolution.cpp	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Uncategorized;

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsGUI.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsVideo.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVModule.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVPCHSupport.cmake	diff1 \|	diff2 \|	blob \| history
cmake/templates/cvconfig.h.cmake	diff1 \|	diff2 \|	blob \| history
doc/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_detection/feature_detection.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_homography/feature_homography.rst	diff1 \|	diff2 \|	blob \| history
modules/core/doc/basic_structures.rst	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/persistence.hpp	diff1 \|	\|	blob \| history
modules/core/include/opencv2/core/version.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/convert.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/matmul.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/stat.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_io.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpubgsegm/perf/perf_bgsegm.cpp	diff1 \|	\|	blob \| history
modules/gpubgsegm/test/test_bgsegm.cpp	diff1 \|	\|	blob \| history
modules/gpucodec/perf/perf_video.cpp	diff1 \|	\|	blob \| history
modules/highgui/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/highgui/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_ffmpeg.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_ffmpeg_impl.hpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/cap_qtkit.mm	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/doc/filtering.rst	diff1 \|	diff2 \|	blob \| history
modules/imgproc/include/opencv2/imgproc.hpp	diff1 \|	\|	blob \| history
modules/imgproc/src/pyramids.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/generator/gen_java.py	diff1 \|	diff2 \|	blob \| history
modules/java/test/src/org/opencv/test/OpenCVTestCase.java	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/opencl/surf.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl.hpp	diff1 \|	\|	blob \| history
modules/ocl/perf/main.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_canny.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_color.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_gftt.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_hough.cpp	diff1 \|	\|	blob \| history
modules/ocl/perf/perf_imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_match_template.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_precomp.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/perf_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/color.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/filtering.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/haar.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/main.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_brute_force_matcher.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_color.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_fft.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_hough.cpp	diff1 \|	\|	blob \| history
modules/ocl/test/test_imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_kmeans.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_moments.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_objdetect.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/utility.cpp	diff1 \|	diff2 \|	blob \| history
modules/python/src2/cv2.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/simpleflow.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/tutorial_code/ImgTrans/copyMakeBorder_demo.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
samples/gpu/super_resolution.cpp	diff1 \|	diff2 \|	blob \| history