strip parameter to encoders that support exif

Intervention · Jan 18, 2025 · 4635ea9 · 4635ea9
1 parent 5d64da9
commit 4635ea9
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 11 deletions.
diff --git a/src/Drivers/Imagick/Driver.php b/src/Drivers/Imagick/Driver.php
@@ -171,4 +171,21 @@ public static function version(): string
 
         return $matches['version'];
     }
+
+    /**
+     * @param Imagick $imagick
+     *
+     * @throws \ImagickException
+     * @return void
+     */
+    public static function stripExifKeepICCProfiles(Imagick $imagick): void
+    {
+        $profiles = $imagick->getImageProfiles('icc');
+
+        $imagick->stripImage();
+
+        if ($profiles !== []) {
+            $imagick->profileImage("icc", $profiles['icc']);
+        }
+    }
 }
diff --git a/src/Drivers/Imagick/Encoders/AvifEncoder.php b/src/Drivers/Imagick/Encoders/AvifEncoder.php
@@ -5,6 +5,7 @@
 namespace Intervention\Image\Drivers\Imagick\Encoders;
 
 use Imagick;
+use Intervention\Image\Drivers\Imagick\Driver;
 use Intervention\Image\EncodedImage;
 use Intervention\Image\Encoders\AvifEncoder as GenericAvifEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
@@ -26,6 +27,10 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
+        if ($this->strip) {
+            Driver::stripExifKeepICCProfiles($imagick);
+        }
+
         return new EncodedImage($imagick->getImagesBlob(), 'image/avif');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/HeicEncoder.php b/src/Drivers/Imagick/Encoders/HeicEncoder.php
@@ -4,6 +4,7 @@
 
 namespace Intervention\Image\Drivers\Imagick\Encoders;
 
+use Intervention\Image\Drivers\Imagick\Driver;
 use Intervention\Image\EncodedImage;
 use Intervention\Image\Encoders\HeicEncoder as GenericHeicEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
@@ -22,6 +23,10 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
+        if ($this->strip) {
+            Driver::stripExifKeepICCProfiles($imagick);
+        }
+
         return new EncodedImage($imagick->getImagesBlob(), 'image/heic');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/Jpeg2000Encoder.php b/src/Drivers/Imagick/Encoders/Jpeg2000Encoder.php
@@ -5,6 +5,7 @@
 namespace Intervention\Image\Drivers\Imagick\Encoders;
 
 use Imagick;
+use Intervention\Image\Drivers\Imagick\Driver;
 use Intervention\Image\EncodedImage;
 use Intervention\Image\Encoders\Jpeg2000Encoder as GenericJpeg2000Encoder;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -28,6 +29,10 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
+        if ($this->strip) {
+            Driver::stripExifKeepICCProfiles($imagick);
+        }
+
         return new EncodedImage($imagick->getImagesBlob(), 'image/jp2');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/JpegEncoder.php b/src/Drivers/Imagick/Encoders/JpegEncoder.php
@@ -5,6 +5,7 @@
 namespace Intervention\Image\Drivers\Imagick\Encoders;
 
 use Imagick;
+use Intervention\Image\Drivers\Imagick\Driver;
 use Intervention\Image\EncodedImage;
 use Intervention\Image\Encoders\JpegEncoder as GenericJpegEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
@@ -30,6 +31,7 @@ public function encode(ImageInterface $image): EncodedImageInterface
         // possible full transparent colors as black
         $background->setColorValue(Imagick::COLOR_ALPHA, 1);
 
+        /** @var Imagick $imagick */
         $imagick = $image->core()->native();
         $imagick->setImageBackgroundColor($background);
         $imagick->setBackgroundColor($background);
@@ -45,6 +47,10 @@ public function encode(ImageInterface $image): EncodedImageInterface
             $imagick->setInterlaceScheme(Imagick::INTERLACE_PLANE);
         }
 
+        if ($this->strip) {
+            Driver::stripExifKeepICCProfiles($imagick);
+        }
+
         return new EncodedImage($imagick->getImagesBlob(), 'image/jpeg');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/TiffEncoder.php b/src/Drivers/Imagick/Encoders/TiffEncoder.php
@@ -4,6 +4,7 @@
 
 namespace Intervention\Image\Drivers\Imagick\Encoders;
 
+use Intervention\Image\Drivers\Imagick\Driver;
 use Intervention\Image\EncodedImage;
 use Intervention\Image\Encoders\TiffEncoder as GenericTiffEncoder;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -24,6 +25,10 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
+        if ($this->strip) {
+            Driver::stripExifKeepICCProfiles($imagick);
+        }
+
         return new EncodedImage($imagick->getImagesBlob(), 'image/tiff');
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/WebpEncoder.php b/src/Drivers/Imagick/Encoders/WebpEncoder.php
@@ -6,6 +6,7 @@
 
 use Imagick;
 use ImagickPixel;
