Skip to content

O
opencv
Commit 5a166ca9 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

fixed gpu minMax tests under linux

parent bbdb52f8
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 19 deletions
tests/gpu/src/arithm.cpp
View file @ 5a166ca9
...@@ -697,12 +697,8 @@ struct CV_GpuMinMaxTest: public CvTest ...@@ -697,12 +697,8 @@ struct CV_GpuMinMaxTest: public CvTest
void test(int rows, int cols, int cn, int depth) void test(int rows, int cols, int cn, int depth)
{ {
cv::Mat src(rows, cols, CV_MAKE_TYPE(depth, cn)); cv::Mat src(rows, cols, CV_MAKE_TYPE(depth, cn));
cv::RNG rng; cv::RNG rng(*ts->get_rng());
for (int i = 0; i < src.rows; ++i) rng.fill(src, RNG::UNIFORM, Scalar(0), Scalar(255));
{
Mat row(1, src.cols * src.elemSize(), CV_8U, src.ptr(i));
rng.fill(row, RNG::UNIFORM, Scalar(0), Scalar(256));
}
double minVal, maxVal; double minVal, maxVal;
cv::Point minLoc, maxLoc; cv::Point minLoc, maxLoc;
...@@ -725,7 +721,6 @@ struct CV_GpuMinMaxTest: public CvTest ...@@ -725,7 +721,6 @@ struct CV_GpuMinMaxTest: public CvTest
} }
double minVal_, maxVal_; double minVal_, maxVal_;
cv::Point minLoc_, maxLoc_;
cv::gpu::minMax(cv::gpu::GpuMat(src), &minVal_, &maxVal_, cv::gpu::GpuMat(), buf); cv::gpu::minMax(cv::gpu::GpuMat(src), &minVal_, &maxVal_, cv::gpu::GpuMat(), buf);
if (abs(minVal - minVal_) > 1e-3f) if (abs(minVal - minVal_) > 1e-3f)
...@@ -743,12 +738,8 @@ struct CV_GpuMinMaxTest: public CvTest ...@@ -743,12 +738,8 @@ struct CV_GpuMinMaxTest: public CvTest
void test_masked(int rows, int cols, int cn, int depth) void test_masked(int rows, int cols, int cn, int depth)
{ {
cv::Mat src(rows, cols, CV_MAKE_TYPE(depth, cn)); cv::Mat src(rows, cols, CV_MAKE_TYPE(depth, cn));
cv::RNG rng; cv::RNG rng(*ts->get_rng());
for (int i = 0; i < src.rows; ++i) rng.fill(src, RNG::UNIFORM, Scalar(0), Scalar(255));
{
Mat row(1, src.cols * src.elemSize(), CV_8U, src.ptr(i));
rng.fill(row, RNG::UNIFORM, Scalar(0), Scalar(256));
}
cv::Mat mask(src.size(), CV_8U); cv::Mat mask(src.size(), CV_8U);
rng.fill(mask, RNG::UNIFORM, Scalar(0), Scalar(2)); rng.fill(mask, RNG::UNIFORM, Scalar(0), Scalar(2));
...@@ -832,12 +823,8 @@ struct CV_GpuMinMaxLocTest: public CvTest ...@@ -832,12 +823,8 @@ struct CV_GpuMinMaxLocTest: public CvTest
void test(int rows, int cols, int depth) void test(int rows, int cols, int depth)
{ {
cv::Mat src(rows, cols, depth); cv::Mat src(rows, cols, depth);
cv::RNG rng; cv::RNG rng(*ts->get_rng());
for (int i = 0; i < src.rows; ++i) rng.fill(src, RNG::UNIFORM, Scalar(0), Scalar(255));
{
Mat row(1, src.cols * src.elemSize(), CV_8U, src.ptr(i));
rng.fill(row, RNG::UNIFORM, Scalar(0), Scalar(256));
}
cv::Mat mask(src.size(), CV_8U); cv::Mat mask(src.size(), CV_8U);
rng.fill(mask, RNG::UNIFORM, Scalar(0), Scalar(2)); rng.fill(mask, RNG::UNIFORM, Scalar(0), Scalar(2));
......
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