fix a set-but-not-used warning and add casts for comparing signed+unsigned numbers

This commit is contained in:
chrismamo1 2017-08-12 17:53:28 -05:00
parent b89bb09f9b
commit 7111167497

View File

@ -483,7 +483,6 @@ void IntegerMatcher::Match(INT_CLASS ClassTemplate,
bool SeparateDebugWindows) {
ScratchEvidence *tables = new ScratchEvidence();
int Feature;
int BestMatch;
if (MatchDebuggingOn (Debug))
cprintf ("Integer Matcher -------------------------------------------\n");
@ -521,7 +520,7 @@ void IntegerMatcher::Match(INT_CLASS ClassTemplate,
tables->UpdateSumOfProtoEvidences(ClassTemplate, ConfigMask, NumFeatures);
tables->NormalizeSums(ClassTemplate, NumFeatures, NumFeatures);
BestMatch = FindBestMatch(ClassTemplate, *tables, Result);
FindBestMatch(ClassTemplate, *tables, Result);
#ifndef GRAPHICS_DISABLED
if (PrintMatchSummaryOn(Debug))
@ -847,9 +846,9 @@ int IntegerMatcher::UpdateTablesForFeature(
M3 = ~M3;
A3 >>= mult_trunc_shift_bits_;
M3 >>= mult_trunc_shift_bits_;
if (A3 > evidence_mult_mask_)
if ((unsigned)A3 > evidence_mult_mask_)
A3 = evidence_mult_mask_;
if (M3 > evidence_mult_mask_)
if ((unsigned)M3 > evidence_mult_mask_)
M3 = evidence_mult_mask_;
A4 = (A3 * A3) + (M3 * M3);