Merge pull request #4401 from Beep6581/gcc8-warnings

Fix GCC 8 warnings
This commit is contained in:
Floessie
2018-02-15 20:54:43 +01:00
committed by GitHub
9 changed files with 29 additions and 21 deletions

View File

@@ -2458,7 +2458,7 @@ void ImProcFunctions::finalContAllL (float ** WavCoeffs_L, float * WavCoeffs_L0,
}
}
int choicelevel = atoi(params->wavelet.Lmethod.data()) - 1;
int choicelevel = params->wavelet.Lmethod - 1;
choicelevel = choicelevel == -1 ? 4 : choicelevel;
int choiceClevel = 0;
@@ -3271,7 +3271,7 @@ void ImProcFunctions::ContAllL (float *koeLi[12], float *maxkoeLi, bool lipschit
}
// to see each level of wavelet ...level from 0 to 8
int choicelevel = atoi(params->wavelet.Lmethod.data()) - 1;
int choicelevel = params->wavelet.Lmethod - 1;
choicelevel = choicelevel == -1 ? 4 : choicelevel;
}
@@ -3529,7 +3529,7 @@ void ImProcFunctions::ContAllAB (LabImage * labco, int maxlvl, float ** varhue,
}
// to see each level of wavelet ...level from 0 to 8
int choicelevel = atoi(params->wavelet.Lmethod.data()) - 1;
int choicelevel = params->wavelet.Lmethod - 1;
choicelevel = choicelevel == -1 ? 4 : choicelevel;
int choiceClevel = 0;