generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ilya Lavrenov
2014-03-18 16:02:25 +04:00
parent 6e44f05e6f
commit b73490f86c
28 changed files with 360 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/imgproc/test/ocl/test_pyramids.cpp
View File

@@ -57,8 +57,8 @@ PARAM_TEST_CASE(PyrTestBase, MatDepth, Channels, bool)
int depth, channels;
bool use_roi;
TEST_DECLARE_INPUT_PARAMETER(src)
TEST_DECLARE_OUTPUT_PARAMETER(dst)
TEST_DECLARE_INPUT_PARAMETER(src);
TEST_DECLARE_OUTPUT_PARAMETER(dst);
virtual void SetUp()
{
@@ -75,8 +75,8 @@ PARAM_TEST_CASE(PyrTestBase, MatDepth, Channels, bool)
Border dstBorder = randomBorder(0, use_roi ? MAX_VALUE : 0);
randomSubMat(dst, dst_roi, dst_roiSize, dstBorder, CV_MAKETYPE(depth, channels), -MAX_VALUE, MAX_VALUE);
UMAT_UPLOAD_INPUT_PARAMETER(src)
UMAT_UPLOAD_OUTPUT_PARAMETER(dst)
UMAT_UPLOAD_INPUT_PARAMETER(src);
UMAT_UPLOAD_OUTPUT_PARAMETER(dst);
}
void Near(double threshold = 0.0)