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

Fix LGTM warnings

Browse Source
This commit is contained in:
Flössie 2019-11-21 08:48:33 +01:00
parent fb01435e3f
commit d986a56c50
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/canon_cr3_decoder.cc
View File

@ -68,8 +68,7 @@ void DCraw::parse_canon_cr3()
szAtomList = ifp->size; szAtomList = ifp->size;
err = parseCR3(0ULL, szAtomList, nesting, AtomNameStack, nTrack, TrackType); err = parseCR3(0ULL, szAtomList, nesting, AtomNameStack, nTrack, TrackType);
if ((err == 0 || err == -14) && if (err == 0 || err == -14) // no error, or too deep nesting
nTrack >= 0) // no error, or too deep nesting
selectCRXTrack(nTrack); selectCRXTrack(nTrack);
} }
@ -77,8 +76,6 @@ void DCraw::parse_canon_cr3()
void DCraw::selectCRXTrack(unsigned short maxTrack) void DCraw::selectCRXTrack(unsigned short maxTrack)
{ {
if (maxTrack < 0)
return;
INT64 bitcounts[LIBRAW_CRXTRACKS_MAXCOUNT], maxbitcount = 0; INT64 bitcounts[LIBRAW_CRXTRACKS_MAXCOUNT], maxbitcount = 0;
uint32_t maxjpegbytes = 0; uint32_t maxjpegbytes = 0;
memset(bitcounts, 0, sizeof(bitcounts)); memset(bitcounts, 0, sizeof(bitcounts));
@ -117,7 +114,7 @@ void DCraw::selectCRXTrack(unsigned short maxTrack)
} }
} }
is_raw = framecnt; is_raw = framecnt;
if (has_framei && framei < LIBRAW_CRXTRACKS_MAXCOUNT) if (has_framei)
{ {
CanonCR3Data::crx_data_header_t *d = CanonCR3Data::crx_data_header_t *d =
&RT_canon_CR3_data.crx_header[framei]; &RT_canon_CR3_data.crx_header[framei];