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

projects / profile / ivi / opencv.git / commit

author	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 25 Jun 2013 10:08:23 +0000 (14:08 +0400)
committer	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 25 Jun 2013 11:55:52 +0000 (15:55 +0400)
commit	f36f8067bcaa91384dcc6048a1617410b83c22b0
tree	3c70993cfde86000e6e1dd9191a5b985926a5980	tree \| snapshot
parent	eff6dccb3b0e1d47e80fedcb1a4e44c613e41334	commit \| diff
parent	3bab7391d073f029d9f57507f739ef602ecf55db	commit \| diff

Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp

33 files changed:

modules/calib3d/include/opencv2/calib3d.hpp	diff1 \|	\|	blob \| history
modules/core/include/opencv2/core/cuda/limits.hpp	diff1 \|	\|	blob \| history
modules/core/include/opencv2/core/mat.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/private.hpp	diff1 \|	\|	blob \| history
modules/core/src/matrix.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpulegacy/include/opencv2/gpulegacy/NCV.hpp	diff1 \|	\|	blob \| history
modules/gpulegacy/src/cuda/NCVPixelOperations.hpp	diff1 \|	\|	blob \| history
modules/highgui/include/opencv2/highgui/cap_ios.h	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/window_QT.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/android_test/src/org/opencv/test/calib3d/Calib3dTest.java	diff1 \|	diff2 \|	blob \| history
modules/nonfree/test/test_features2d.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl.hpp	diff1 \|	\|	blob \| history
modules/ocl/include/opencv2/ocl/private/util.hpp	diff1 \|	diff2 \|	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_imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/precomp.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/hog.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/matrix_operations.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/mcwutil.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/objdetect_hog.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_objdetect.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/utility.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/utility.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/src/ts_func.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/facedetect.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/hog.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/pyrlk_optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/squares.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/stereo_match.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/surf_matcher.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/tvl1_optical_flow.cpp	\|	diff2 \|	blob \| history

Domain: Multimedia / Uncategorized;

RSS Atom

modules/calib3d/include/opencv2/calib3d.hpp	diff1 \|	\|	blob \| history
modules/core/include/opencv2/core/cuda/limits.hpp	diff1 \|	\|	blob \| history
modules/core/include/opencv2/core/mat.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/private.hpp	diff1 \|	\|	blob \| history
modules/core/src/matrix.cpp	diff1 \|	diff2 \|	blob \| history
modules/gpulegacy/include/opencv2/gpulegacy/NCV.hpp	diff1 \|	\|	blob \| history
modules/gpulegacy/src/cuda/NCVPixelOperations.hpp	diff1 \|	\|	blob \| history
modules/highgui/include/opencv2/highgui/cap_ios.h	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/window_QT.cpp	diff1 \|	diff2 \|	blob \| history
modules/java/android_test/src/org/opencv/test/calib3d/Calib3dTest.java	diff1 \|	diff2 \|	blob \| history
modules/nonfree/test/test_features2d.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl.hpp	diff1 \|	\|	blob \| history
modules/ocl/include/opencv2/ocl/private/util.hpp	diff1 \|	diff2 \|	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_imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/perf/precomp.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/hog.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/matrix_operations.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/mcwutil.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/src/opencl/objdetect_hog.cl	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_imgproc.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_objdetect.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/utility.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/utility.hpp	diff1 \|	diff2 \|	blob \| history
modules/ts/src/ts_func.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/facedetect.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/hog.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/pyrlk_optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/squares.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/stereo_match.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/surf_matcher.cpp	diff1 \|	diff2 \|	blob \| history
samples/ocl/tvl1_optical_flow.cpp	\|	diff2 \|	blob \| history