Merge from DEFAULT f1e80d00c3099a65283f143268318e504ce6ea85
see comments in issue 1052, comment 439
This commit is contained in:
@@ -63,9 +63,6 @@ void Crop::update (int todo) {
|
||||
|
||||
ProcParams& params = parent->params;
|
||||
|
||||
|
||||
parent->ipf.setScale (skip);
|
||||
|
||||
// give possibility to the listener to modify crop window (as the full image dimensions are already known at this point)
|
||||
int wx, wy, ww, wh, ws;
|
||||
bool overrideWindow = false;
|
||||
@@ -82,6 +79,9 @@ void Crop::update (int todo) {
|
||||
if (needsinitupdate || (todo & M_HIGHQUAL))
|
||||
todo = ALL;
|
||||
|
||||
// set improcfuncions' scale now that skip has been updated
|
||||
parent->ipf.setScale (skip);
|
||||
|
||||
baseCrop = origCrop;
|
||||
|
||||
bool needstransform = parent->ipf.needsTransform();
|
||||
@@ -175,8 +175,13 @@ void Crop::update (int todo) {
|
||||
|
||||
parent->ipf.EPDToneMap(labnCrop, 5, 1); //Go with much fewer than normal iterates for fast redisplay.
|
||||
|
||||
parent->ipf.luminanceCurve (labnCrop, labnCrop, parent->lumacurve);
|
||||
parent->ipf.chrominanceCurve (labnCrop, labnCrop, parent->chroma_acurve, parent->chroma_bcurve, parent->satcurve);
|
||||
// parent->ipf.luminanceCurve (labnCrop, labnCrop, parent->lumacurve);
|
||||
bool utili=false;
|
||||
bool autili=false;
|
||||
bool butili=false;
|
||||
bool ccutili=false;
|
||||
|
||||
parent->ipf.chromiLuminanceCurve (labnCrop, labnCrop, parent->chroma_acurve, parent->chroma_bcurve, parent->satcurve,/*parent->satbgcurve,*/ parent->lumacurve, utili, autili, butili, ccutili);
|
||||
//parent->ipf.colorCurve (labnCrop, labnCrop);
|
||||
parent->ipf.vibrance (labnCrop);
|
||||
|
||||
|
Reference in New Issue
Block a user