Commit 18f71fd4 authored by yao's avatar yao

Warning fixes

parent 616dbd53
...@@ -132,7 +132,7 @@ TEST_P(MulSpectrums, Simple) ...@@ -132,7 +132,7 @@ TEST_P(MulSpectrums, Simple)
cv::Mat c_gold; cv::Mat c_gold;
cv::mulSpectrums(a, b, c_gold, flag, ccorr); cv::mulSpectrums(a, b, c_gold, flag, ccorr);
EXPECT_MAT_NEAR(c_gold, c, 1e-2, ""); EXPECT_MAT_NEAR(c_gold, c, 1e-2);
} }
TEST_P(MulSpectrums, Scaled) TEST_P(MulSpectrums, Scaled)
...@@ -146,7 +146,7 @@ TEST_P(MulSpectrums, Scaled) ...@@ -146,7 +146,7 @@ TEST_P(MulSpectrums, Scaled)
cv::mulSpectrums(a, b, c_gold, flag, ccorr); cv::mulSpectrums(a, b, c_gold, flag, ccorr);
c_gold.convertTo(c_gold, c_gold.type(), scale); c_gold.convertTo(c_gold, c_gold.type(), scale);
EXPECT_MAT_NEAR(c_gold, c, 1e-2, ""); EXPECT_MAT_NEAR(c_gold, c, 1e-2);
} }
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, MulSpectrums, testing::Combine( INSTANTIATE_TEST_CASE_P(OCL_ImgProc, MulSpectrums, testing::Combine(
...@@ -230,7 +230,7 @@ TEST_P(Convolve_DFT, Accuracy) ...@@ -230,7 +230,7 @@ TEST_P(Convolve_DFT, Accuracy)
cv::Mat dst_gold; cv::Mat dst_gold;
convolveDFT(src, kernel, dst_gold, ccorr); convolveDFT(src, kernel, dst_gold, ccorr);
EXPECT_MAT_NEAR(dst, dst_gold, 1e-1, ""); EXPECT_MAT_NEAR(dst, dst_gold, 1e-1);
} }
#define DIFFERENT_CONVOLVE_SIZES testing::Values(cv::Size(251, 257), cv::Size(113, 113), cv::Size(200, 480), cv::Size(1300, 1300)) #define DIFFERENT_CONVOLVE_SIZES testing::Values(cv::Size(251, 257), cv::Size(113, 113), cv::Size(200, 480), cv::Size(1300, 1300))
INSTANTIATE_TEST_CASE_P(OCL_ImgProc, Convolve_DFT, testing::Combine( INSTANTIATE_TEST_CASE_P(OCL_ImgProc, Convolve_DFT, testing::Combine(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment