Merge pull request php-imagine#391 from romainneutron/fix-353

Fix php-imagine#353: Stripping image with invalid ICC profile fails
aweika · Nov 11, 2014 · 3fc71be · 3fc71be
2 parents 031c68a + 14672ce
commit 3fc71be
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 2 deletions.
diff --git a/lib/Imagine/Gmagick/Image.php b/lib/Imagine/Gmagick/Image.php
@@ -156,7 +156,12 @@ public function flipVertically()
     public function strip()
     {
         try {
-            $this->profile($this->palette->profile());
+            try {
+                $this->profile($this->palette->profile());
+            } catch (\Exception $e) {
+                // here we discard setting the profile as the previous incorporated profile
+                // is corrupted, let's now strip the image
+            }
             $this->gmagick->stripimage();
         } catch (\GmagickException $e) {
             throw new RuntimeException('Strip operation failed', $e->getCode(), $e);

diff --git a/lib/Imagine/Imagick/Image.php b/lib/Imagine/Imagick/Image.php
@@ -179,7 +179,12 @@ public function flipVertically()
     public function strip()
     {
         try {
-            $this->profile($this->palette->profile());
+            try {
+                $this->profile($this->palette->profile());
+            } catch (\Exception $e) {
+                // here we discard setting the profile as the previous incorporated profile
+                // is corrupted, let's now strip the image
+            }
             $this->imagick->stripImage();
         } catch (\ImagickException $e) {
             throw new RuntimeException('Strip operation failed', $e->getCode(), $e);

diff --git a/tests/Imagine/Fixtures/invalid-icc-profile.jpg b/tests/Imagine/Fixtures/invalid-icc-profile.jpg
diff --git a/tests/Imagine/Test/Gd/ImageTest.php b/tests/Imagine/Test/Gd/ImageTest.php
@@ -87,6 +87,11 @@ public function testChangeColorSpaceAndStripImage()
         $this->markTestSkipped('GD driver does not support ICC profiles');
     }
 
+    public function testStripImageWithInvalidProfile()
+    {
+        $this->markTestSkipped('GD driver does not support ICC profiles');
+    }
+
     public function testStripGBRImageHasGoodColors()
     {
         $this->markTestSkipped('GD driver does not support ICC profiles');

diff --git a/tests/Imagine/Test/Image/AbstractImageTest.php b/tests/Imagine/Test/Image/AbstractImageTest.php
@@ -556,6 +556,19 @@ public function testChangeColorSpaceAndStripImage()
         $this->assertEquals('#0082a2', (string) $color);
     }
 
+    public function testStripImageWithInvalidProfile()
+    {
+        $image = $this
+            ->getImagine()
+            ->open('tests/Imagine/Fixtures/invalid-icc-profile.jpg');
+
+        $color = $image->getColorAt(new Point(0, 0));
+        $image->strip();
+        $afterColor = $image->getColorAt(new Point(0, 0));
+
+        $this->assertEquals((string) $color, (string) $afterColor);
+    }
+
     public function testGetColorAt()
     {
         $color = $this