Merge pull request #751 from lstrojny/bugfix/exif-invalid-values

Ignore invalid exif orientations
liip · Jul 15, 2016 · 53f2307 · 53f2307
2 parents 3cf8a3a + c97a83d
commit 53f2307
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/Imagine/Filter/Loader/AutoRotateFilterLoader.php b/Imagine/Filter/Loader/AutoRotateFilterLoader.php
@@ -24,9 +24,7 @@ public function load(ImageInterface $image, array $options = array())
     {
         if ($orientation = $this->getOrientation($image)) {
             if ($orientation < 1 || $orientation > 8) {
-                throw new InvalidArgumentException(
-                    sprintf('The image has wrong EXIF orientation tag (%d)', $orientation)
-                );
+                return $image;
             }
 
             // Rotates if necessary.

diff --git a/Tests/Imagine/Filter/Loader/AutoRotateFilterLoaderTest.php b/Tests/Imagine/Filter/Loader/AutoRotateFilterLoaderTest.php
@@ -156,12 +156,16 @@ public function testLoadExif8()
     /**
      * Theoretically Orientation is `short` (uint16), so it could be anything
      * from [0; 65535].
-     *
-     * @expectedException \Imagine\Exception\InvalidArgumentException
      */
-    public function testLoadExifInvalid()
+    public static function getInvalidOrientations()
+    {
+        return array(array(0, 9, 255, 65535));
+    }
+
+    /** @dataProvider getInvalidOrientations */
+    public function testLoadExifInvalid($orientation)
     {
-        $this->loadExif('10', null, false);
+        $this->loadExif($orientation, null, false);
     }
 
     /**