potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #26882 from shyama7004:nullptr-setidentity

Browse Source 
replace null literals with nullptr and optimize setidentity with std::fill
This commit is contained in:
Alexander Smorkalov
2025-02-07 17:18:49 +03:00
committed by GitHub
parent 740388b3ce 32d3d54ca1
commit aeac913203
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/matrix_operations.cpp
+6 -5
View File
@@ -90,7 +90,7 @@ void cv::hconcat(InputArray _src, OutputArray dst)
std::vector<Mat> src;
_src.getMatVector(src);
hconcat(!src.empty() ? &src[0] : 0, src.size(), dst);
hconcat(!src.empty() ? &src[0] : nullptr, src.size(), dst);
}
void cv::vconcat(const Mat* src, size_t nsrc, OutputArray _dst)
@@ -135,7 +135,7 @@ void cv::vconcat(InputArray _src, OutputArray dst)
std::vector<Mat> src;
_src.getMatVector(src);
vconcat(!src.empty() ? &src[0] : 0, src.size(), dst);
vconcat(!src.empty() ? &src[0] : nullptr, src.size(), dst);
}
//////////////////////////////////////// set identity ////////////////////////////////////////////
@@ -173,7 +173,7 @@ static bool ocl_setIdentity( InputOutputArray _m, const Scalar& s )
ocl::KernelArg::Constant(Mat(1, 1, sctype, s)));
size_t globalsize[2] = { (size_t)m.cols * cn / kercn, ((size_t)m.rows + rowsPerWI - 1) / rowsPerWI };
return k.run(2, globalsize, NULL, false);
return k.run(2, globalsize, nullptr, false);
}
}
@@ -214,8 +214,9 @@ void cv::setIdentity( InputOutputArray _m, const Scalar& s )
for( int i = 0; i < rows; i++, data += step )
{
for( int j = 0; j < cols; j++ )
data[j] = j == i ? val : 0;
std::fill(data, data + cols, 0.0);
if (i < cols)
data[i] = val;
}
}
else