Merge pull request #76 from h2non/develop

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

.travis.yml

@@ -1,5 +1,6 @@
 language: go
 go:
+  - 1.5
   - 1.4
   - 1.3
   - release

resize.go

@@ -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) {

version.go

@@ -1,3 +1,3 @@
 package bimg
 
-const Version = "0.1.21"
+const Version = "0.1.22"

vips.go

@@ -65,7 +65,7 @@ func init() {
 }
 
 // Explicit thread-safe start of libvips.
-// Only call this function if you've previously shutdown libvips
+// Only call this function if you previously shutdown libvips
 func Initialize() {
 	if C.VIPS_MAJOR_VERSION <= 7 && C.VIPS_MINOR_VERSION < 40 {
 		panic("unsupported libvips version!")