Merge from trunk to version ed52f4f469 "Updated make-app-bundle script to use new template for file name"
This commit is contained in:
@@ -159,29 +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);
|
||||
if (skip==1) {
|
||||
parent->ipf.impulsedenoise (labnCrop);
|
||||
parent->ipf.lumadenoise (labnCrop, cbuffer);
|
||||
//parent->ipf.sharpening (labnCrop, (unsigned short**)cbuffer);
|
||||
parent->ipf.waveletEqualizer(labnCrop, true, false);
|
||||
}
|
||||
}
|
||||
|
||||
// apply color operations
|
||||
if (todo & M_COLOR) {
|
||||
parent->ipf.colorCurve (laboCrop, labnCrop);
|
||||
if (skip==1) {
|
||||
parent->ipf.colordenoise (labnCrop, cbuffer);
|
||||
parent->ipf.dirpyrdenoise (labnCrop);
|
||||
parent->ipf.sharpening (labnCrop, (unsigned short**)cbuffer);
|
||||
parent->ipf.waveletEqualizer(labnCrop, false, true);
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
// apply luminance operations
|
||||
if (todo & (M_LUMINANCE+M_COLOR)) {
|
||||
@@ -195,8 +173,8 @@ void Crop::update (int todo, bool internal) {
|
||||
parent->ipf.dirpyrdenoise (labnCrop);
|
||||
parent->ipf.sharpening (labnCrop, (unsigned short**)cbuffer);
|
||||
//parent->ipf.impulsedenoise (labnCrop);
|
||||
parent->ipf.dirpyrequalizer (labnCrop);
|
||||
parent->ipf.waveletEqualizer(labnCrop, true, true);
|
||||
//parent->ipf.waveletEqualizer(labnCrop, false, true);
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user