diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index de4415553..4d29a82d0 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -159,7 +159,7 @@ void Crop::update (int todo, bool internal) { // shadows & highlights & tone curve & convert to cielab if (todo & M_RGBCURVE) parent->ipf.rgbProc (baseCrop, laboCrop, parent->tonecurve, cshmap); - +/* // apply luminance operations if (todo & M_LUMINANCE) { parent->ipf.luminanceCurve (laboCrop, labnCrop, parent->lumacurve, 0, croph); @@ -181,24 +181,25 @@ void Crop::update (int todo, bool internal) { parent->ipf.waveletEqualizer(labnCrop, false, true); } } - +*/ // apply luminance operations - /*if (todo & M_LUMINANCE) { + if (todo & (M_LUMINANCE+M_COLOR)) { parent->ipf.luminanceCurve (laboCrop, labnCrop, parent->lumacurve, 0, croph); + parent->ipf.colorCurve (laboCrop, labnCrop); + if (skip==1) { parent->ipf.impulsedenoise (labnCrop); parent->ipf.lumadenoise (labnCrop, cbuffer); parent->ipf.colordenoise (labnCrop, cbuffer); parent->ipf.dirpyrdenoise (labnCrop); parent->ipf.sharpening (labnCrop, (unsigned short**)cbuffer); - parent->ipf.impulsedenoise (labnCrop); - parent->ipf.waveletEqualizer(labnCrop, true, false); - parent->ipf.waveletEqualizer(labnCrop, false, true); + //parent->ipf.impulsedenoise (labnCrop); + parent->ipf.waveletEqualizer(labnCrop, true, true); + //parent->ipf.waveletEqualizer(labnCrop, false, true); } - parent->ipf.colorCurve (labnCrop, labnCrop); - }*/ + } // switch back to rgb diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 457076d7c..ba78140fc 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -157,7 +157,7 @@ void ImProcCoordinator::updatePreviewImage (int todo) { if (todo & M_LUMACURVE) CurveFactory::complexCurve (0.0, 0.0, 0.0, 0.0, params.lumaCurve.brightness, params.lumaCurve.contrast, 0.0, 0.0, false, params.lumaCurve.curve, lhist16, lumacurve, bcLhist, scale==1 ? 1 : 16); - +/* if (todo & M_LUMINANCE) { progress ("Applying Luminance Curve...",100*readyphase/numofphases); ipf.luminanceCurve (oprevl, nprevl, lumacurve, 0, pH); @@ -201,13 +201,16 @@ void ImProcCoordinator::updatePreviewImage (int todo) { } readyphase++; } +*/ - - /*if (todo & M_LUMINANCE ) { + if (todo & (M_LUMINANCE+M_COLOR) ) { progress ("Applying Luminance Curve...",100*readyphase/numofphases); ipf.luminanceCurve (oprevl, nprevl, lumacurve, 0, pH); + readyphase++; + progress ("Applying Color Boost...",100*readyphase/numofphases); + ipf.colorCurve (oprevl, nprevl); readyphase++; if (scale==1) { progress ("Denoising luminance impulse...",100*readyphase/numofphases); @@ -230,24 +233,22 @@ void ImProcCoordinator::updatePreviewImage (int todo) { progress ("Sharpening...",100*readyphase/numofphases); ipf.sharpening (nprevl, (unsigned short**)buffer); } + readyphase++; //if (scale==1) { // progress ("Denoising luminance impulse...",100*readyphase/numofphases); // ipf.impulsedenoise (nprevl); //} if (scale==1) { progress ("Wavelet...",100*readyphase/numofphases); - ipf.waveletEqualizer (nprevl, true, false); + ipf.waveletEqualizer (nprevl, true, true); } - if (scale==1) { - progress ("Wavelet...",100*readyphase/numofphases); - ipf.waveletEqualizer (nprevl, false, true); - } - readyphase++; + //if (scale==1) { + // progress ("Wavelet...",100*readyphase/numofphases); + // ipf.waveletEqualizer (nprevl, false, true); + //} - progress ("Applying Color Boost...",100*readyphase/numofphases); - ipf.colorCurve (nprevl, nprevl); - readyphase++; - }*/ + + } // process crop, if needed for (int i=0; i