mirror of
https://github.com/tesseract-ocr/tesseract.git
synced 2025-06-11 12:43:17 +08:00
fix a set-but-not-used warning and add casts for comparing signed+unsigned numbers
This commit is contained in:
parent
b89bb09f9b
commit
7111167497
@ -483,7 +483,6 @@ void IntegerMatcher::Match(INT_CLASS ClassTemplate,
|
|||||||
bool SeparateDebugWindows) {
|
bool SeparateDebugWindows) {
|
||||||
ScratchEvidence *tables = new ScratchEvidence();
|
ScratchEvidence *tables = new ScratchEvidence();
|
||||||
int Feature;
|
int Feature;
|
||||||
int BestMatch;
|
|
||||||
|
|
||||||
if (MatchDebuggingOn (Debug))
|
if (MatchDebuggingOn (Debug))
|
||||||
cprintf ("Integer Matcher -------------------------------------------\n");
|
cprintf ("Integer Matcher -------------------------------------------\n");
|
||||||
@ -521,7 +520,7 @@ void IntegerMatcher::Match(INT_CLASS ClassTemplate,
|
|||||||
tables->UpdateSumOfProtoEvidences(ClassTemplate, ConfigMask, NumFeatures);
|
tables->UpdateSumOfProtoEvidences(ClassTemplate, ConfigMask, NumFeatures);
|
||||||
tables->NormalizeSums(ClassTemplate, NumFeatures, NumFeatures);
|
tables->NormalizeSums(ClassTemplate, NumFeatures, NumFeatures);
|
||||||
|
|
||||||
BestMatch = FindBestMatch(ClassTemplate, *tables, Result);
|
FindBestMatch(ClassTemplate, *tables, Result);
|
||||||
|
|
||||||
#ifndef GRAPHICS_DISABLED
|
#ifndef GRAPHICS_DISABLED
|
||||||
if (PrintMatchSummaryOn(Debug))
|
if (PrintMatchSummaryOn(Debug))
|
||||||
@ -847,9 +846,9 @@ int IntegerMatcher::UpdateTablesForFeature(
|
|||||||
M3 = ~M3;
|
M3 = ~M3;
|
||||||
A3 >>= mult_trunc_shift_bits_;
|
A3 >>= mult_trunc_shift_bits_;
|
||||||
M3 >>= mult_trunc_shift_bits_;
|
M3 >>= mult_trunc_shift_bits_;
|
||||||
if (A3 > evidence_mult_mask_)
|
if ((unsigned)A3 > evidence_mult_mask_)
|
||||||
A3 = evidence_mult_mask_;
|
A3 = evidence_mult_mask_;
|
||||||
if (M3 > evidence_mult_mask_)
|
if ((unsigned)M3 > evidence_mult_mask_)
|
||||||
M3 = evidence_mult_mask_;
|
M3 = evidence_mult_mask_;
|
||||||
|
|
||||||
A4 = (A3 * A3) + (M3 * M3);
|
A4 = (A3 * A3) + (M3 * M3);
|
||||||
|
Loading…
Reference in New Issue
Block a user