Merge pull request #23204 from whuaegeanse:fix-sift

This commit is contained in:
Alexander Alekhin 2023-02-01 16:52:29 +00:00
commit cb2052dbfe

View File

@ -850,7 +850,6 @@ else // CV_8U
#endif #endif
} }
#else #else
float* dst = dstMat.ptr<float>(row);
float nrm1 = 0; float nrm1 = 0;
for( k = 0; k < len; k++ ) for( k = 0; k < len; k++ )
{ {
@ -860,6 +859,7 @@ else // CV_8U
nrm1 = 1.f/std::max(nrm1, FLT_EPSILON); nrm1 = 1.f/std::max(nrm1, FLT_EPSILON);
if( dstMat.type() == CV_32F ) if( dstMat.type() == CV_32F )
{ {
float *dst = dstMat.ptr<float>(row);
for( k = 0; k < len; k++ ) for( k = 0; k < len; k++ )
{ {
dst[k] = std::sqrt(rawDst[k] * nrm1); dst[k] = std::sqrt(rawDst[k] * nrm1);
@ -867,6 +867,7 @@ if( dstMat.type() == CV_32F )
} }
else // CV_8U else // CV_8U
{ {
uint8_t *dst = dstMat.ptr<uint8_t>(row);
for( k = 0; k < len; k++ ) for( k = 0; k < len; k++ )
{ {
dst[k] = saturate_cast<uchar>(std::sqrt(rawDst[k] * nrm1)*SIFT_INT_DESCR_FCTR); dst[k] = saturate_cast<uchar>(std::sqrt(rawDst[k] * nrm1)*SIFT_INT_DESCR_FCTR);