generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix normalize in case of inplace operations

Browse Source 
fixes #5876
This commit is contained in:
Alexander Alekhin
2015-12-25 15:33:06 +03:00
parent 8d79285d02
commit 6997d423c8
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/core/src/convert.cpp
View File

@@ -5352,22 +5352,21 @@ void cv::normalize( InputArray _src, InputOutputArray _dst, double a, double b,
else else
CV_Error( CV_StsBadArg, "Unknown/unsupported norm type" ); CV_Error( CV_StsBadArg, "Unknown/unsupported norm type" );
int type = _src.type(), depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type); int type = _src.type(), depth = CV_MAT_DEPTH(type);
if( rtype < 0 ) if( rtype < 0 )
rtype = _dst.fixedType() ? _dst.depth() : depth; rtype = _dst.fixedType() ? _dst.depth() : depth;
_dst.createSameSize(_src, CV_MAKETYPE(rtype, cn));
CV_OCL_RUN(_dst.isUMat(), CV_OCL_RUN(_dst.isUMat(),
ocl_normalize(_src, _dst, _mask, rtype, scale, shift)) ocl_normalize(_src, _dst, _mask, rtype, scale, shift))
Mat src = _src.getMat(), dst = _dst.getMat(); Mat src = _src.getMat();
if( _mask.empty() ) if( _mask.empty() )
src.convertTo( dst, rtype, scale, shift ); src.convertTo( _dst, rtype, scale, shift );
else else
{ {
Mat temp; Mat temp;
src.convertTo( temp, rtype, scale, shift ); src.convertTo( temp, rtype, scale, shift );
temp.copyTo( dst, _mask ); temp.copyTo( _dst, _mask );
} }
} }