Cppcheck: Fixed bug from last commit. Also added some new fixes

This commit is contained in:
heckflosse
2016-10-13 17:37:08 +02:00
parent 172ab63b85
commit 3625643392
13 changed files with 44 additions and 448 deletions

View File

@@ -37,6 +37,7 @@ ImProcCoordinator::ImProcCoordinator ()
highDetailPreprocessComputed(false), highDetailRawComputed(false), allocated(false),
bwAutoR(-9000.f), bwAutoG(-9000.f), bwAutoB(-9000.f), CAMMean(NAN),
ctColorCurve(),
hltonecurve(65536),
shtonecurve(65536),
tonecurve(65536, 0), //,1);
@@ -901,7 +902,7 @@ void ImProcCoordinator::setScale (int prevscale)
do {
prevscale--;
PreviewProps pp (0, 0, fw, fh, prevscale);
imgsrc->getSize (tr, pp, nW, nH);
imgsrc->getSize (pp, nW, nH);
} while(nH < 400 && prevscale > 1 && (nW * nH < 1000000) ); // sctually hardcoded values, perhaps a better choice is possible
if (settings->verbose) {