highperfocused/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-10-11 04:32:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't fail if can't load thumbnail

Browse Source
This commit is contained in:
DarthSim
2022-06-10 16:52:35 +06:00
parent 8a536d69a3
commit 8f91fa5bd4
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
processing/processing.go
View File

@@ -208,7 +208,11 @@ func ProcessImage(ctx context.Context, imgdata *imagedata.ImageData, po *options
if po.EnforceThumbnail && imgdata.Type.SupportsThumbnail() { if po.EnforceThumbnail && imgdata.Type.SupportsThumbnail() {
if err := img.LoadThumbnail(imgdata); err != nil { if err := img.LoadThumbnail(imgdata); err != nil {
return nil, err log.Debugf("Can't load thumbnail: %s", err)
// Failed to load thumbnail, rollback to the full image
if err := img.Load(imgdata, 1, 1.0, pages); err != nil {
return nil, err
}
} }
} else { } else {
if err := img.Load(imgdata, 1, 1.0, pages); err != nil { if err := img.Load(imgdata, 1, 1.0, pages); err != nil {

5
processing/scale_on_load.go
View File

@@ -3,6 +3,8 @@ package processing
import ( import (
"math" "math"
log "github.com/sirupsen/logrus"
"github.com/imgproxy/imgproxy/v3/config" "github.com/imgproxy/imgproxy/v3/config"
"github.com/imgproxy/imgproxy/v3/imagedata" "github.com/imgproxy/imgproxy/v3/imagedata"
"github.com/imgproxy/imgproxy/v3/imagetype" "github.com/imgproxy/imgproxy/v3/imagetype"
@@ -59,7 +61,8 @@ func scaleOnLoad(pctx *pipelineContext, img *vips.Image, po *options.ProcessingO
defer thumbnail.Clear() defer thumbnail.Clear()
if err := thumbnail.LoadThumbnail(imgdata); err != nil { if err := thumbnail.LoadThumbnail(imgdata); err != nil {
return err log.Debugf("Can't load thumbnail: %s", err)
return nil
} }
angle, flip := 0, false angle, flip := 0, false