Revert imagick encoders to use Imagick::getImagesBlob()

Intervention · Oct 5, 2024 · 8e4875f · 8e4875f
1 parent cb464e1
commit 8e4875f
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 31 deletions.
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\EncodedImage;
 use Intervention\Image\Encoders\AvifEncoder as GenericAvifEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -25,8 +26,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
-        return $this->createEncodedImage(function ($pointer) use ($imagick, $format) {
-            $imagick->writeImageFile($pointer, $format);
-        });
+        return new EncodedImage($imagick->getImagesBlob());
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/BmpEncoder.php b/src/Drivers/Imagick/Encoders/BmpEncoder.php
@@ -5,6 +5,7 @@
 namespace Intervention\Image\Drivers\Imagick\Encoders;
 
 use Imagick;
+use Intervention\Image\EncodedImage;
 use Intervention\Image\Encoders\BmpEncoder as GenericBmpEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -23,8 +24,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompression($compression);
         $imagick->setImageCompression($compression);
 
-        return $this->createEncodedImage(function ($pointer) use ($imagick, $format) {
-            $imagick->writeImageFile($pointer, $format);
-        });
+        return new EncodedImage($imagick->getImagesBlob());
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/GifEncoder.php b/src/Drivers/Imagick/Encoders/GifEncoder.php
@@ -5,6 +5,7 @@
 namespace Intervention\Image\Drivers\Imagick\Encoders;
 
 use Imagick;
+use Intervention\Image\EncodedImage;
 use Intervention\Image\Encoders\GifEncoder as GenericGifEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -28,8 +29,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
             $imagick->setInterlaceScheme(Imagick::INTERLACE_LINE);
         }
 
-        return $this->createEncodedImage(function ($pointer) use ($imagick, $format) {
-            $imagick->writeImageFile($pointer, $format);
-        });
+        return new EncodedImage($imagick->getImagesBlob());
     }
 }
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\EncodedImage;
 use Intervention\Image\Encoders\HeicEncoder as GenericHeicEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -16,14 +17,11 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $format = 'HEIC';
 
         $imagick = $image->core()->native();
-
         $imagick->setFormat($format);
         $imagick->setImageFormat($format);
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
-        return $this->createEncodedImage(function ($pointer) use ($imagick, $format) {
-            $imagick->writeImageFile($pointer, $format);
-        });
+        return new EncodedImage($imagick->getImagesBlob());
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/Jpeg2000Encoder.php b/src/Drivers/Imagick/Encoders/Jpeg2000Encoder.php
@@ -28,9 +28,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
-        // encoding fails with Imagick::writeImageFile() for JP2 format
-        // The reasons are unknown, but could be fixed by Imagick/Imagemagick
-        // in the future. Until then, I use getImagesBlob() for Jpeg2000.
         return new EncodedImage($imagick->getImagesBlob());
     }
 }
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\EncodedImage;
 use Intervention\Image\Encoders\JpegEncoder as GenericJpegEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -44,8 +45,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
             $imagick->setInterlaceScheme(Imagick::INTERLACE_PLANE);
         }
 
-        return $this->createEncodedImage(function ($pointer) use ($imagick, $format) {
-            $imagick->writeImageFile($pointer, $format);
-        });
+        return new EncodedImage($imagick->getImagesBlob());
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/PngEncoder.php b/src/Drivers/Imagick/Encoders/PngEncoder.php
@@ -5,6 +5,7 @@
 namespace Intervention\Image\Drivers\Imagick\Encoders;
 
 use Imagick;
+use Intervention\Image\EncodedImage;
 use Intervention\Image\Encoders\PngEncoder as GenericPngEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -25,8 +26,12 @@ public function encode(ImageInterface $image): EncodedImageInterface
             $output->reduceColors(256);
 
             $output = $output->core()->native();
+            $output->setFormat('PNG');
+            $output->setImageFormat('PNG');
         } else {
             $output = clone $image->core()->native();
+            $output->setFormat('PNG32');
+            $output->setImageFormat('PNG32');
         }
 
         $output->setCompression(Imagick::COMPRESSION_ZIP);
@@ -36,11 +41,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
             $output->setInterlaceScheme(Imagick::INTERLACE_LINE);
         }
 
-        return $this->createEncodedImage(function ($pointer) use ($output) {
-            $output->writeImageFile(
-                $pointer,
-                $this->indexed ? 'PNG' : 'PNG32',
-            );
-        });
+        return new EncodedImage($output->getImagesBlob());
     }
 }
diff --git a/src/Drivers/Imagick/Encoders/TiffEncoder.php b/src/Drivers/Imagick/Encoders/TiffEncoder.php
@@ -24,9 +24,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setCompressionQuality($this->quality);
         $imagick->setImageCompressionQuality($this->quality);
 
-        // encoding fails with Imagick::writeImageFile() for TIFF format
-        // the reasons are unknown, but could be fixed by Imagick/Imagemagick
-        // in the future. Until then, I use getImagesBlob() for Jpeg2000.
         return new EncodedImage($imagick->getImagesBlob());
     }
 }
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\EncodedImage;
 use Intervention\Image\Encoders\WebpEncoder as GenericWebpEncoder;
 use Intervention\Image\Interfaces\EncodedImageInterface;
 use Intervention\Image\Interfaces\ImageInterface;
@@ -31,8 +32,6 @@ public function encode(ImageInterface $image): EncodedImageInterface
         $imagick->setImageCompression($compression);
         $imagick->setImageCompressionQuality($this->quality);
 
-        return $this->createEncodedImage(function ($pointer) use ($imagick, $format) {
-            $imagick->writeImageFile($pointer, $format);
-        });
+        return new EncodedImage($imagick->getImagesBlob());
     }
 }