highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-09-22 16:11:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the extend processing option when only one dimension is set

Browse Source
This commit is contained in:
DarthSim
2025-06-04 20:20:20 +03:00
parent 08150dcc16
commit dccfe80349
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -18,6 +18,7 @@
### Fixed
- Fix `X-Origin-Content-Length` header value when SVG is sanitized or minified.
- Mark JPEG XL format as supporting quality. Fixes autoquality for JPEG XL.
- Fix the `extend` processing option when only one dimension is set.
- (pro) Fix object detection when the `IMGPROXY_USE_LINEAR_COLORSPACE` config is set to `true`.
- (pro) Fix BlurHash generation when the `IMGPROXY_USE_LINEAR_COLORSPACE` config is set to `true`.
- (pro) Fix detection of PDF files with a header offset.

34
processing/extend.go
View File

@@ -8,22 +8,38 @@ import (
)
func extendImage(img *vips.Image, resultWidth, resultHeight int, opts *options.ExtendOptions, offsetScale float64, extendAr bool) error {
if !opts.Enabled || (resultWidth <= img.Width() && resultHeight <= img.Height()) || resultWidth == 0 || resultHeight == 0 {
imgWidth := img.Width()
imgHeight := img.Height()
if !opts.Enabled || (resultWidth <= imgWidth && resultHeight <= imgHeight) {
return nil
}
if extendAr && resultWidth > img.Width() && resultHeight > img.Height() {
diffW := float64(resultWidth) / float64(img.Width())
diffH := float64(resultHeight) / float64(img.Height())
if resultWidth <= 0 {
if extendAr {
return nil
}
resultWidth = imgWidth
}
if resultHeight <= 0 {
if extendAr {
return nil
}
resultHeight = imgHeight
}
if extendAr && resultWidth > imgWidth && resultHeight > imgHeight {
diffW := float64(resultWidth) / float64(imgWidth)
diffH := float64(resultHeight) / float64(imgHeight)
switch {
case diffH > diffW:
resultHeight = imath.Scale(img.Width(), float64(resultHeight)/float64(resultWidth))
resultWidth = img.Width()
resultHeight = imath.Scale(imgWidth, float64(resultHeight)/float64(resultWidth))
resultWidth = imgWidth
case diffW > diffH:
resultWidth = imath.Scale(img.Height(), float64(resultWidth)/float64(resultHeight))
resultHeight = img.Height()
resultWidth = imath.Scale(imgHeight, float64(resultWidth)/float64(resultHeight))
resultHeight = imgHeight
default:
// The image has the requested arpect ratio
@@ -31,7 +47,7 @@ func extendImage(img *vips.Image, resultWidth, resultHeight int, opts *options.E
}
}
offX, offY := calcPosition(resultWidth, resultHeight, img.Width(), img.Height(), &opts.Gravity, offsetScale, false)
offX, offY := calcPosition(resultWidth, resultHeight, imgWidth, imgHeight, &opts.Gravity, offsetScale, false)
return img.Embed(resultWidth, resultHeight, offX, offY)
}