gabehf/bimg
1
0
Fork 0
mirror of https://github.com/talgo-cloud/bimg.git synced 2026-03-08 15:08:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(rotate): pre-rotate image based on EXIT orientation

Browse source
This commit is contained in:
Tomas Aparicio 2016-01-30 16:27:27 +00:00
parent aca57af419
commit b198ea2ecc
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
resize.go
View file

@ -32,6 +32,14 @@ func Resize(buf []byte, o Options) ([]byte, error) {
debug("Options: %#v", o)
// Initial image auto rotate / flip for proper transformation calculus
if o.Rotate == 0 {
image, err = rotateAndFlipImage(image, o)
if err != nil {
return nil, err
}
}
inWidth := int(image.Xsize)
inHeight := int(image.Ysize)
@ -74,12 +82,6 @@ func Resize(buf []byte, o Options) ([]byte, error) {
return nil, err
}
// Rotate / flip image, if necessary
image, err = rotateAndFlipImage(image, o)
if err != nil {
return nil, err
}
// Transform image, if necessary
if shouldTransformImage(o, inWidth, inHeight) {
image, err = transformImage(image, o, shrink, residual)
@ -102,6 +104,12 @@ func Resize(buf []byte, o Options) ([]byte, error) {
return nil, err
}
// Transform to original rotation, if necessary
image, err = rotateAndFlipImage(image, o)
if err != nil {
return nil, err
}
// Flatten image on a background, if necessary
image, err = imageFlatten(image, imageType, o)
if err != nil {
@ -149,7 +157,7 @@ func shouldTransformImage(o Options, inWidth, inHeight int) bool {
}
func shouldApplyEffects(o Options) bool {
return o.GaussianBlur.Sigma > 0 || o.GaussianBlur.MinAmpl > 0 || o.Sharpen.Radius > 0 && o.Sharpen.Y2 > 0 || o.Sharpen.Y3 > 0
return o.GaussianBlur.Sigma > 0 || o.GaussianBlur.MinAmpl > 0 || o.Sharpen.Radius > 0 && o.Sharpen.Y2 > 0 || o.Sharpen.Y3 > 0
}
func transformImage(image *C.VipsImage, o Options, shrink int, residual float64) (*C.VipsImage, error) {