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

fix(resize): auto rotate image before resize calculus

Browse source
This commit is contained in:
Tomas Aparicio 2016-02-09 21:37:08 +00:00
parent da1108f1ad
commit edeb809cc1
3 changed files with 50 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
resize.go
View file

@ -32,6 +32,20 @@ func Resize(buf []byte, o Options) ([]byte, error) {
debug("Options: %#v", o)
// Auto rotate image based on EXIF orientation header
image, rotated, err := rotateAndFlipImage(image, o)
if err != nil {
return nil, err
}
// If JPEG image, retrieve the buffer
if rotated && imageType == JPEG && !o.NoAutoRotate {
buf, err = getImageBuffer(image)
if err != nil {
return nil, err
}
}
inWidth := int(image.Xsize)
inHeight := int(image.Ysize)
@ -68,12 +82,6 @@ func Resize(buf []byte, o Options) ([]byte, error) {
residual = float64(shrink) / factor
}
// Explicit or auto rotate image based on EXIF header
image, err = rotateAndFlipImage(image, o)
if err != nil {
return nil, err
}
// Zoom image, if necessary
image, err = zoomImage(image, o.Zoom)
if err != nil {
@ -249,8 +257,9 @@ func extractOrEmbedImage(image *C.VipsImage, o Options) (*C.VipsImage, error) {
return image, err
}
func rotateAndFlipImage(image *C.VipsImage, o Options) (*C.VipsImage, error) {
func rotateAndFlipImage(image *C.VipsImage, o Options) (*C.VipsImage, bool, error) {
var err error
var rotated bool
var direction Direction = -1
if o.NoAutoRotate == false {
@ -264,6 +273,7 @@ func rotateAndFlipImage(image *C.VipsImage, o Options) (*C.VipsImage, error) {
}
if o.Rotate > 0 {
rotated = true
image, err = vipsRotate(image, getAngle(o.Rotate))
}
@ -274,10 +284,11 @@ func rotateAndFlipImage(image *C.VipsImage, o Options) (*C.VipsImage, error) {
}
if direction != -1 {
rotated = true
image, err = vipsFlip(image, direction)
}
return image, err
return image, rotated, err
}
func watermakImage(image *C.VipsImage, w Watermark) (*C.VipsImage, error) {