diff --git a/modules/cudaarithm/src/core.cpp b/modules/cudaarithm/src/core.cpp index aefcfc5af274..368c2fcc4190 100644 --- a/modules/cudaarithm/src/core.cpp +++ b/modules/cudaarithm/src/core.cpp @@ -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)); diff --git a/modules/cudaarithm/test/test_core.cpp b/modules/cudaarithm/test/test_core.cpp index 04b144ff37bb..728ee12b1643 100644 --- a/modules/cudaarithm/test/test_core.cpp +++ b/modules/cudaarithm/test/test_core.cpp @@ -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;