review.tizen.org Git - platform/upstream/opencv.git/commit

projects / platform / upstream / opencv.git / commit

author	Roman Donchenko <roman.donchenko@itseez.com>
	Mon, 13 Jan 2014 15:28:43 +0000 (19:28 +0400)
committer	Roman Donchenko <roman.donchenko@itseez.com>
	Tue, 14 Jan 2014 07:53:59 +0000 (11:53 +0400)
commit	fee2ed37fc27dbfd25f850f627b8121a308eb200
tree	4bfa7a52f63852ca5d83d310868c6ef27edafd8b	tree \| snapshot
parent	c3bfe3f33e821e27dacc34a6c72e5a8ab038079e	commit \| diff
parent	9628abc7867c507201da2c5030195264de81aa27	commit \| diff

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

Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp

44 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
apps/haartraining/cvclassifier.h	diff1 \|	diff2 \|	blob \| history
modules/bioinspired/src/retina.cpp	diff1 \|	\|	blob \| history
modules/calib3d/test/test_chessboardgenerator.hpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/adaptiveskindetector.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/ba.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/facerec.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/fuzzymeanshifttracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/spinimages.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.inl.hpp	diff1 \|	\|	blob \| history
modules/core/src/algorithm.cpp	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/copy.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/system.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/cudaimgproc/perf/perf_match_template.cpp	diff1 \|	\|	blob \| history
modules/features2d/src/features2d_init.cpp	diff1 \|	diff2 \|	blob \| history
modules/flann/include/opencv2/flann/hierarchical_clustering_index.h	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/bitstrm.hpp	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_w32.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/perf/perf_filter2d.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/gcgraph.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/imgwarp.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/vecfacetracking.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/src/ml_init.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/nonfree_init.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl.hpp	diff1 \|	\|	blob \| history
modules/ocl/include/opencv2/ocl/private/opencl_utils.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_objdetect.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/utility.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1_ocl.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/ts_perf.hpp	diff1 \|	diff2 \|	blob \| history
modules/video/perf/perf_optflowpyrlk.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/kalman.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/tvl1flow.cpp	diff1 \|	diff2 \|	blob \| history
samples/c/adaptiveskindetector.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/calibration_artificial.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/kmeans.cpp	diff1 \|	diff2 \|	blob \| history

Domain: Multimedia / Media Vision;

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
apps/haartraining/cvclassifier.h	diff1 \|	diff2 \|	blob \| history
modules/bioinspired/src/retina.cpp	diff1 \|	\|	blob \| history
modules/calib3d/test/test_chessboardgenerator.hpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/adaptiveskindetector.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/ba.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/facerec.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/fuzzymeanshifttracker.cpp	diff1 \|	diff2 \|	blob \| history
modules/contrib/src/spinimages.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.inl.hpp	diff1 \|	\|	blob \| history
modules/core/src/algorithm.cpp	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/copy.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/precomp.hpp	diff1 \|	diff2 \|	blob \| history
modules/core/src/system.cpp	diff1 \|	diff2 \|	blob \| history
modules/core/test/test_arithm.cpp	diff1 \|	diff2 \|	blob \| history
modules/cudaimgproc/perf/perf_match_template.cpp	diff1 \|	\|	blob \| history
modules/features2d/src/features2d_init.cpp	diff1 \|	diff2 \|	blob \| history
modules/flann/include/opencv2/flann/hierarchical_clustering_index.h	diff1 \|	diff2 \|	blob \| history
modules/highgui/src/bitstrm.hpp	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_w32.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/perf/perf_filter2d.cpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/gcgraph.hpp	diff1 \|	diff2 \|	blob \| history
modules/imgproc/src/imgwarp.cpp	diff1 \|	diff2 \|	blob \| history
modules/legacy/src/vecfacetracking.cpp	diff1 \|	diff2 \|	blob \| history
modules/ml/src/ml_init.cpp	diff1 \|	diff2 \|	blob \| history
modules/nonfree/src/nonfree_init.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/include/opencv2/ocl.hpp	diff1 \|	\|	blob \| history
modules/ocl/include/opencv2/ocl/private/opencl_utils.hpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/test_objdetect.cpp	diff1 \|	diff2 \|	blob \| history
modules/ocl/test/utility.hpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/btv_l1_ocl.cpp	diff1 \|	diff2 \|	blob \| history
modules/superres/src/optical_flow.cpp	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/ts_perf.hpp	diff1 \|	diff2 \|	blob \| history
modules/video/perf/perf_optflowpyrlk.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/kalman.cpp	diff1 \|	diff2 \|	blob \| history
modules/video/src/tvl1flow.cpp	diff1 \|	diff2 \|	blob \| history
samples/c/adaptiveskindetector.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/calibration_artificial.cpp	diff1 \|	diff2 \|	blob \| history
samples/cpp/kmeans.cpp	diff1 \|	diff2 \|	blob \| history