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

projects / profile / ivi / opencv.git / commit

author	Ilya Lavrenov <ilya.lavrenov@itseez.com>
	Tue, 18 Mar 2014 12:02:25 +0000 (16:02 +0400)
committer	Ilya Lavrenov <ilya.lavrenov@itseez.com>
	Wed, 19 Mar 2014 09:56:31 +0000 (13:56 +0400)
commit	b73490f86c32dc521df466af420446e0ccdf5919
tree	db909d4759e4bcc51e577bb3ab0978f5a7656878	tree \| snapshot
parent	6e44f05e6fa84f58cc7f9aa1d9c5357f8105c710	commit \| diff

eliminated restriction src[i].channels() == 1 in cv::merge

28 files changed:

modules/core/src/convert.cpp		diff \| blob \| history
modules/core/src/opencl/split_merge.cl		diff \| blob \| history
modules/core/test/ocl/test_arithm.cpp		diff \| blob \| history
modules/core/test/ocl/test_channels.cpp		diff \| blob \| history
modules/core/test/ocl/test_dft.cpp		diff \| blob \| history
modules/core/test/ocl/test_gemm.cpp		diff \| blob \| history
modules/core/test/ocl/test_matrix_operation.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_accumulate.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_blend.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_boxfilter.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_canny.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_color.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_filter2d.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_filters.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_gftt.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_histogram.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_imgproc.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_match_template.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_medianfilter.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_pyramids.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_sepfilter2D.cpp		diff \| blob \| history
modules/imgproc/test/ocl/test_warp.cpp		diff \| blob \| history
modules/photo/test/ocl/test_denoising.cpp		diff \| blob \| history
modules/ts/include/opencv2/ts/ocl_test.hpp		diff \| blob \| history
modules/ts/src/ocl_test.cpp		diff \| blob \| history
modules/video/test/ocl/test_bgfg_mog2.cpp		diff \| blob \| history
modules/video/test/ocl/test_motempl.cpp		diff \| blob \| history
modules/video/test/ocl/test_optflow_farneback.cpp		diff \| blob \| history

Domain: Multimedia / Uncategorized;

RSS Atom