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

fixed warpAffine and warpPerspective tests

Browse Source
This commit is contained in:
Alexey Spizhevoy 2011-02-02 10:07:56 +00:00
parent a80793667f
commit 5cc7d858ad
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/gpu/src/imgproc_gpu.cpp
View File

@ -65,7 +65,7 @@ protected:
virtual int test(const Mat& img) = 0; virtual int test(const Mat& img) = 0;
int CheckNorm(const Mat& m1, const Mat& m2); int CheckNorm(const Mat& m1, const Mat& m2);
int ChechSimilarity(const Mat& m1, const Mat& m2); int CheckSimilarity(const Mat& m1, const Mat& m2, float max_err=1e-3f);
}; };
@ -118,14 +118,14 @@ int CV_GpuImageProcTest::CheckNorm(const Mat& m1, const Mat& m2)
} }
} }
int CV_GpuImageProcTest::ChechSimilarity(const Mat& m1, const Mat& m2) int CV_GpuImageProcTest::CheckSimilarity(const Mat& m1, const Mat& m2, float max_err)
{ {
Mat diff; Mat diff;
cv::matchTemplate(m1, m2, diff, CV_TM_CCORR_NORMED); cv::matchTemplate(m1, m2, diff, CV_TM_CCORR_NORMED);
float err = abs(diff.at<float>(0, 0) - 1.f); float err = abs(diff.at<float>(0, 0) - 1.f);
if (err > 1e-3f) if (err > max_err)
return CvTS::FAIL_INVALID_OUTPUT; return CvTS::FAIL_INVALID_OUTPUT;
return CvTS::OK; return CvTS::OK;
@ -263,13 +263,8 @@ struct CV_GpuNppImageResizeTest : public CV_GpuImageProcTest
cv::gpu::resize(gpu1, gpu_res1, Size(), 2.0, 2.0, interpolations[i]); cv::gpu::resize(gpu1, gpu_res1, Size(), 2.0, 2.0, interpolations[i]);
cv::gpu::resize(gpu_res1, gpu_res2, Size(), 0.5, 0.5, interpolations[i]); cv::gpu::resize(gpu_res1, gpu_res2, Size(), 0.5, 0.5, interpolations[i]);
switch (img.depth()) if (CheckSimilarity(cpu_res2, gpu_res2) != CvTS::OK)
{
case CV_8U:
if (ChechSimilarity(cpu_res2, gpu_res2) != CvTS::OK)
test_res = CvTS::FAIL_GENERIC; test_res = CvTS::FAIL_GENERIC;
break;
}
} }
return test_res; return test_res;
@ -346,7 +341,7 @@ struct CV_GpuNppImageWarpAffineTest : public CV_GpuImageProcTest
GpuMat gpudst; GpuMat gpudst;
cv::gpu::warpAffine(gpu1, gpudst, M, gpu1.size(), flags[i]); cv::gpu::warpAffine(gpu1, gpudst, M, gpu1.size(), flags[i]);
if (CheckNorm(cpudst, gpudst) != CvTS::OK) if (CheckSimilarity(cpudst, gpudst, 3e-3f) != CvTS::OK)
test_res = CvTS::FAIL_GENERIC; test_res = CvTS::FAIL_GENERIC;
} }
@ -394,7 +389,7 @@ struct CV_GpuNppImageWarpPerspectiveTest : public CV_GpuImageProcTest
GpuMat gpudst; GpuMat gpudst;
cv::gpu::warpPerspective(gpu1, gpudst, M, gpu1.size(), flags[i]); cv::gpu::warpPerspective(gpu1, gpudst, M, gpu1.size(), flags[i]);
if (CheckNorm(cpudst, gpudst) != CvTS::OK) if (CheckSimilarity(cpudst, gpudst, 3e-3f) != CvTS::OK)
test_res = CvTS::FAIL_GENERIC; test_res = CvTS::FAIL_GENERIC;
} }