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

Add extend_aspect_ratio processing option

Browse Source
This commit is contained in:
DarthSim
2023-02-19 18:58:30 +03:00
parent 4ca72ea9cc
commit 4bf1a27abd
6 changed files with 86 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
processing/extend.go
View File

@@ -2,17 +2,45 @@ package processing
import (
"github.com/imgproxy/imgproxy/v3/imagedata"
"github.com/imgproxy/imgproxy/v3/imath"
"github.com/imgproxy/imgproxy/v3/options"
"github.com/imgproxy/imgproxy/v3/vips"
)
func extend(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {
resultWidth, resultHeight := resultSize(po)
if !po.Extend.Enabled || (resultWidth <= img.Width() && resultHeight <= img.Height()) {
func extendImage(img *vips.Image, resultWidth, resultHeight int, opts *options.ExtendOptions, extendAr bool) error {
if !opts.Enabled || (resultWidth <= img.Width() && resultHeight <= img.Height()) {
return nil
}
offX, offY := calcPosition(resultWidth, resultHeight, img.Width(), img.Height(), &po.Extend.Gravity, false)
if extendAr && resultWidth > img.Width() && resultHeight > img.Height() {
diffW := float64(resultWidth) / float64(img.Width())
diffH := float64(resultHeight) / float64(img.Height())
switch {
case diffH > diffW:
resultHeight = imath.Scale(img.Width(), float64(resultHeight)/float64(resultWidth))
resultWidth = img.Width()
case diffW > diffH:
resultWidth = imath.Scale(img.Height(), float64(resultWidth)/float64(resultHeight))
resultHeight = img.Height()
default:
// The image has the requested arpect ratio
return nil
}
}
offX, offY := calcPosition(resultWidth, resultHeight, img.Width(), img.Height(), &opts.Gravity, false)
return img.Embed(resultWidth, resultHeight, offX, offY)
}
func extend(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {
resultWidth, resultHeight := resultSize(po)
return extendImage(img, resultWidth, resultHeight, &po.Extend, false)
}
func extendAspectRatio(pctx *pipelineContext, img *vips.Image, po *options.ProcessingOptions, imgdata *imagedata.ImageData) error {
resultWidth, resultHeight := resultSize(po)
return extendImage(img, resultWidth, resultHeight, &po.ExtendAspectRatio, true)
}