Skip to content

Commit 4139898

Browse files
committed
Merge pull request opencv#12792 from tomoaki0705:fixCudaImgprocColorGray
2 parents 2b3c749 + 944710d commit 4139898

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

modules/cudaimgproc/test/test_color.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,7 @@ CUDA_TEST_P(CvtColor, BGR2Lab)
16251625
cv::Mat dst_gold;
16261626
cv::cvtColor(src, dst_gold, cv::COLOR_BGR2Lab);
16271627

1628-
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 1 : 1e-3);
1628+
EXPECT_MAT_NEAR(dst_gold, dst, 1);
16291629
}
16301630

16311631
CUDA_TEST_P(CvtColor, RGB2Lab)
@@ -1641,7 +1641,7 @@ CUDA_TEST_P(CvtColor, RGB2Lab)
16411641
cv::Mat dst_gold;
16421642
cv::cvtColor(src, dst_gold, cv::COLOR_RGB2Lab);
16431643

1644-
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 1 : 1e-3);
1644+
EXPECT_MAT_NEAR(dst_gold, dst, 1);
16451645
}
16461646

16471647
CUDA_TEST_P(CvtColor, BGRA2Lab4)
@@ -1666,7 +1666,7 @@ CUDA_TEST_P(CvtColor, BGRA2Lab4)
16661666
cv::split(h_dst, channels);
16671667
cv::merge(channels, 3, h_dst);
16681668

1669-
EXPECT_MAT_NEAR(dst_gold, h_dst, depth == CV_8U ? 1 : 1e-3);
1669+
EXPECT_MAT_NEAR(dst_gold, h_dst, depth == CV_8U ? 1 : 6e-1);
16701670
}
16711671

16721672
CUDA_TEST_P(CvtColor, LBGR2Lab)
@@ -1740,7 +1740,7 @@ CUDA_TEST_P(CvtColor, Lab2BGR)
17401740
cv::Mat dst_gold;
17411741
cv::cvtColor(src, dst_gold, cv::COLOR_Lab2BGR);
17421742

1743-
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 1e-5);
1743+
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 1e-2);
17441744
}
17451745

17461746
CUDA_TEST_P(CvtColor, Lab2RGB)
@@ -1757,7 +1757,7 @@ CUDA_TEST_P(CvtColor, Lab2RGB)
17571757
cv::Mat dst_gold;
17581758
cv::cvtColor(src, dst_gold, cv::COLOR_Lab2RGB);
17591759

1760-
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 1e-5);
1760+
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 1e-2);
17611761
}
17621762

17631763
CUDA_TEST_P(CvtColor, Lab2BGRA)
@@ -1776,7 +1776,7 @@ CUDA_TEST_P(CvtColor, Lab2BGRA)
17761776
cv::Mat dst_gold;
17771777
cv::cvtColor(src, dst_gold, cv::COLOR_Lab2BGR, 4);
17781778

1779-
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 1e-5);
1779+
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 1e-2);
17801780
}
17811781

17821782
CUDA_TEST_P(CvtColor, Lab2LBGR)
@@ -1793,7 +1793,7 @@ CUDA_TEST_P(CvtColor, Lab2LBGR)
17931793
cv::Mat dst_gold;
17941794
cv::cvtColor(src, dst_gold, cv::COLOR_Lab2LBGR);
17951795

1796-
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 1e-5);
1796+
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 5e-3);
17971797
}
17981798

17991799
CUDA_TEST_P(CvtColor, Lab2LRGB)
@@ -1810,7 +1810,7 @@ CUDA_TEST_P(CvtColor, Lab2LRGB)
18101810
cv::Mat dst_gold;
18111811
cv::cvtColor(src, dst_gold, cv::COLOR_Lab2LRGB);
18121812

1813-
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 1e-5);
1813+
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 5e-3);
18141814
}
18151815

18161816
CUDA_TEST_P(CvtColor, Lab2LRGBA)
@@ -1827,7 +1827,7 @@ CUDA_TEST_P(CvtColor, Lab2LRGBA)
18271827
cv::Mat dst_gold;
18281828
cv::cvtColor(src, dst_gold, cv::COLOR_Lab2LRGB, 4);
18291829

1830-
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 1e-5);
1830+
EXPECT_MAT_NEAR(dst_gold, dst, depth == CV_8U ? 2 : 5e-3);
18311831
}
18321832

18331833
CUDA_TEST_P(CvtColor, BGR2Luv)

0 commit comments

Comments
 (0)