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 #18348 from tomoaki0705:fixNppFlipInplace

Browse Source
This commit is contained in:
Alexander Alekhin 2020-09-17 13:56:17 +00:00
commit e668cff573
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,8 +163,10 @@ 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))
CV_Error(Error::BadROISize, "In-place version of flip only accepts even width/height");
if (src.refcount != dst.refcount)
if (src.data != dst.data)
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));

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

@ -281,6 +281,8 @@ 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);
cv::cuda::GpuMat srcDst = loadMat(src, useRoi);