highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-09-29 21:13:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix over-shrinking during scale-on-load

Browse Source
This commit is contained in:
DarthSim
2024-04-14 18:44:54 +03:00
parent db958ad1dd
commit cdde8918c1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
processing/scale_on_load.go
View File

@@ -32,9 +32,7 @@ func canScaleOnLoad(pctx *pipelineContext, imgdata *imagedata.ImageData, scale f
imgdata.Type == imagetype.AVIF
}
func calcJpegShink(scale float64, imgtype imagetype.Type) int {
shrink := int(1.0 / scale)
func calcJpegShink(shrink float64) int {
switch {
case shrink >= 8:
return 8
@@ -48,7 +46,10 @@ func calcJpegShink(scale float64, imgtype imagetype.Type) int {
}
func scaleOnLoad(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {
prescale := math.Max(pctx.wscale, pctx.hscale)
wshrink := float64(pctx.srcWidth) / float64(imath.Scale(pctx.srcWidth, pctx.wscale))
hshrink := float64(pctx.srcHeight) / float64(imath.Scale(pctx.srcHeight, pctx.hscale))
preshrink := math.Min(wshrink, hshrink)
prescale := 1.0 / preshrink
if !canScaleOnLoad(pctx, imgdata, prescale) {
return nil
@@ -76,7 +77,7 @@ func scaleOnLoad(pctx *pipelineContext, img *vips.Image, po *options.ProcessingO
pctx.angle = angle
pctx.flip = flip
} else {
jpegShrink := calcJpegShink(prescale, pctx.imgtype)
jpegShrink := calcJpegShink(preshrink)
if pctx.imgtype == imagetype.JPEG && jpegShrink == 1 {
return nil