Skip to content

Commit 22682f9

Browse files
committed
Merge pull request opencv#6760 from alalek:issue_6653
2 parents da69cd0 + 8b05a4b commit 22682f9

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

modules/imgproc/src/color.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8394,7 +8394,11 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
83948394
CV_OCL_RUN( _src.dims() <= 2 && _dst.isUMat() && !(depth == CV_8U && (code == CV_Luv2BGR || code == CV_Luv2RGB)),
83958395
ocl_cvtColor(_src, _dst, code, dcn) )
83968396

8397-
Mat src = _src.getMat(), dst;
8397+
Mat src, dst;
8398+
if (_src.getObj() == _dst.getObj()) // inplace processing (#6653)
8399+
_src.copyTo(src);
8400+
else
8401+
src = _src.getMat();
83988402
Size sz = src.size();
83998403
CV_Assert( depth == CV_8U || depth == CV_16U || depth == CV_32F );
84008404

0 commit comments

Comments
 (0)