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

projects / profile / ivi / opencv.git / commit

author	Andrey Kamaev <andrey.kamaev@itseez.com>
	Fri, 5 Apr 2013 15:52:42 +0000 (19:52 +0400)
committer	Andrey Kamaev <andrey.kamaev@itseez.com>
	Fri, 5 Apr 2013 17:11:59 +0000 (21:11 +0400)
commit	67073daf1997f39dc56c3e4092dd42b381063d64
tree	13a360c339bba576d1b5df5c31895e0f69bdd178	tree \| snapshot
parent	378543991705088a3cb75bbba323874258d3c0a6	commit \| diff
parent	74e5ff2ec74a282825deda5ad43d5e4ddb9adab4	commit \| diff

Merge branch '2.4'

88 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsGrfmt.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsPerf.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsVideo.cmake	diff1 \|	diff2 \|	blob \| history
cmake/checks/win32uitest.cpp	\|	diff2 \|	blob \| history
cmake/templates/cvconfig.h.cmake	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_description/feature_description.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_solvepnp_ransac.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_stereomatching.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/doc/facerec/facerec_tutorial.rst	diff1 \|	diff2 \|	blob \| history
modules/contrib/include/opencv2/contrib/contrib.hpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/ba.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/doc/intro.rst	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/core.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/cvdef.h	diff1 \|	\|	blob \| history
modules/core/include/opencv2/core/mat.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.inl.hpp	diff1 \|	\|	blob \| history
modules/core/src/lapack.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/matop.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/matrix.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/doc/feature_detection_and_description.rst	diff1 \|	diff2 \|	blob \| history
modules/features2d/src/keypoint.cpp	diff1 \|	diff2 \|	blob \| history
modules/flann/include/opencv2/flann/dist.h	diff1 \|	diff2 \|	blob \| history
modules/gpu/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf/perf_video.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/tvl1flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/highgui/include/opencv2/highgui/highgui_c.h	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_dshow.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/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/window.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_ffmpeg.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_gui.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/imgwarp.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingDescriptorMatcherTest.java	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/java/core+MatOfDMatch.java	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/calibfilter.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/epilines.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/CMakeLists.txt	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/precomp.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/fft.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/initialization.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/mcwutil.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_absdiff.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_addWeighted.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_add_scalar.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_add_scalar_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_and.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_and_scalar.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_not.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_or.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_or_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_xor.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_xor_scalar_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_compare_eq.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_compare_ne.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_div.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_flip.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_mul.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/stereobp.cl	\|	diff2 \|	blob \| history
modules/ocl/src/stereobp.cpp	\|	diff2 \|	blob \| history
modules/ocl/test/test_calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/python/src2/cv2.cpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/include/opencv2/stitching/detail/warpers.hpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/src/matchers.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/tvl1flow.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/Qt_sample/main.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/super_resolution.cpp	diff1 \|	diff2 \|	blob \| history
samples/python2/dft.py	\|	diff2 \|	blob \| history

Domain: Multimedia / Uncategorized;

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsGrfmt.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsPerf.cmake	diff1 \|	diff2 \|	blob \| history
cmake/OpenCVFindLibsVideo.cmake	diff1 \|	diff2 \|	blob \| history
cmake/checks/win32uitest.cpp	\|	diff2 \|	blob \| history
cmake/templates/cvconfig.h.cmake	diff1 \|	diff2 \|	blob \| history
doc/tutorials/features2d/feature_description/feature_description.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst	diff1 \|	diff2 \|	blob \| history
doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_solvepnp_ransac.cpp	diff1 \|	diff2 \|	blob \| history
modules/calib3d/test/test_stereomatching.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/doc/facerec/facerec_tutorial.rst	diff1 \|	diff2 \|	blob \| history
modules/contrib/include/opencv2/contrib/contrib.hpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/ba.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/doc/intro.rst	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/core.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/cvdef.h	diff1 \|	\|	blob \| history
modules/core/include/opencv2/core/mat.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.inl.hpp	diff1 \|	\|	blob \| history
modules/core/src/lapack.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/matop.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/matrix.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/features2d/doc/feature_detection_and_description.rst	diff1 \|	diff2 \|	blob \| history
modules/features2d/src/keypoint.cpp	diff1 \|	diff2 \|	blob \| history
modules/flann/include/opencv2/flann/dist.h	diff1 \|	diff2 \|	blob \| history
modules/gpu/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/gpu/perf/perf_video.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpu/src/tvl1flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/highgui/include/opencv2/highgui/highgui_c.h	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_dshow.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/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/window.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_ffmpeg.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_gui.cpp	diff1 \|	diff2 \|	blob \| history
modules/highgui/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/imgwarp.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingDescriptorMatcherTest.java	diff1 \|	diff2 \|	blob \| history
modules/java/generator/src/java/core+MatOfDMatch.java	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/calibfilter.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/epilines.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/test/test_precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/CMakeLists.txt	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/precomp.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/fft.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/initialization.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/mcwutil.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_absdiff.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_addWeighted.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_add_scalar.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_add_scalar_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_and.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_and_scalar.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_not.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_or.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_or_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_xor.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_bitwise_xor_scalar_mask.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_compare_eq.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_compare_ne.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_div.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_flip.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/arithm_mul.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/stereobp.cl	\|	diff2 \|	blob \| history
modules/ocl/src/stereobp.cpp	\|	diff2 \|	blob \| history
modules/ocl/test/test_calib3d.cpp	diff1 \|	diff2 \|	blob \| history
modules/python/src2/cv2.cpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/include/opencv2/stitching/detail/warpers.hpp	diff1 \|	diff2 \|	blob \| history
modules/stitching/src/matchers.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/tvl1flow.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/Qt_sample/main.cpp	diff1 \|	diff2 \|	blob \| history
samples/gpu/super_resolution.cpp	diff1 \|	diff2 \|	blob \| history
samples/python2/dft.py	\|	diff2 \|	blob \| history