unknown e032b5f5d5 Resolving conflicts after rebasing from public

2014-04-10 12:28:37 -07:00

..

test_accumulate.cpp

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

2014-03-19 13:56:31 +04:00

test_blend.cpp

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

2014-03-19 13:56:31 +04:00

test_boxfilter.cpp

added 3-channels support to cv::boxFilter, cv::blur, cv::sqrBoxFilter

2014-03-24 14:31:42 +04:00

test_canny.cpp

added 3-channels support to cv::Canny

2014-03-24 13:02:54 +04:00

test_color.cpp

disabled some IPP funcs

2014-04-08 22:30:18 +04:00

test_filter2d.cpp

refactored filter2D; eliminated restrictions sdepth == ddepth, delta == 0

2014-03-24 14:42:51 +04:00

test_filters.cpp

Resolving conflicts after rebasing from public

2014-04-10 12:28:37 -07:00

test_gftt.cpp

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

2014-03-19 13:56:31 +04:00

test_histogram.cpp

copyright fix

2014-03-31 14:57:03 +04:00

test_imgproc.cpp

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

2014-03-19 13:56:31 +04:00

test_match_template.cpp

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

2014-03-19 13:56:31 +04:00

test_medianfilter.cpp

added 3-channels support to cv::medianBlur

2014-03-24 14:32:31 +04:00

test_pyramids.cpp

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

2014-03-19 13:56:31 +04:00

test_sepfilter2D.cpp

eliminated restriction delta == 0 from cv::sepFilter2D

2014-03-24 17:39:07 +04:00

test_warp.cpp

integer cv::resize (INTER_LINEAR && CV_8UC(cn))

2014-03-31 20:25:53 +04:00