Use image height to calculate watermark top offset (imgproxy#313)

realsim · DarthSim · commit f83b73ab38cf · 2019-12-27T12:19:14.000+06:00
diff --git a/process.go b/process.go
@@ -261,7 +261,7 @@ func prepareWatermark(wm *vipsImage, wmData *imageData, opts *watermarkOptions,
 		return wm.Replicate(imgWidth, imgHeight)
 	}
 
-	left, top := calcPosition(imgWidth, imgWidth, wm.Width(), wm.Height(), &opts.Gravity, true)
+	left, top := calcPosition(imgWidth, imgHeight, wm.Width(), wm.Height(), &opts.Gravity, true)
 
 	return wm.Embed(imgWidth, imgHeight, left, top, rgbColor{0, 0, 0})
 }

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ func prepareWatermark(wm vipsImage, wmData imageData, opts *watermarkOptions,`
`261`	`261`	`return wm.Replicate(imgWidth, imgHeight)`
`262`	`262`	`}`
`263`	`263`
`264`		`- left, top := calcPosition(imgWidth, imgWidth, wm.Width(), wm.Height(), &opts.Gravity, true)`
	`264`	`+ left, top := calcPosition(imgWidth, imgHeight, wm.Width(), wm.Height(), &opts.Gravity, true)`
`265`	`265`
`266`	`266`	`return wm.Embed(imgWidth, imgHeight, left, top, rgbColor{0, 0, 0})`
`267`	`267`	`}`