apunkt/imageproxy
1
0
Fork 0
mirror of https://github.com/willnorris/imageproxy.git synced 2026-05-09 12:02:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add smartcrop feature

Browse source 
fixes #55
This commit is contained in:
Will Norris 2017-09-27 00:54:15 +00:00
parent 20c0a50a31
commit afbd254cdc
4 changed files with 48 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
transform.go
View file

@ -22,9 +22,11 @@ import (
"image/jpeg"
"image/png"
"io"
"log"
"math"
"github.com/disintegration/imaging"
"github.com/muesli/smartcrop"
"github.com/rwcarlsen/goexif/exif"
"golang.org/x/image/tiff" // register tiff format
_ "golang.org/x/image/webp" // register webp format
@ -156,7 +158,7 @@ func resizeParams(m image.Image, opt Options) (w, h int, resize bool) {
// cropParams calculates crop rectangle parameters to keep it in image bounds
func cropParams(m image.Image, opt Options) image.Rectangle {
if opt.CropX == 0 && opt.CropY == 0 && opt.CropWidth == 0 && opt.CropHeight == 0 {
if !opt.SmartCrop && opt.CropX == 0 && opt.CropY == 0 && opt.CropWidth == 0 && opt.CropHeight == 0 {
return m.Bounds()
}
@ -164,6 +166,19 @@ func cropParams(m image.Image, opt Options) image.Rectangle {
imgW := m.Bounds().Dx()
imgH := m.Bounds().Dy()
if opt.SmartCrop {
w := evaluateFloat(opt.Width, imgW)
h := evaluateFloat(opt.Height, imgH)
log.Printf("smartcrop input: %dx%d", w, h)
r, err := smartcrop.SmartCrop(m, w, h)
if err != nil {
log.Printf("error with smartcrop: %v", err)
} else {
log.Printf("smartcrop rectangle: %v", r)
return r
}
}
// top left coordinate of crop
x0 := evaluateFloat(math.Abs(opt.CropX), imgW)
if opt.CropX < 0 {