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

Use RoundToEven when calculating offsets and watermark size

Browse Source
This commit is contained in:
DarthSim
2023-04-16 21:09:48 +03:00
parent 168f6f6043
commit 7d1f7c903a
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
imath/imath.go
View File

@@ -58,3 +58,11 @@ func Shrink(a int, shrink float64) int {
return Round(float64(a) / shrink) return Round(float64(a) / shrink)
} }
func ShrinkToEven(a int, shrink float64) int {
if a == 0 {
return 0
}
return RoundToEven(float64(a) / shrink)
}

2
options/processing_options.go
View File

@@ -1113,7 +1113,7 @@ func defaultProcessingOptions(headers http.Header) (*ProcessingOptions, error) {
} }
if len(headerWidth) > 0 { if len(headerWidth) > 0 {
if w, err := strconv.Atoi(headerWidth); err == nil { if w, err := strconv.Atoi(headerWidth); err == nil {
po.Width = imath.Scale(w, 1/po.Dpr) po.Width = imath.Shrink(w, po.Dpr)
} }
} }
} }

12
processing/calc_position.go
View File

@@ -1,22 +1,24 @@
package processing package processing
import ( import (
"math"
"github.com/imgproxy/imgproxy/v3/imath" "github.com/imgproxy/imgproxy/v3/imath"
"github.com/imgproxy/imgproxy/v3/options" "github.com/imgproxy/imgproxy/v3/options"
) )
func calcPosition(width, height, innerWidth, innerHeight int, gravity *options.GravityOptions, dpr float64, allowOverflow bool) (left, top int) { func calcPosition(width, height, innerWidth, innerHeight int, gravity *options.GravityOptions, dpr float64, allowOverflow bool) (left, top int) {
if gravity.Type == options.GravityFocusPoint { if gravity.Type == options.GravityFocusPoint {
pointX := imath.Scale(width, gravity.X) pointX := imath.ScaleToEven(width, gravity.X)
pointY := imath.Scale(height, gravity.Y) pointY := imath.ScaleToEven(height, gravity.Y)
left = pointX - innerWidth/2 left = pointX - innerWidth/2
top = pointY - innerHeight/2 top = pointY - innerHeight/2
} else { } else {
offX, offY := int(gravity.X*dpr), int(gravity.Y*dpr) offX, offY := int(math.RoundToEven(gravity.X*dpr)), int(math.RoundToEven(gravity.Y*dpr))
left = (width-innerWidth+1)/2 + offX left = imath.ShrinkToEven(width-innerWidth+1, 2) + offX
top = (height-innerHeight+1)/2 + offY top = imath.ShrinkToEven(height-innerHeight+1, 2) + offY
if gravity.Type == options.GravityNorth || gravity.Type == options.GravityNorthEast || gravity.Type == options.GravityNorthWest { if gravity.Type == options.GravityNorth || gravity.Type == options.GravityNorthEast || gravity.Type == options.GravityNorthWest {
top = 0 + offY top = 0 + offY

8
processing/padding.go
View File

@@ -12,10 +12,10 @@ func padding(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptio
return nil return nil
} }
paddingTop := imath.Scale(po.Padding.Top, pctx.dprScale) paddingTop := imath.ScaleToEven(po.Padding.Top, pctx.dprScale)
paddingRight := imath.Scale(po.Padding.Right, pctx.dprScale) paddingRight := imath.ScaleToEven(po.Padding.Right, pctx.dprScale)
paddingBottom := imath.Scale(po.Padding.Bottom, pctx.dprScale) paddingBottom := imath.ScaleToEven(po.Padding.Bottom, pctx.dprScale)
paddingLeft := imath.Scale(po.Padding.Left, pctx.dprScale) paddingLeft := imath.ScaleToEven(po.Padding.Left, pctx.dprScale)
return img.Embed( return img.Embed(
img.Width()+paddingLeft+paddingRight, img.Width()+paddingLeft+paddingRight,

4
processing/watermark.go
View File

@@ -32,8 +32,8 @@ func prepareWatermark(wm *vips.Image, wmData *imagedata.ImageData, opts *options
po.Format = wmData.Type po.Format = wmData.Type
if opts.Scale > 0 { if opts.Scale > 0 {
po.Width = imath.Max(imath.Scale(imgWidth, opts.Scale), 1) po.Width = imath.Max(imath.ScaleToEven(imgWidth, opts.Scale), 1)
po.Height = imath.Max(imath.Scale(imgHeight, opts.Scale), 1) po.Height = imath.Max(imath.ScaleToEven(imgHeight, opts.Scale), 1)
} }
if opts.Replicate { if opts.Replicate {