Merge pull request #18 from tbielek/rotate

Add support for rotation of images according to EXIF header

Author: chadicus

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 /coverage/
 /clover.xml
+/nbproject/private/

src/Image.php

@@ -101,6 +101,23 @@ public static function resizeMulti(\Imagick $source, array $boxSizes, array $opt
 
             $clone = clone $source;
 
+            $orientation = $clone->getImageOrientation();
+            switch ($orientation)
+            {
+                case \Imagick::ORIENTATION_BOTTOMRIGHT:
+                    $clone->rotateimage('#fff', 180);
+                    $clone->stripImage();
+                    break;
+                case \Imagick::ORIENTATION_RIGHTTOP:
+                    $clone->rotateimage('#fff', 90);
+                    $clone->stripImage();
+                    break;
+                case \Imagick::ORIENTATION_LEFTBOTTOM:
+                    $clone->rotateimage('#fff', -90);
+                    $clone->stripImage();
+                    break;
+            }
+
             $width = $clone->getImageWidth();
             $height = $clone->getImageHeight();
 

tests/ImageTest.php

@@ -309,6 +309,44 @@ public function resize_nonBoolUpsize()
         Image::resize(new \Imagick(), 10, 10, ['upsize' => 'not bool']);
     }
 
+    /**
+     * Verify images are rotated according to EXIF header
+     * @test
+     * @covers ::resize
+     * @covers ::resizeMulti
+     */
+    public function resize_orientation()
+    {
+        $files = [
+            "{$this->_sourceFilesDir}/bottom-right.jpg",
+            "{$this->_sourceFilesDir}/left-bottom.jpg",
+            "{$this->_sourceFilesDir}/right-top.jpg",
+            "{$this->_sourceFilesDir}/top-left.jpg",
+        ];
+
+        $imageResults = [];
+
+        foreach ($files as $file) {
+            $source = new \Imagick($file);
+            $imageWidth = $source->getimagewidth();
+            $imageHeight = $source->getimageheight();
+            $imageResults[] = Image::resize($source, $imageWidth, $imageHeight, []);
+        }
+
+        $this->assertSame(
+            ['r' => 254, 'g' => 0, 'b' => 0, 'a' => 1], $imageResults[0]->getImagePixelColor(0, 0)->getColor()
+        );
+        $this->assertSame(
+            ['r' => 0, 'g' => 0, 'b' => 0, 'a' => 1], $imageResults[1]->getImagePixelColor(0, 0)->getColor()
+        );
+        $this->assertSame(
+            ['r' => 0, 'g' => 255, 'b' => 1, 'a' => 1], $imageResults[2]->getImagePixelColor(0, 0)->getColor()
+        );
+        $this->assertSame(
+            ['r' => 0, 'g' => 0, 'b' => 254, 'a' => 1], $imageResults[3]->getImagePixelColor(0, 0)->getColor()
+        );
+    }
+
     /**
      * Downsize ratio 2.0 to 0.25 and 2.0 to 4.0
      *