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

Fix missing min frame border

Browse Source 
* Previously only considered min border if the current border is smaller
* Need to consider as long as min size is enabled
This commit is contained in:
Daniel Gao 2024-12-06 22:16:27 -05:00
parent a54aacca3f
commit f8cde10662
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/ipresize.cc
View File

@ -442,13 +442,9 @@ Dimensions Framing::computeRelativeImageBBoxInFrame(const Dimensions& imgSize,
double minBorderOther = static_cast<double>( double minBorderOther = static_cast<double>(
side == Side::WIDTH ? framing.minHeight : framing.minWidth); side == Side::WIDTH ? framing.minHeight : framing.minWidth);
if (borderOther < minBorderOther) {
maxImageOther = std::floor(frameOther - 2.0 * minBorderOther); maxImageOther = std::floor(frameOther - 2.0 * minBorderOther);
}
if (borderBasis < minBorderBasis) {
maxImageBasis = std::floor(frameBasis - 2.0 * minBorderBasis); maxImageBasis = std::floor(frameBasis - 2.0 * minBorderBasis);
} }
}
// Image is too large to satisfy requirements: // Image is too large to satisfy requirements:
// a. Min border size limit not satisfied // a. Min border size limit not satisfied
@ -524,11 +520,9 @@ Dimensions Framing::computeUniformRelativeImageBBox(const Dimensions& imgSize,
double minBorder = static_cast<double>( double minBorder = static_cast<double>(
side == Side::WIDTH ? framing.minWidth : framing.minHeight); side == Side::WIDTH ? framing.minWidth : framing.minHeight);
if (border < minBorder) {
maxImageBasis = std::floor(frameBasis - 2.0 * minBorder); maxImageBasis = std::floor(frameBasis - 2.0 * minBorder);
maxImageOther = std::floor(frameOther - 2.0 * minBorder); maxImageOther = std::floor(frameOther - 2.0 * minBorder);
} }
}
if (imgOther > maxImageOther) { if (imgOther > maxImageOther) {
imgOther = maxImageOther; imgOther = maxImageOther;