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

Fixed an endless loop when using camconst entry without white level, no Issue

Browse Source
This commit is contained in:
Ingo
2015-05-23 13:43:58 +02:00
parent 161e647ee1
commit caf7e1b2bd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/rawimage.cc
View File

@@ -455,7 +455,7 @@ int RawImage::loadRaw (bool loadData, bool closeFile, ProgressListener *plistene
// load 4 channel white level here, will be used if available // load 4 channel white level here, will be used if available
if (RT_whitelevel_from_constant) { if (RT_whitelevel_from_constant) {
maximum_c4[i] = cc->get_WhiteLevel(i, iso_speed, aperture); maximum_c4[i] = cc->get_WhiteLevel(i, iso_speed, aperture);
if(tiff_bps > 0 && !isFoveon()) { if(tiff_bps > 0 && maximum_c4[i] > 0 && !isFoveon()) {
unsigned compare = ((uint64_t)1 << tiff_bps) - 1; // use uint64_t to avoid overflow if tiff_bps == 32 unsigned compare = ((uint64_t)1 << tiff_bps) - 1; // use uint64_t to avoid overflow if tiff_bps == 32
while(maximum_c4[i] > compare) while(maximum_c4[i] > compare)
maximum_c4[i] >>= 1; maximum_c4[i] >>= 1;