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

gamutwarning: clamp in the intermediate transform, otherwise there's no point in checking for OOG

Browse Source 
Fixes #5019
This commit is contained in:
Alberto Griggio 2018-11-27 12:09:39 +01:00
parent 4a6449b310
commit 6ba989ef1c
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/gamutwarning.cc
View File

@ -34,7 +34,7 @@ GamutWarning::GamutWarning(cmsHPROFILE iprof, cmsHPROFILE gamutprof, RenderingIn
softproof2ref(nullptr) softproof2ref(nullptr)
{ {
if (cmsIsMatrixShaper(gamutprof) && !cmsIsCLUT(gamutprof, intent, LCMS_USED_AS_OUTPUT)) { if (cmsIsMatrixShaper(gamutprof) && !cmsIsCLUT(gamutprof, intent, LCMS_USED_AS_OUTPUT)) {
cmsHPROFILE aces = ICCStore::getInstance()->getProfile("RTv4_ACES-AP0"); cmsHPROFILE aces = ICCStore::getInstance()->workingSpace("ACESp0");
if (aces) { if (aces) {
lab2ref = cmsCreateTransform(iprof, TYPE_Lab_FLT, aces, TYPE_RGB_FLT, INTENT_ABSOLUTE_COLORIMETRIC, cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE); lab2ref = cmsCreateTransform(iprof, TYPE_Lab_FLT, aces, TYPE_RGB_FLT, INTENT_ABSOLUTE_COLORIMETRIC, cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE);
lab2softproof = cmsCreateTransform(iprof, TYPE_Lab_FLT, gamutprof, TYPE_RGB_FLT, INTENT_ABSOLUTE_COLORIMETRIC, cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE); lab2softproof = cmsCreateTransform(iprof, TYPE_Lab_FLT, gamutprof, TYPE_RGB_FLT, INTENT_ABSOLUTE_COLORIMETRIC, cmsFLAGS_NOOPTIMIZE | cmsFLAGS_NOCACHE);
@ -81,6 +81,10 @@ void GamutWarning::markLine(Image8 *image, int y, float *srcbuf, float *buf1, fl
float delta_max = lab2ref ? 0.0001f : 4.9999f; float delta_max = lab2ref ? 0.0001f : 4.9999f;
cmsDoTransform(lab2softproof, srcbuf, buf2, width); cmsDoTransform(lab2softproof, srcbuf, buf2, width);
// since we are checking for out-of-gamut, we do want to clamp here!
for (int i = 0; i < width * 3; ++i) {
buf2[i] = LIM01(buf2[i]);
}
cmsDoTransform(softproof2ref, buf2, buf1, width); cmsDoTransform(softproof2ref, buf2, buf1, width);
float *proofdata = buf1; float *proofdata = buf1;