Merged revision(s) 8484 from trunk:

fixed some bugs in gpu module under Windows:
* convertTo alignment error
........
This commit is contained in:
Vladislav Vinogradov
2012-05-30 17:06:39 +00:00
parent 4ddcc31edc
commit 4e4b96e3d9
3 changed files with 14 additions and 2 deletions

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);
}
}