mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #18427 from tomoaki0705:improveFlipTest

Browse Source
This commit is contained in:
Alexander Alekhin 2020-09-25 19:49:26 +00:00
commit b88ad7f2d9
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/cudaarithm/src/core.cpp
View File

@ -163,10 +163,12 @@ void cv::cuda::flip(InputArray _src, OutputArray _dst, int flipCode, Stream& str
_dst.create(src.size(), src.type());
GpuMat dst = getOutputMat(_dst, src.size(), src.type(), stream);
if (src.data == dst.data && ((src.cols & 1) == 1 || (src.rows & 1) == 1))
bool isInplace = (src.data == dst.data) || (src.refcount == dst.refcount);
bool isSizeOdd = (src.cols & 1) == 1 || (src.rows & 1) == 1;
if (isInplace && isSizeOdd)
CV_Error(Error::BadROISize, "In-place version of flip only accepts even width/height");
if (src.data != dst.data)
if (isInplace == false)
funcs[src.depth()][src.channels() - 1](src, dst, flipCode, StreamAccessor::getStream(stream));
else // in-place
ifuncs[src.depth()][src.channels() - 1](src, flipCode, StreamAccessor::getStream(stream));

9
modules/cudaarithm/test/test_core.cpp
View File

@ -281,11 +281,14 @@ CUDA_TEST_P(Flip, Accuracy)
CUDA_TEST_P(Flip, AccuracyInplace)
{
size.width = (size.width >> 1) << 1; // in-place version only accepts even number
size.height = (size.height >> 1) << 1; // in-place version only accepts even number
cv::Mat src = randomMat(size, type);
bool isSizeOdd = ((size.width & 1) == 1) || ((size.height & 1) == 1);
cv::cuda::GpuMat srcDst = loadMat(src, useRoi);
if(isSizeOdd)
{
EXPECT_THROW(cv::cuda::flip(srcDst, srcDst, flip_code), cv::Exception);
return;
}
cv::cuda::flip(srcDst, srcDst, flip_code);
cv::Mat dst_gold;