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

Make the behaviour of manually-set scale the same as auto-fill scale

Browse Source
This commit is contained in:
Alexander Brock 2024-09-12 21:26:32 +02:00
parent 53a64a9235
commit d9886b7b5c
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/iptransform.cc
View File

@ -454,7 +454,7 @@ bool ImProcFunctions::transCoord (int W, int H, const std::vector<Coord2D> &src,
double cost = cos (params->rotate.degree * rtengine::RT_PI / 180.0); double cost = cos (params->rotate.degree * rtengine::RT_PI / 180.0);
double sint = sin (params->rotate.degree * rtengine::RT_PI / 180.0); double sint = sin (params->rotate.degree * rtengine::RT_PI / 180.0);
double ascale = ascaleDef > 0 ? ascaleDef : (params->commonTrans.autofill && params->perspective.render ? getTransformAutoFill (oW, oH, pLCPMap) : 1.0); double ascale = ascaleDef > 0 ? ascaleDef : (params->commonTrans.autofill && params->perspective.render ? getTransformAutoFill (oW, oH, pLCPMap) : 1.0 / params->commonTrans.getScale());
// auxiliary variables for perspective correction // auxiliary variables for perspective correction
// Simple. // Simple.
@ -518,8 +518,6 @@ bool ImProcFunctions::transCoord (int W, int H, const std::vector<Coord2D> &src,
break; break;
} }
x_d /= params->commonTrans.getScale();
y_d /= params->commonTrans.getScale();
if (params->distortion.defish) { if (params->distortion.defish) {
x_d /= f_defish; x_d /= f_defish;
y_d /= f_defish; y_d /= f_defish;
@ -1194,7 +1192,7 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
p_projection_rotate, p_projection_shift_horiz, p_projection_rotate, p_projection_shift_horiz,
p_projection_shift_vert, p_projection_scale); p_projection_shift_vert, p_projection_scale);
const double ascale = params->commonTrans.autofill && params->perspective.render ? getTransformAutoFill(oW, oH, pLCPMap) : 1.0; const double ascale = params->commonTrans.autofill && params->perspective.render ? getTransformAutoFill(oW, oH, pLCPMap) : 1.0 / params->commonTrans.getScale();
const bool darkening = (params->vignetting.amount <= 0.0); const bool darkening = (params->vignetting.amount <= 0.0);
const bool useLog = params->commonTrans.method == "log" && highQuality; const bool useLog = params->commonTrans.method == "log" && highQuality;
@ -1252,8 +1250,6 @@ void ImProcFunctions::transformGeneral(bool highQuality, Imagefloat *original, I
break; break;
} }
x_d /= params->commonTrans.getScale();
y_d /= params->commonTrans.getScale();
if (params->distortion.defish) { if (params->distortion.defish) {
x_d /= f_defish; x_d /= f_defish;
y_d /= f_defish; y_d /= f_defish;