+use Intervention\Image\Drivers\Imagick\Driver;
 use Intervention\Image\EncodedImage;
 use Intervention\Image\Encoders\WebpEncoder as GenericWebpEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
@@ -36,6 +37,10 @@ public function encode(ImageInterface $image): EncodedImageInterface
             $imagick->setOption('webp:lossless', 'true');
         }
 
+        if ($this->strip) {
+            Driver::stripExifKeepICCProfiles($imagick);
+        }
+
         return new EncodedImage($imagick->getImagesBlob(), 'image/webp');
     }
 }
diff --git a/src/Encoders/AvifEncoder.php b/src/Encoders/AvifEncoder.php
@@ -12,9 +12,12 @@ class AvifEncoder extends SpecializableEncoder
      * Create new encoder object
      *
      * @param int $quality
+     * @param bool $strip
      * @return void
      */
-    public function __construct(public int $quality = self::DEFAULT_QUALITY)
-    {
+    public function __construct(
+        public int $quality = self::DEFAULT_QUALITY,
+        public bool $strip = false
+    ) {
     }
 }
diff --git a/src/Encoders/HeicEncoder.php b/src/Encoders/HeicEncoder.php
@@ -12,9 +12,12 @@ class HeicEncoder extends SpecializableEncoder
      * Create new encoder object
      *
      * @param int $quality
+     * @param bool $strip
      * @return void
      */
-    public function __construct(public int $quality = self::DEFAULT_QUALITY)
-    {
+    public function __construct(
+        public int $quality = self::DEFAULT_QUALITY,
+        public bool $strip = false
+    ) {
     }
 }
diff --git a/src/Encoders/Jpeg2000Encoder.php b/src/Encoders/Jpeg2000Encoder.php
@@ -12,9 +12,12 @@ class Jpeg2000Encoder extends SpecializableEncoder
      * Create new encoder object
      *
      * @param int $quality
+     * @param bool $strip
      * @return void
      */
-    public function __construct(public int $quality = self::DEFAULT_QUALITY)
-    {
+    public function __construct(
+        public int $quality = self::DEFAULT_QUALITY,
+        public bool $strip = false
+    ) {
     }
 }
diff --git a/src/Encoders/JpegEncoder.php b/src/Encoders/JpegEncoder.php
@@ -13,11 +13,13 @@ class JpegEncoder extends SpecializableEncoder
      *
      * @param int $quality
      * @param bool $progressive
+     * @param bool $strip
      * @return void
      */
     public function __construct(
         public int $quality = self::DEFAULT_QUALITY,
-        public bool $progressive = false
+        public bool $progressive = false,
+        public bool $strip = false
     ) {
     }
 }
diff --git a/src/Encoders/TiffEncoder.php b/src/Encoders/TiffEncoder.php
@@ -12,9 +12,12 @@ class TiffEncoder extends SpecializableEncoder
      * Create new encoder object
      *
      * @param int $quality
+     * @param bool $strip
      * @return void
      */
-    public function __construct(public int $quality = self::DEFAULT_QUALITY)
-    {
+    public function __construct(
+        public int $quality = self::DEFAULT_QUALITY,
+        public bool $strip = false
+    ) {
     }
 }
diff --git a/src/Encoders/WebpEncoder.php b/src/Encoders/WebpEncoder.php
@@ -12,9 +12,12 @@ class WebpEncoder extends SpecializableEncoder
      * Create new encoder object
      *
      * @param int $quality
+     * @param bool $strip
      * @return void
      */
-    public function __construct(public int $quality = self::DEFAULT_QUALITY)
-    {
+    public function __construct(
+        public int $quality = self::DEFAULT_QUALITY,
+        public bool $strip = false
+    ) {
     }
 }
diff --git a/tests/Unit/Drivers/Imagick/Encoders/JpegEncoderTest.php b/tests/Unit/Drivers/Imagick/Encoders/JpegEncoderTest.php
@@ -37,4 +37,17 @@ public function testEncodeProgressive(): void
         $this->assertEquals('image/jpeg', $result->mimetype());
         $this->assertTrue($this->isProgressiveJpeg($result));
     }
+
+    public function testEncodeStripExif(): void
+    {
+        $image = $this->readTestImage('exif.jpg');
+        $this->assertEquals('Oliver Vogel', $image->exif('IFD0.Artist'));
+
+        $encoder = new JpegEncoder(strip: true);
+        $encoder->setDriver(new Driver());
+        $result = $encoder->encode($image);
+        $this->assertMediaType('image/jpeg', $result);
+        $this->assertEquals('image/jpeg', $result->mimetype());
+        $this->assertEmpty(exif_read_data($result->toFilePointer())['IFD0.Artist'] ?? null);
+    }
 }