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

Whitespace corrections

Browse Source
This commit is contained in:
Flössie 2019-12-06 09:28:34 +01:00
parent 03c094a42b
commit b0e52b3202
1 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtengine/canon_cr3_decoder.cc
View File

@ -87,13 +87,13 @@ void DCraw::selectCRXTrack(unsigned short maxTrack)
for (unsigned int i = 0; i <= maxTrack && i < RT_canon_CR3_data.CRXTRACKS_MAXCOUNT; ++i) { for (unsigned int i = 0; i <= maxTrack && i < RT_canon_CR3_data.CRXTRACKS_MAXCOUNT; ++i) {
CanonCR3Data::crx_data_header_t* const d = &RT_canon_CR3_data.crx_header[i]; CanonCR3Data::crx_data_header_t* const d = &RT_canon_CR3_data.crx_header[i];
if (d->MediaType == 1) {// RAW if (d->MediaType == 1) { // RAW
bitcounts[i] = std::int64_t(d->nBits) * std::int64_t(d->f_width) * std::int64_t(d->f_height); bitcounts[i] = std::int64_t(d->nBits) * std::int64_t(d->f_width) * std::int64_t(d->f_height);
if (bitcounts[i] > maxbitcount) { if (bitcounts[i] > maxbitcount) {
maxbitcount = bitcounts[i]; maxbitcount = bitcounts[i];
} }
} else if (d->MediaType == 2) {// JPEG } else if (d->MediaType == 2) { // JPEG
if (d->MediaSize > maxjpegbytes) { if (d->MediaSize > maxjpegbytes) {
maxjpegbytes = d->MediaSize; maxjpegbytes = d->MediaSize;
thumb_offset = d->MediaOffset; thumb_offset = d->MediaOffset;
@ -771,7 +771,7 @@ struct CrxImage {
CrxTile* tiles; CrxTile* tiles;
std::uint64_t mdatOffset; std::uint64_t mdatOffset;
std::uint64_t mdatSize; std::uint64_t mdatSize;
std::int16_t* outBufs[4];// one per plane std::int16_t* outBufs[4]; // one per plane
std::int16_t* planeBuf; std::int16_t* planeBuf;
LibRaw_abstract_datastream* input; LibRaw_abstract_datastream* input;
}; };
@ -931,7 +931,7 @@ inline std::uint32_t crxBitstreamGetBits(CrxBitstream* bitStrm, int bits)
} while (bitsLeft < bits); } while (bitsLeft < bits);
} }
result = bitData >> (32 - bits);// 32-bits result = bitData >> (32 - bits); // 32-bits
bitStrm->bitData = bitData << bits; bitStrm->bitData = bitData << bits;
bitStrm->bitsLeft = bitsLeft - bits; bitStrm->bitsLeft = bitsLeft - bits;
return result; return result;
@ -1769,7 +1769,7 @@ bool crxDecodeLineWithIQuantization(CrxSubband* subband)
bitCode = crxBitstreamGetBits(&subband->bandParam->bitStream, subband->paramK) | (bitCode << subband->paramK); bitCode = crxBitstreamGetBits(&subband->bandParam->bitStream, subband->paramK) | (bitCode << subband->paramK);
} }
subband->quantValue += -(bitCode & 1) ^ (bitCode >> 1);// converting encoded to signed integer subband->quantValue += -(bitCode & 1) ^ (bitCode >> 1); // converting encoded to signed integer
subband->paramK = crxPredictKParameter(subband->paramK, bitCode); subband->paramK = crxPredictKParameter(subband->paramK, bitCode);
if (subband->paramK > 7) { if (subband->paramK > 7) {
@ -2961,7 +2961,7 @@ bool crxSetupImageData(
img->tiles = nullptr; img->tiles = nullptr;
img->levels = hdr->imageLevels; img->levels = hdr->imageLevels;
img->subbandCount = 3 * img->levels + 1;// 3 bands per level + one last LL img->subbandCount = 3 * img->levels + 1; // 3 bands per level + one last LL
img->nPlanes = hdr->nPlanes; img->nPlanes = hdr->nPlanes;
img->nBits = hdr->nBits; img->nBits = hdr->nBits;
img->encType = hdr->encType; img->encType = hdr->encType;