Pushing the Resize patch from Default to Branch3, adding new HISTORY_MSG_ strings and correcting a small bug in the LAB/saturation limiter tool
This commit is contained in:
Hombre
@@ -28,138 +28,139 @@ ParamsEdited::ParamsEdited () {
|
||||
|
||||
void ParamsEdited::set (bool v) {
|
||||
|
||||
toneCurve.curve = v;
|
||||
toneCurve.brightness = v;
|
||||
toneCurve.black = v;
|
||||
toneCurve.contrast = v;
|
||||
toneCurve.saturation = v;
|
||||
toneCurve.shcompr = v;
|
||||
toneCurve.hlcompr = v;
|
||||
toneCurve.hlcomprthresh = v;
|
||||
toneCurve.autoexp = v;
|
||||
toneCurve.clip = v;
|
||||
toneCurve.expcomp = v;
|
||||
labCurve.lcurve = v;
|
||||
labCurve.acurve = v;
|
||||
labCurve.bcurve = v;
|
||||
labCurve.brightness = v;
|
||||
labCurve.contrast = v;
|
||||
labCurve.saturation = v;
|
||||
labCurve.avoidclip = v;
|
||||
labCurve.enable_saturationlimiter = v;
|
||||
labCurve.saturationlimit = v;
|
||||
sharpening.enabled = v;
|
||||
sharpening.radius = v;
|
||||
sharpening.amount = v;
|
||||
sharpening.threshold = v;
|
||||
sharpening.edgesonly = v;
|
||||
sharpening.edges_radius = v;
|
||||
sharpening.edges_tolerance = v;
|
||||
sharpening.halocontrol = v;
|
||||
sharpening.halocontrol_amount= v;
|
||||
sharpening.method = v;
|
||||
sharpening.deconvamount = v;
|
||||
sharpening.deconvradius = v;
|
||||
sharpening.deconviter = v;
|
||||
sharpening.deconvdamping = v;
|
||||
colorBoost.amount = v;
|
||||
colorBoost.avoidclip = v;
|
||||
colorBoost.enable_saturationlimiter = v;
|
||||
colorBoost.saturationlimit = v;
|
||||
wb.method = v;
|
||||
wb.green = v;
|
||||
wb.temperature = v;
|
||||
colorShift.a = v;
|
||||
colorShift.b = v;
|
||||
lumaDenoise.enabled = v;
|
||||
lumaDenoise.radius = v;
|
||||
lumaDenoise.edgetolerance = v;
|
||||
colorDenoise.enabled = v;
|
||||
colorDenoise.amount = v;
|
||||
defringe.enabled = v;
|
||||
defringe.radius = v;
|
||||
defringe.threshold = v;
|
||||
impulseDenoise.enabled = v;
|
||||
impulseDenoise.thresh = v;
|
||||
dirpyrDenoise.enabled = v;
|
||||
dirpyrDenoise.luma = v;
|
||||
toneCurve.curve = v;
|
||||
toneCurve.brightness = v;
|
||||
toneCurve.black = v;
|
||||
toneCurve.contrast = v;
|
||||
toneCurve.saturation = v;
|
||||
toneCurve.shcompr = v;
|
||||
toneCurve.hlcompr = v;
|
||||
toneCurve.hlcomprthresh = v;
|
||||
toneCurve.autoexp = v;
|
||||
toneCurve.clip = v;
|
||||
toneCurve.expcomp = v;
|
||||
labCurve.lcurve = v;
|
||||
labCurve.acurve = v;
|
||||
labCurve.bcurve = v;
|
||||
labCurve.brightness = v;
|
||||
labCurve.contrast = v;
|
||||
labCurve.saturation = v;
|
||||
labCurve.avoidclip = v;
|
||||
labCurve.enable_saturationlimiter = v;
|
||||
labCurve.saturationlimit = v;
|
||||
sharpening.enabled = v;
|
||||
sharpening.radius = v;
|
||||
sharpening.amount = v;
|
||||
sharpening.threshold = v;
|
||||
sharpening.edgesonly = v;
|
||||
sharpening.edges_radius = v;
|
||||
sharpening.edges_tolerance = v;
|
||||
sharpening.halocontrol = v;
|
||||
sharpening.halocontrol_amount= v;
|
||||
sharpening.method = v;
|
||||
sharpening.deconvamount = v;
|
||||
sharpening.deconvradius = v;
|
||||
sharpening.deconviter = v;
|
||||
sharpening.deconvdamping = v;
|
||||
colorBoost.amount = v;
|
||||
colorBoost.avoidclip = v;
|
||||
colorBoost.enable_saturationlimiter = v;
|
||||
colorBoost.saturationlimit = v;
|
||||
wb.method = v;
|
||||
wb.green = v;
|
||||
wb.temperature = v;
|
||||
colorShift.a = v;
|
||||
colorShift.b = v;
|
||||
lumaDenoise.enabled = v;
|
||||
lumaDenoise.radius = v;
|
||||
lumaDenoise.edgetolerance = v;
|
||||
colorDenoise.enabled = v;
|
||||
colorDenoise.amount = v;
|
||||
defringe.enabled = v;
|
||||
defringe.radius = v;
|
||||
defringe.threshold = v;
|
||||
impulseDenoise.enabled = v;
|
||||
impulseDenoise.thresh = v;
|
||||
dirpyrDenoise.enabled = v;
|
||||
dirpyrDenoise.luma = v;
|
||||
dirpyrDenoise.chroma = v;
|
||||
dirpyrDenoise.gamma = v;
|
||||
sh.enabled = v;
|
||||
sh.hq = v;
|
||||
sh.highlights = v;
|
||||
sh.htonalwidth = v;
|
||||
sh.shadows = v;
|
||||
sh.stonalwidth = v;
|
||||
sh.localcontrast = v;
|
||||
sh.radius = v;
|
||||
crop.enabled = v;
|
||||
crop.x = v;
|
||||
crop.y = v;
|
||||
crop.w = v;
|
||||
crop.h = v;
|
||||
crop.fixratio = v;
|
||||
crop.ratio = v;
|
||||
crop.orientation = v;
|
||||
crop.guide = v;
|
||||
coarse.rotate = v;
|
||||
coarse.hflip = v;
|
||||
coarse.vflip = v;
|
||||
commonTrans.autofill = v;
|
||||
rotate.degree = v;
|
||||
distortion.uselensfun = v;
|
||||
distortion.amount = v;
|
||||
perspective.horizontal = v;
|
||||
perspective.vertical = v;
|
||||
cacorrection.red = v;
|
||||
cacorrection.blue = v;
|
||||
vignetting.amount = v;
|
||||
vignetting.radius = v;
|
||||
vignetting.strength = v;
|
||||
vignetting.centerX = v;
|
||||
vignetting.centerY = v;
|
||||
chmixer.red[0] = v;
|
||||
chmixer.red[1] = v;
|
||||
chmixer.red[2] = v;
|
||||
chmixer.green[0] = v;
|
||||
chmixer.green[1] = v;
|
||||
chmixer.green[2] = v;
|
||||
chmixer.blue[0] = v;
|
||||
chmixer.blue[1] = v;
|
||||
chmixer.blue[2] = v;
|
||||
hlrecovery.enabled = v;
|
||||
hlrecovery.method = v;
|
||||
resize.scale = v;
|
||||
resize.method = v;
|
||||
resize.dataspec = v;
|
||||
resize.width = v;
|
||||
resize.height = v;
|
||||
resize.enabled = v;
|
||||
icm.input = v;
|
||||
icm.gammaOnInput = v;
|
||||
icm.working = v;
|
||||
icm.output = v;
|
||||
raw.ccSteps = v;
|
||||
raw.dmethod = v;
|
||||
raw.dcbIterations = v;
|
||||
raw.dcbEnhance = v;
|
||||
raw.dfAuto = v;
|
||||
raw.caCorrection = v;
|
||||
raw.hotDeadPixel = v;
|
||||
raw.caBlue = v;
|
||||
raw.caRed = v;
|
||||
raw.darkFrame = v;
|
||||
raw.exPos = v;
|
||||
raw.exCorrection = v;
|
||||
raw.exPreser = v;
|
||||
raw.greenEq = v;
|
||||
raw.linenoise = v;
|
||||
equalizer.enabled = v;
|
||||
dirpyrequalizer.enabled = v;
|
||||
hsvequalizer.enabled = v;
|
||||
for(int i = 0; i < 8; i++) {
|
||||
equalizer.c[i] = v;
|
||||
}
|
||||
sh.enabled = v;
|
||||
sh.hq = v;
|
||||
sh.highlights = v;
|
||||
sh.htonalwidth = v;
|
||||
sh.shadows = v;
|
||||
sh.stonalwidth = v;
|
||||
sh.localcontrast = v;
|
||||
sh.radius = v;
|
||||
crop.enabled = v;
|
||||
crop.x = v;
|
||||
crop.y = v;
|
||||
crop.w = v;
|
||||
crop.h = v;
|
||||
crop.fixratio = v;
|
||||
crop.ratio = v;
|
||||
crop.orientation = v;
|
||||
crop.guide = v;
|
||||
coarse.rotate = v;
|
||||
coarse.hflip = v;
|
||||
coarse.vflip = v;
|
||||
commonTrans.autofill = v;
|
||||
rotate.degree = v;
|
||||
distortion.uselensfun = v;
|
||||
distortion.amount = v;
|
||||
perspective.horizontal = v;
|
||||
perspective.vertical = v;
|
||||
cacorrection.red = v;
|
||||
cacorrection.blue = v;
|
||||
vignetting.amount = v;
|
||||
vignetting.radius = v;
|
||||
vignetting.strength = v;
|
||||
vignetting.centerX = v;
|
||||
vignetting.centerY = v;
|
||||
chmixer.red[0] = v;
|
||||
chmixer.red[1] = v;
|
||||
chmixer.red[2] = v;
|
||||
chmixer.green[0] = v;
|
||||
chmixer.green[1] = v;
|
||||
chmixer.green[2] = v;
|
||||
chmixer.blue[0] = v;
|
||||
chmixer.blue[1] = v;
|
||||
chmixer.blue[2] = v;
|
||||
hlrecovery.enabled = v;
|
||||
hlrecovery.method = v;
|
||||
resize.scale = v;
|
||||
resize.appliesTo = v;
|
||||
resize.method = v;
|
||||
resize.dataspec = v;
|
||||
resize.width = v;
|
||||
resize.height = v;
|
||||
resize.enabled = v;
|
||||
icm.input = v;
|
||||
icm.gammaOnInput = v;
|
||||
icm.working = v;
|
||||
icm.output = v;
|
||||
raw.ccSteps = v;
|
||||
raw.dmethod = v;
|
||||
raw.dcbIterations = v;
|
||||
raw.dcbEnhance = v;
|
||||
raw.dfAuto = v;
|
||||
raw.caCorrection = v;
|
||||
raw.hotDeadPixel = v;
|
||||
raw.caBlue = v;
|
||||
raw.caRed = v;
|
||||
raw.darkFrame = v;
|
||||
raw.exPos = v;
|
||||
raw.exCorrection = v;
|
||||
raw.exPreser = v;
|
||||
raw.greenEq = v;
|
||||
raw.linenoise = v;
|
||||
equalizer.enabled = v;
|
||||
dirpyrequalizer.enabled = v;
|
||||
hsvequalizer.enabled = v;
|
||||
for(int i = 0; i < 8; i++) {
|
||||
equalizer.c[i] = v;
|
||||
}
|
||||
for(int i = 0; i < 5; i++) {
|
||||
dirpyrequalizer.mult[i] = v;
|
||||
}
|
||||
@@ -168,8 +169,8 @@ void ParamsEdited::set (bool v) {
|
||||
hsvequalizer.val[i] = v;
|
||||
hsvequalizer.hue[i] = v;
|
||||
}
|
||||
exif.clear ();
|
||||
iptc.clear ();
|
||||
exif.clear ();
|
||||
iptc.clear ();
|
||||
}
|
||||
|
||||
using namespace rtengine;
|
||||
@@ -188,23 +189,23 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
|
||||
toneCurve.brightness = toneCurve.brightness && p.toneCurve.brightness == other.toneCurve.brightness;
|
||||
toneCurve.black = toneCurve.black && p.toneCurve.black == other.toneCurve.black;
|
||||
toneCurve.contrast = toneCurve.contrast && p.toneCurve.contrast == other.toneCurve.contrast;
|
||||
toneCurve.saturation = toneCurve.saturation && p.toneCurve.saturation == other.toneCurve.saturation;
|
||||
toneCurve.shcompr = toneCurve.shcompr && p.toneCurve.shcompr == other.toneCurve.shcompr;
|
||||
toneCurve.saturation = toneCurve.saturation && p.toneCurve.saturation == other.toneCurve.saturation;
|
||||
toneCurve.shcompr = toneCurve.shcompr && p.toneCurve.shcompr == other.toneCurve.shcompr;
|
||||
toneCurve.hlcompr = toneCurve.hlcompr && p.toneCurve.hlcompr == other.toneCurve.hlcompr;
|
||||
toneCurve.hlcomprthresh = toneCurve.hlcomprthresh && p.toneCurve.hlcomprthresh == other.toneCurve.hlcomprthresh;
|
||||
toneCurve.autoexp = toneCurve.autoexp && p.toneCurve.autoexp == other.toneCurve.autoexp;
|
||||
toneCurve.clip = toneCurve.clip && p.toneCurve.clip == other.toneCurve.clip;
|
||||
toneCurve.expcomp = toneCurve.expcomp && p.toneCurve.expcomp == other.toneCurve.expcomp;
|
||||
labCurve.lcurve = labCurve.lcurve && p.labCurve.lcurve == other.labCurve.lcurve;
|
||||
labCurve.acurve = labCurve.acurve && p.labCurve.acurve == other.labCurve.acurve;
|
||||
labCurve.acurve = labCurve.acurve && p.labCurve.acurve == other.labCurve.acurve;
|
||||
labCurve.bcurve = labCurve.bcurve && p.labCurve.bcurve == other.labCurve.bcurve;
|
||||
labCurve.brightness = labCurve.brightness && p.labCurve.brightness == other.labCurve.brightness;
|
||||
labCurve.contrast = labCurve.contrast && p.labCurve.contrast == other.labCurve.contrast;
|
||||
labCurve.saturation = labCurve.saturation && p.labCurve.saturation == other.labCurve.saturation;
|
||||
labCurve.saturation = labCurve.saturation && p.labCurve.saturation == other.labCurve.saturation;
|
||||
labCurve.avoidclip = labCurve.avoidclip && p.labCurve.avoidclip == other.labCurve.avoidclip;
|
||||
labCurve.enable_saturationlimiter = labCurve.enable_saturationlimiter && p.labCurve.enable_saturationlimiter == other.labCurve.enable_saturationlimiter;
|
||||
labCurve.saturationlimit = labCurve.saturationlimit && p.labCurve.saturationlimit == other.labCurve.saturationlimit;
|
||||
sharpening.enabled = sharpening.enabled && p.sharpening.enabled == other.sharpening.enabled;
|
||||
sharpening.enabled = sharpening.enabled && p.sharpening.enabled == other.sharpening.enabled;
|
||||
sharpening.radius = sharpening.radius && p.sharpening.radius == other.sharpening.radius;
|
||||
sharpening.amount = sharpening.amount && p.sharpening.amount == other.sharpening.amount;
|
||||
sharpening.threshold = sharpening.threshold && p.sharpening.threshold == other.sharpening.threshold;
|
||||
@@ -232,17 +233,17 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
|
||||
lumaDenoise.edgetolerance = lumaDenoise.edgetolerance && p.lumaDenoise.edgetolerance == other.lumaDenoise.edgetolerance;
|
||||
colorDenoise.enabled = colorDenoise.enabled && p.colorDenoise.enabled == other.colorDenoise.enabled;
|
||||
colorDenoise.amount = colorDenoise.amount && p.colorDenoise.amount == other.colorDenoise.amount;
|
||||
defringe.enabled = defringe.enabled && p.defringe.enabled == other.defringe.enabled;
|
||||
defringe.enabled = defringe.enabled && p.defringe.enabled == other.defringe.enabled;
|
||||
defringe.radius = defringe.radius && p.defringe.radius == other.defringe.radius;
|
||||
defringe.threshold = defringe.threshold && p.defringe.threshold == other.defringe.threshold;
|
||||
|
||||
impulseDenoise.enabled = impulseDenoise.enabled && p.impulseDenoise.enabled == other.impulseDenoise.enabled;
|
||||
impulseDenoise.thresh = impulseDenoise.thresh && p.impulseDenoise.thresh == other.impulseDenoise.thresh;
|
||||
impulseDenoise.enabled = impulseDenoise.enabled && p.impulseDenoise.enabled == other.impulseDenoise.enabled;
|
||||
impulseDenoise.thresh = impulseDenoise.thresh && p.impulseDenoise.thresh == other.impulseDenoise.thresh;
|
||||
|
||||
dirpyrDenoise.enabled = dirpyrDenoise.enabled && p.dirpyrDenoise.enabled == other.dirpyrDenoise.enabled;
|
||||
dirpyrDenoise.enabled = dirpyrDenoise.enabled && p.dirpyrDenoise.enabled == other.dirpyrDenoise.enabled;
|
||||
dirpyrDenoise.luma = dirpyrDenoise.luma && p.dirpyrDenoise.luma == other.dirpyrDenoise.luma;
|
||||
dirpyrDenoise.chroma = dirpyrDenoise.chroma && p.dirpyrDenoise.chroma == other.dirpyrDenoise.chroma;
|
||||
dirpyrDenoise.gamma = dirpyrDenoise.gamma && p.dirpyrDenoise.gamma == other.dirpyrDenoise.gamma;
|
||||
dirpyrDenoise.gamma = dirpyrDenoise.gamma && p.dirpyrDenoise.gamma == other.dirpyrDenoise.gamma;
|
||||
|
||||
sh.enabled = sh.enabled && p.sh.enabled == other.sh.enabled;
|
||||
sh.hq = sh.hq && p.sh.hq == other.sh.hq;
|
||||
@@ -289,6 +290,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
|
||||
hlrecovery.enabled = hlrecovery.enabled && p.hlrecovery.enabled == other.hlrecovery.enabled;
|
||||
hlrecovery.method = hlrecovery.method && p.hlrecovery.method == other.hlrecovery.method;
|
||||
resize.scale = resize.scale && p.resize.scale == other.resize.scale;
|
||||
resize.appliesTo = resize.appliesTo && p.resize.appliesTo == other.resize.appliesTo;
|
||||
resize.method = resize.method && p.resize.method == other.resize.method;
|
||||
resize.dataspec = resize.dataspec && p.resize.dataspec == other.resize.dataspec;
|
||||
resize.width = resize.width && p.resize.width == other.resize.width;
|
||||
@@ -317,14 +319,14 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
|
||||
for(int i = 0; i < 8; i++) {
|
||||
equalizer.c[i] = equalizer.c[i] && p.equalizer.c[i] == other.equalizer.c[i];
|
||||
}
|
||||
dirpyrequalizer.enabled = dirpyrequalizer.enabled && p.dirpyrequalizer.enabled == other.dirpyrequalizer.enabled;
|
||||
dirpyrequalizer.enabled = dirpyrequalizer.enabled && p.dirpyrequalizer.enabled == other.dirpyrequalizer.enabled;
|
||||
for(int i = 0; i < 8; i++) {
|
||||
dirpyrequalizer.mult[i] = dirpyrequalizer.mult[i] && p.dirpyrequalizer.mult[i] == other.dirpyrequalizer.mult[i];
|
||||
}
|
||||
hsvequalizer.enabled = hsvequalizer.enabled && p.hsvequalizer.enabled == other.hsvequalizer.enabled;
|
||||
hsvequalizer.enabled = hsvequalizer.enabled && p.hsvequalizer.enabled == other.hsvequalizer.enabled;
|
||||
for(int i = 0; i < 8; i++) {
|
||||
hsvequalizer.sat[i] = hsvequalizer.sat[i] && p.hsvequalizer.sat[i] == other.hsvequalizer.sat[i];
|
||||
hsvequalizer.val[i] = hsvequalizer.val[i] && p.hsvequalizer.val[i] == other.hsvequalizer.val[i];
|
||||
hsvequalizer.val[i] = hsvequalizer.val[i] && p.hsvequalizer.val[i] == other.hsvequalizer.val[i];
|
||||
hsvequalizer.hue[i] = hsvequalizer.hue[i] && p.hsvequalizer.hue[i] == other.hsvequalizer.hue[i];
|
||||
}
|
||||
// exif = exif && p.exif==other.exif
|
||||
@@ -440,6 +442,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
|
||||
if (hlrecovery.enabled) toEdit.hlrecovery.enabled = mods.hlrecovery.enabled;
|
||||
if (hlrecovery.method) toEdit.hlrecovery.method = mods.hlrecovery.method;
|
||||
if (resize.scale) toEdit.resize.scale = mods.resize.scale;
|
||||
if (resize.appliesTo) toEdit.resize.appliesTo = mods.resize.appliesTo;
|
||||
if (resize.method) toEdit.resize.method = mods.resize.method;
|
||||
if (resize.dataspec) toEdit.resize.dataspec = mods.resize.dataspec;
|
||||
if (resize.width) toEdit.resize.width = mods.resize.width;
|
||||
|
||||
Reference in New Issue
Block a user