mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #16751 from alalek:core_coverity_issues

Browse Source
This commit is contained in:
Alexander Alekhin 2020-03-06 19:07:21 +00:00
commit 6d113bd03f
2 changed files with 74 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/core/src/minmax.cpp
View File

@ -1089,6 +1089,7 @@ bool ocl_minMaxIdx( InputArray _src, double* minVal, double* maxVal, int* minLoc
getMinMaxRes<double> getMinMaxRes<double>
}; };
CV_Assert(ddepth <= CV_64F);
getMinMaxResFunc func = functab[ddepth]; getMinMaxResFunc func = functab[ddepth];
int locTemp[2]; int locTemp[2];

132
modules/core/src/norm.cpp
View File

@ -710,51 +710,58 @@ double cv::norm( InputArray _src, int normType, InputArray _mask )
result; result;
result.d = 0; result.d = 0;
NAryMatIterator it(arrays, ptrs); NAryMatIterator it(arrays, ptrs);
int j, total = (int)it.size, blockSize = total, intSumBlockSize = 0, count = 0; CV_CheckLT((size_t)it.size, (size_t)INT_MAX, "");
bool blockSum = (normType == NORM_L1 && depth <= CV_16S) ||
((normType == NORM_L2 || normType == NORM_L2SQR) && depth <= CV_8S);
int isum = 0;
int *ibuf = &result.i;
size_t esz = 0;
if( blockSum ) if ((normType == NORM_L1 && depth <= CV_16S) ||
((normType == NORM_L2 || normType == NORM_L2SQR) && depth <= CV_8S))
{ {
intSumBlockSize = (normType == NORM_L1 && depth <= CV_8S ? (1 << 23) : (1 << 15))/cn; // special case to handle "integer" overflow in accumulator
blockSize = std::min(blockSize, intSumBlockSize); const size_t esz = src.elemSize();
ibuf = &isum; const int total = (int)it.size;
esz = src.elemSize(); const int intSumBlockSize = (normType == NORM_L1 && depth <= CV_8S ? (1 << 23) : (1 << 15))/cn;
} const int blockSize = std::min(total, intSumBlockSize);
int isum = 0;
int count = 0;
for( size_t i = 0; i < it.nplanes; i++, ++it ) for (size_t i = 0; i < it.nplanes; i++, ++it)
{
for( j = 0; j < total; j += blockSize )
{ {
int bsz = std::min(total - j, blockSize); for (int j = 0; j < total; j += blockSize)
func( ptrs[0], ptrs[1], (uchar*)ibuf, bsz, cn );
count += bsz;
if( blockSum && (count + blockSize >= intSumBlockSize || (i+1 >= it.nplanes && j+bsz >= total)) )
{ {
result.d += isum; int bsz = std::min(total - j, blockSize);
isum = 0; func(ptrs[0], ptrs[1], (uchar*)&isum, bsz, cn);
count = 0; count += bsz;
if (count + blockSize >= intSumBlockSize || (i+1 >= it.nplanes && j+bsz >= total))
{
result.d += isum;
isum = 0;
count = 0;
}
ptrs[0] += bsz*esz;
if (ptrs[1])
ptrs[1] += bsz;
} }
ptrs[0] += bsz*esz; }
if( ptrs[1] ) }
ptrs[1] += bsz; else
{
// generic implementation
for (size_t i = 0; i < it.nplanes; i++, ++it)
{
func(ptrs[0], ptrs[1], (uchar*)&result, (int)it.size, cn);
} }
} }
if( normType == NORM_INF ) if( normType == NORM_INF )
{ {
if( depth == CV_64F ) if( depth == CV_64F )
; return result.d;
else if( depth == CV_32F ) else if( depth == CV_32F )
result.d = result.f; return result.f;
else else
result.d = result.i; return result.i;
} }
else if( normType == NORM_L2 ) else if( normType == NORM_L2 )
result.d = std::sqrt(result.d); return std::sqrt(result.d);
return result.d; return result.d;
} }
@ -1170,52 +1177,59 @@ double cv::norm( InputArray _src1, InputArray _src2, int normType, InputArray _m
result; result;
result.d = 0; result.d = 0;
NAryMatIterator it(arrays, ptrs); NAryMatIterator it(arrays, ptrs);
int j, total = (int)it.size, blockSize = total, intSumBlockSize = 0, count = 0; CV_CheckLT((size_t)it.size, (size_t)INT_MAX, "");
bool blockSum = (normType == NORM_L1 && depth <= CV_16S) ||
((normType == NORM_L2 || normType == NORM_L2SQR) && depth <= CV_8S);
unsigned isum = 0;
unsigned *ibuf = &result.u;
size_t esz = 0;
if( blockSum ) if ((normType == NORM_L1 && depth <= CV_16S) ||
((normType == NORM_L2 || normType == NORM_L2SQR) && depth <= CV_8S))
{ {
intSumBlockSize = normType == NORM_L1 && depth <= CV_8S ? (1 << 23) : (1 << 15); // special case to handle "integer" overflow in accumulator
blockSize = std::min(blockSize, intSumBlockSize); const size_t esz = src1.elemSize();
ibuf = &isum; const int total = (int)it.size;
esz = src1.elemSize(); const int intSumBlockSize = normType == NORM_L1 && depth <= CV_8S ? (1 << 23) : (1 << 15);
} const int blockSize = std::min(total, intSumBlockSize);
int isum = 0;
int count = 0;
for( size_t i = 0; i < it.nplanes; i++, ++it ) for (size_t i = 0; i < it.nplanes; i++, ++it)
{
for( j = 0; j < total; j += blockSize )
{ {
int bsz = std::min(total - j, blockSize); for (int j = 0; j < total; j += blockSize)
func( ptrs[0], ptrs[1], ptrs[2], (uchar*)ibuf, bsz, cn );
count += bsz;
if( blockSum && (count + blockSize >= intSumBlockSize || (i+1 >= it.nplanes && j+bsz >= total)) )
{ {
result.d += isum; int bsz = std::min(total - j, blockSize);
isum = 0; func(ptrs[0], ptrs[1], ptrs[2], (uchar*)&isum, bsz, cn);
count = 0; count += bsz;
if (count + blockSize >= intSumBlockSize || (i+1 >= it.nplanes && j+bsz >= total))
{
result.d += isum;
isum = 0;
count = 0;
}
ptrs[0] += bsz*esz;
ptrs[1] += bsz*esz;
if (ptrs[2])
ptrs[2] += bsz;
} }
ptrs[0] += bsz*esz; }
ptrs[1] += bsz*esz; }
if( ptrs[2] ) else
ptrs[2] += bsz; {
// generic implementation
for (size_t i = 0; i < it.nplanes; i++, ++it)
{
func(ptrs[0], ptrs[1], ptrs[2], (uchar*)&result, (int)it.size, cn);
} }
} }
if( normType == NORM_INF ) if( normType == NORM_INF )
{ {
if( depth == CV_64F ) if( depth == CV_64F )
; return result.d;
else if( depth == CV_32F ) else if( depth == CV_32F )
result.d = result.f; return result.f;
else else
result.d = result.u; return result.u;
} }
else if( normType == NORM_L2 ) else if( normType == NORM_L2 )
result.d = std::sqrt(result.d); return std::sqrt(result.d);
return result.d; return result.d;
} }