mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9060 from alalek:canny_inplace_bug

Browse Source
This commit is contained in:
Alexander Alekhin 2017-07-03 16:06:50 +00:00
commit 7bb9237d99
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/imgproc/src/canny.cpp
View File

@ -972,6 +972,9 @@ void Canny( InputArray _src, OutputArray _dst,
const Size size = _src.size(); 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); _dst.create(size, CV_8U);
if (!L2gradient && (aperture_size & CV_CANNY_L2_GRADIENT) == CV_CANNY_L2_GRADIENT) if (!L2gradient && (aperture_size & CV_CANNY_L2_GRADIENT) == CV_CANNY_L2_GRADIENT)