self-hosted/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2025-12-18 00:17:25 +02:00
Code Issues Releases Activity

Don't combine crops

Browse Source
This commit is contained in:
DarthSim
2020-01-15 18:25:14 +06:00
parent 4030f17307
commit 1cd9a92582
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
process.go
View File

@@ -398,26 +398,11 @@ func transformImage(ctx context.Context, img *vipsImage, data []byte, po *proces
dprWidth := scaleInt(po.Width, po.Dpr) dprWidth := scaleInt(po.Width, po.Dpr)
dprHeight := scaleInt(po.Height, po.Dpr) dprHeight := scaleInt(po.Height, po.Dpr)
if cropGravity.Type == po.Gravity.Type && cropGravity.Type != gravityFocusPoint { if err = cropImage(img, cropWidth, cropHeight, &cropGravity); err != nil {
cropWidth = minNonZeroInt(cropWidth, dprWidth) return err
cropHeight = minNonZeroInt(cropHeight, dprHeight) }
if err = cropImage(img, dprWidth, dprHeight, &po.Gravity); err != nil {
sumGravity := gravityOptions{ return err
Type: cropGravity.Type,
X: cropGravity.X + po.Gravity.X,
Y: cropGravity.Y + po.Gravity.Y,
}
if err = cropImage(img, cropWidth, cropHeight, &sumGravity); err != nil {
return err
}
} else {
if err = cropImage(img, cropWidth, cropHeight, &cropGravity); err != nil {
return err
}
if err = cropImage(img, dprWidth, dprHeight, &po.Gravity); err != nil {
return err
}
} }
checkTimeout(ctx) checkTimeout(ctx)