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

Preview does not match output when using BW with a* and b* toning with chromaticity -100 - issue2567

Browse Source
This commit is contained in:
jdc
2014-12-02 16:14:12 +01:00
parent 2b33acfb13
commit 3f06aca3d4
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/simpleprocess.cc
View File

@@ -1027,14 +1027,19 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
// readyImg = ipf.lab2rgb16 (labView, cx, cy, cw, ch, params.icm.output, params.blackwhite.enabled); // readyImg = ipf.lab2rgb16 (labView, cx, cy, cw, ch, params.icm.output, params.blackwhite.enabled);
bool bwonly = params.blackwhite.enabled && !params.colorToning.enabled ; bool bwonly = params.blackwhite.enabled && !params.colorToning.enabled ;
if(autili || butili ) bwonly = false;
readyImg = ipf.lab2rgb16 (labView, cx, cy, cw, ch, params.icm.output, bwonly); readyImg = ipf.lab2rgb16 (labView, cx, cy, cw, ch, params.icm.output, bwonly);
if (settings->verbose) printf("Output profile: \"%s\"\n", params.icm.output.c_str()); if (settings->verbose) printf("Output profile_: \"%s\"\n", params.icm.output.c_str());
} }
delete labView; delete labView;
labView = NULL; labView = NULL;
if(!autili && !butili ) {
if(params.blackwhite.enabled && !params.colorToning.enabled ) {//force BW r=g=b if(params.blackwhite.enabled && !params.colorToning.enabled ) {//force BW r=g=b
if (settings->verbose) printf("Force BW\n");
for (int ccw=0;ccw<cw;ccw++) { for (int ccw=0;ccw<cw;ccw++) {
for (int cch=0;cch<ch;cch++) { for (int cch=0;cch<ch;cch++) {
readyImg->r(cch,ccw)=readyImg->g(cch,ccw); readyImg->r(cch,ccw)=readyImg->g(cch,ccw);
@@ -1042,6 +1047,7 @@ IImage16* processImage (ProcessingJob* pjob, int& errorCode, ProgressListener* p
} }
} }
} }
}
if (pl) pl->setProgress (0.70); if (pl) pl->setProgress (0.70);
if (params.resize.enabled) { if (params.resize.enabled) {