Merge pull request #9060 from alalek:canny_inplace_bug

7bb9237d · Alexander Alekhin · 11a726ce · cdf2a59a · 7bb9237d
Commit 7bb9237d authored Jul 03, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

canny.cpp modules/imgproc/src/canny.cpp +3 -0

No files found.
--- a/modules/imgproc/src/canny.cpp
+++ b/modules/imgproc/src/canny.cpp
@@ -972,6 +972,9 @@ void Canny( InputArray _src, OutputArray _dst,

    const Size size = _src.size();

+    // we don't support inplace parameters in case with RGB/BGR src
+    CV_Assert((_dst.getObj() != _src.getObj() || _src.type() == CV_8UC1) && "Inplace parameters are not supported");
+
    _dst.create(size, CV_8U);

    if (!L2gradient && (aperture_size & CV_CANNY_L2_GRADIENT) == CV_CANNY_L2_GRADIENT)