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

fixed some bugs in gpu module under Windows:

Browse Source 
* convertTo alignment error
* compare with scalars error
This commit is contained in:
Vladislav Vinogradov
2012-05-29 08:03:36 +00:00
parent c492dc6a83
commit 67b718f1cb
4 changed files with 116 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gpu/test/test_core.cpp
View File

@@ -850,7 +850,7 @@ TEST_P(Divide_Array, WithScale)
cv::Mat dst_gold;
cv::divide(mat1, mat2, dst_gold, scale, depth.second);
EXPECT_MAT_NEAR(dst_gold, dst, depth.first >= CV_32F || depth.second >= CV_32F ? 1e-4 : 1.0);
EXPECT_MAT_NEAR(dst_gold, dst, depth.first >= CV_32F || depth.second >= CV_32F ? 1e-2 : 1.0);
}
}
@@ -1612,6 +1612,14 @@ TEST_P(Compare_Scalar, Accuracy)
cv::Mat src = randomMat(size, type);
cv::Scalar sc = randomScalar(0.0, 255.0);
if (src.depth() < CV_32F)
{
sc.val[0] = cvRound(sc.val[0]);
sc.val[1] = cvRound(sc.val[1]);
sc.val[2] = cvRound(sc.val[2]);
sc.val[3] = cvRound(sc.val[3]);
}
if (src.depth() == CV_64F && !supportFeature(devInfo, cv::gpu::NATIVE_DOUBLE))
{
try