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

Fixed two crashes in DCP color engine

Browse Source 
see issue 1317
This commit is contained in:
Oliver Duis 2012-04-10 23:26:14 +02:00
parent 033755b6df
commit b9c73e3921
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rtengine/dcp.cc
View File

@ -49,6 +49,7 @@ DCPProfile::DCPProfile(Glib::ustring fname) {
// We don't mix the profiles as adobe does, since with more and more non-tungsten light // We don't mix the profiles as adobe does, since with more and more non-tungsten light
// it makes no sense. Take the daylight reference light // it makes no sense. Take the daylight reference light
Tag* tag = tagDir->getTag(TagCalibrationIlluminant2); Tag* tag = tagDir->getTag(TagCalibrationIlluminant2);
bool hasSecondHueSat = tagDir->getTag(TagProfileHueSatMapData2)!=NULL; // some profiles have two matrices but just one huesat
bool use2nd = (tag!=NULL && tag->toInt(0,SHORT)>=20 && tag->toInt(0,SHORT)<=23); bool use2nd = (tag!=NULL && tag->toInt(0,SHORT)>=20 && tag->toInt(0,SHORT)<=23);
// Color Matrix // Color Matrix
@ -72,7 +73,7 @@ DCPProfile::DCPProfile(Glib::ustring fname) {
iHueDivisions=tag->toInt(0); iSatDivisions=tag->toInt(4); iValDivisions=tag->toInt(8); iHueDivisions=tag->toInt(0); iSatDivisions=tag->toInt(4); iValDivisions=tag->toInt(8);
// Saturation maps. Need to be unwinded. // Saturation maps. Need to be unwinded.
tag = tagDir->getTag(useSimpleLookup ? TagProfileLookTableData : ( use2nd ? TagProfileHueSatMapData2 : TagProfileHueSatMapData1)); tag = tagDir->getTag(useSimpleLookup ? TagProfileLookTableData : ( use2nd && hasSecondHueSat ? TagProfileHueSatMapData2 : TagProfileHueSatMapData1));
iArrayCount = tag->getCount()/3; iArrayCount = tag->getCount()/3;
aDeltas=new HSBModify[iArrayCount]; aDeltas=new HSBModify[iArrayCount];
@ -200,10 +201,8 @@ void DCPProfile::Apply(Imagefloat *pImg, Glib::ustring workingSpace) const {
float hScaled = h * hScale; float hScaled = h * hScale;
float sScaled = s * sScale; float sScaled = s * sScale;
int hIndex0 = (int) hScaled; int hIndex0 = max((int)hScaled, 0);
int sIndex0 = (int) sScaled; int sIndex0 = max(min((int)sScaled,maxSatIndex0),0);
sIndex0 = MIN (sIndex0, maxSatIndex0);
int hIndex1 = hIndex0 + 1; int hIndex1 = hIndex0 + 1;
@ -256,11 +255,8 @@ void DCPProfile::Apply(Imagefloat *pImg, Glib::ustring workingSpace) const {
float vScaled = v * vScale; float vScaled = v * vScale;
int hIndex0 = (int) hScaled; int hIndex0 = (int) hScaled;
int sIndex0 = (int) sScaled; int sIndex0 = max(min((int)sScaled,maxSatIndex0),0);
int vIndex0 = (int) vScaled; int vIndex0 = max(min((int)vScaled,maxValIndex0),0);
sIndex0 = MIN (sIndex0, maxSatIndex0);
vIndex0 = MIN (vIndex0, maxValIndex0);
int hIndex1 = hIndex0 + 1; int hIndex1 = hIndex0 + 1;