mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-23 18:49:08 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Avoid some float / double conversions in class Classify

Browse Source 
This also fixes several compiler warnings ([-Wimplicit-float-conversion],
[-Wdouble-promotion]).

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2024-05-19 18:27:38 +02:00
parent d0b3d0915e
commit 0366613526
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/classify/normmatch.cpp
View File

@ -52,17 +52,17 @@ struct NORM_PROTOS {
* normalization adjustment. The equation that represents the transform is:
* 1 / (1 + (NormAdj / midpoint) ^ curl)
*/
static double NormEvidenceOf(double NormAdj) {
NormAdj /= classify_norm_adj_midpoint;
static float NormEvidenceOf(float NormAdj) {
NormAdj /= static_cast<float>(classify_norm_adj_midpoint);
if (classify_norm_adj_curl == 3) {
NormAdj = NormAdj * NormAdj * NormAdj;
} else if (classify_norm_adj_curl == 2) {
NormAdj = NormAdj * NormAdj;
} else {
NormAdj = pow(NormAdj, classify_norm_adj_curl);
NormAdj = std::pow(NormAdj, static_cast<float>(classify_norm_adj_curl));
}
return (1.0 / (1.0 + NormAdj));
return (1 / (1 + NormAdj));
}
/*----------------------------------------------------------------------------
@ -73,7 +73,7 @@ static double NormEvidenceOf(double NormAdj) {
double_VAR(classify_norm_adj_midpoint, 32.0, "Norm adjust midpoint ...");
double_VAR(classify_norm_adj_curl, 2.0, "Norm adjust curl ...");
/** Weight of width variance against height and vertical position. */
const double kWidthErrorWeighting = 0.125;
const float kWidthErrorWeighting = 0.125f;
/*----------------------------------------------------------------------------
Public Code
@ -102,7 +102,7 @@ float Classify::ComputeNormMatch(CLASS_ID ClassId, const FEATURE_STRUCT &feature
float Match = (feature.Params[CharNormLength] * feature.Params[CharNormLength] * 500.0f +
feature.Params[CharNormRx] * feature.Params[CharNormRx] * 8000.0f +
feature.Params[CharNormRy] * feature.Params[CharNormRy] * 8000.0f);
return (1.0f - NormEvidenceOf(Match));
return (1 - NormEvidenceOf(Match));
}
float BestMatch = FLT_MAX;
@ -145,7 +145,7 @@ float Classify::ComputeNormMatch(CLASS_ID ClassId, const FEATURE_STRUCT &feature
BestMatch = Match;
}
}
return 1.0 - NormEvidenceOf(BestMatch);
return 1 - NormEvidenceOf(BestMatch);
} /* ComputeNormMatch */
void Classify::FreeNormProtos() {