liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cppcheck warnings

Browse Source
This commit is contained in:
Ingo Weyrich 2019-12-06 12:21:19 +01:00
parent b0e52b3202
commit 743827c7c8
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rtengine/canon_cr3_decoder.cc
View File

@ -1004,10 +1004,8 @@ bool crxDecodeLine(CrxBandParam* param)
if (param->lineBuf1[0] != param->lineBuf0[1] || param->lineBuf1[0] != param->lineBuf0[2]) { if (param->lineBuf1[0] != param->lineBuf0[1] || param->lineBuf1[0] != param->lineBuf0[2]) {
crxDecodeSymbolL1(param, true, true); crxDecodeSymbolL1(param, true, true);
} else { } else {
int nSyms = 0;
if (crxBitstreamGetBits(&param->bitStream, 1)) { if (crxBitstreamGetBits(&param->bitStream, 1)) {
nSyms = 1; int nSyms = 1;
while (crxBitstreamGetBits(&param->bitStream, 1)) { while (crxBitstreamGetBits(&param->bitStream, 1)) {
nSyms += JS[param->sParam]; nSyms += JS[param->sParam];
@ -1338,10 +1336,8 @@ bool crxDecodeTopLine(CrxBandParam* param)
if (param->lineBuf1[0]) { if (param->lineBuf1[0]) {
param->lineBuf1[1] = param->lineBuf1[0]; param->lineBuf1[1] = param->lineBuf1[0];
} else { } else {
int nSyms = 0;
if (crxBitstreamGetBits(&param->bitStream, 1)) { if (crxBitstreamGetBits(&param->bitStream, 1)) {
nSyms = 1; int nSyms = 1;
while (crxBitstreamGetBits(&param->bitStream, 1)) { while (crxBitstreamGetBits(&param->bitStream, 1)) {
nSyms += JS[param->sParam]; nSyms += JS[param->sParam];
@ -1781,7 +1777,7 @@ bool crxDecodeLineWithIQuantization(CrxSubband* subband)
return false; return false;
} }
if (subband->width <= 0) { if (subband->width == 0) {
return true; return true;
} }
@ -2039,7 +2035,6 @@ bool crxIdwt53FilterTransform(CrxPlaneComp* comp, std::uint32_t level)
std::int32_t* lineBufL0 = wavelet->lineBuf[0]; std::int32_t* lineBufL0 = wavelet->lineBuf[0];
std::int32_t* lineBufL1 = wavelet->lineBuf[1]; std::int32_t* lineBufL1 = wavelet->lineBuf[1];
const std::int32_t* lineBufL2 = wavelet->lineBuf[2];
const std::int32_t* const lineBufH0 = wavelet->lineBuf[wavelet->fltTapH + 3]; const std::int32_t* const lineBufH0 = wavelet->lineBuf[wavelet->fltTapH + 3];
std::int32_t* const lineBufH1 = wavelet->lineBuf[(wavelet->fltTapH + 1) % 5 + 3]; std::int32_t* const lineBufH1 = wavelet->lineBuf[(wavelet->fltTapH + 1) % 5 + 3];
std::int32_t* const lineBufH2 = wavelet->lineBuf[(wavelet->fltTapH + 2) % 5 + 3]; std::int32_t* const lineBufH2 = wavelet->lineBuf[(wavelet->fltTapH + 2) % 5 + 3];
@ -2110,7 +2105,7 @@ bool crxIdwt53FilterTransform(CrxPlaneComp* comp, std::uint32_t level)
// process H bands // process H bands
lineBufL0 = wavelet->lineBuf[0]; lineBufL0 = wavelet->lineBuf[0];
lineBufL1 = wavelet->lineBuf[1]; lineBufL1 = wavelet->lineBuf[1];
lineBufL2 = wavelet->lineBuf[2]; const std::int32_t* lineBufL2 = wavelet->lineBuf[2];
for (std::int32_t i = 0; i < wavelet->width; ++i) { for (std::int32_t i = 0; i < wavelet->width; ++i) {
const std::int32_t delta = lineBufL0[i] - ((lineBufL2[i] + lineBufL1[i] + 2) >> 2); const std::int32_t delta = lineBufL0[i] - ((lineBufL2[i] + lineBufL1[i] + 2) >> 2);
@ -2731,7 +2726,7 @@ bool crxReadSubbandHeaders(
} }
band->dataSize = subbandSize - (bitData & 0x7FF); band->dataSize = subbandSize - (bitData & 0x7FF);
band->supportsPartial = bitData & 0x8000 ? 1 : 0; band->supportsPartial = (bitData & 0x8000) ? 1 : 0;
band->dataOffset = subbandOffset; band->dataOffset = subbandOffset;
band->quantValue = (bitData >> 19) & 0xFF; band->quantValue = (bitData >> 19) & 0xFF;
band->paramK = 0; band->paramK = 0;