Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2026-02-16 03:16:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure withoutReduction does not interfere with contain/crop/embed (#3081)

Browse Source
This commit is contained in:
Kleis Auke Wolthuizen
2022-02-08 22:22:23 +01:00
committed by GitHub
parent 7eb5efa3a3
commit 83db5f8a2a
4 changed files with 14 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/common.cc
View File

@@ -885,7 +885,7 @@ namespace sharp {
}
std::pair<double, double> ResolveShrink(int width, int height, int targetWidth, int targetHeight,
Canvas canvas, bool swap, bool withoutEnlargement) {
Canvas canvas, bool swap, bool withoutEnlargement, bool withoutReduction) {
if (swap) {
// Swap input width and height when requested.
std::swap(width, height);
@@ -940,9 +940,14 @@ namespace sharp {
}
}
// We should not enlarge (oversample) the output image,
// if withoutEnlargement is specified.
if (withoutEnlargement) {
// We should not reduce or enlarge the output image, if
// withoutReduction or withoutEnlargement is specified.
if (withoutReduction) {
// Equivalent of VIPS_SIZE_UP
hshrink = std::min(1.0, hshrink);
vshrink = std::min(1.0, vshrink);
} else if (withoutEnlargement) {
// Equivalent of VIPS_SIZE_DOWN
hshrink = std::max(1.0, hshrink);
vshrink = std::max(1.0, vshrink);
}