added test anf fixed encoders when necessary

Intervention · Dec 30, 2024 · 139927c · 139927c
1 parent 0419e39
commit 139927c
Show file tree

Hide file tree

Showing 11 changed files with 93 additions and 2 deletions.
diff --git a/src/Encoders/AvifEncoder.php b/src/Encoders/AvifEncoder.php
@@ -20,6 +20,7 @@ public function encode(ImageInterface $image): EncodedImage
     {
         $result = $image->core()->native()->writeToBuffer('.avif', [
             'Q' => $this->quality,
+            'strip' => true,
             // 'speed' => 6, // Speed (faster encoding)/*
             // 'effort' => 4, // Compression effort*/
         ]);

diff --git a/src/Encoders/HeicEncoder.php b/src/Encoders/HeicEncoder.php
@@ -20,6 +20,7 @@ public function encode(ImageInterface $image): EncodedImage
     {
         $result = $image->core()->native()->writeToBuffer('.heic', [
             'Q' => $this->quality,
+            'strip' => true,
         ]);
 
         return new EncodedImage($result, 'image/heic');

diff --git a/src/Encoders/Jpeg2000Encoder.php b/src/Encoders/Jpeg2000Encoder.php
@@ -18,7 +18,13 @@ class Jpeg2000Encoder extends GenericJpeg2000Encoder implements SpecializedInter
      */
     public function encode(ImageInterface $image): EncodedImage
     {
-        $result = $image->core()->native()->writeToBuffer('.j2k', [
+        $core = $image->core()->native();
+
+        if ($image->isAnimated()) {
+            $core = $image->core()->frame(1)->native();
+        }
+
+        $result = $core->writeToBuffer('.j2k', [
             'Q' => $this->quality,
             'strip' => true,
             'lossless' => false,

diff --git a/src/Encoders/PngEncoder.php b/src/Encoders/PngEncoder.php
@@ -18,7 +18,13 @@ class PngEncoder extends GenericPngEncoder implements SpecializedInterface
      */
     public function encode(ImageInterface $image): EncodedImage
     {
-        $result = $image->core()->native()->writeToBuffer('.png', [
+        $core = $image->core()->native();
+
+        if ($image->isAnimated()) {
+            $core = $image->core()->frame(1)->native();
+        }
+
+        $result = $core->writeToBuffer('.png', [
             'interlace' => $this->interlaced,
             'palette' => $this->indexed,
             'strip' => true,

diff --git a/tests/Unit/Encoders/AvifEncoderTest.php b/tests/Unit/Encoders/AvifEncoderTest.php
@@ -21,4 +21,15 @@ public function testEncode(): void
         $this->assertMediaType('image/avif', $result);
         $this->assertEquals('image/avif', $result->mimetype());
     }
+
+    public function testEncodeAnimated(): void
+    {
+        $image = $this->readTestImage('animation.gif');
+        $encoder = new AvifEncoder(75);
+        $encoder->setDriver(new Driver());
+        $result = $encoder->encode($image);
+        $encoded = $this->readFilePointer($result->toFilePointer());
+        $this->assertSame($image->width(), $encoded->width());
+        $this->assertSame($image->height(), $encoded->height());
+    }
 }
diff --git a/tests/Unit/Encoders/BmpEncoderTest.php b/tests/Unit/Encoders/BmpEncoderTest.php
@@ -21,4 +21,15 @@ public function testEncode(): void
         $this->assertMediaType(['image/bmp', 'image/x-ms-bmp'], $result);
         $this->assertEquals('image/bmp', $result->mimetype());
     }
+
+    public function testEncodeAnimated(): void
+    {
+        $image = $this->readTestImage('animation.gif');
+        $encoder = new BmpEncoder();
+        $encoder->setDriver(new Driver());
+        $result = $encoder->encode($image);
+        $encoded = $this->readFilePointer($result->toFilePointer());
+        $this->assertSame($image->width(), $encoded->width());
+        $this->assertSame($image->height(), $encoded->height());
+    }
 }
diff --git a/tests/Unit/Encoders/HeicEncoderTest.php b/tests/Unit/Encoders/HeicEncoderTest.php
@@ -21,4 +21,15 @@ public function testEncode(): void
         $this->assertMediaType('image/heic', $result);
         $this->assertEquals('image/heic', $result->mimetype());
     }
+
+    public function testEncodeAnimated(): void
+    {
+        $image = $this->readTestImage('animation.gif');
+        $encoder = new HeicEncoder(75);
+        $encoder->setDriver(new Driver());
+        $result = $encoder->encode($image);
+        $encoded = $this->readFilePointer($result->toFilePointer());
+        $this->assertSame($image->width(), $encoded->width());
+        $this->assertSame($image->height(), $encoded->height());
+    }
 }
diff --git a/tests/Unit/Encoders/Jpeg200EncoderTest.php b/tests/Unit/Encoders/Jpeg200EncoderTest.php
@@ -23,6 +23,17 @@ public function testEncode(): void
         $this->assertTrue($this->isJpeg2000($result), 'Encoding result is not in Jpeg 2000 format.');
     }
 
+    public function testEncodeAnimated(): void
+    {
+        $image = $this->readTestImage('animation.gif');
+        $encoder = new Jpeg2000Encoder(75);
+        $encoder->setDriver(new Driver());
+        $result = $encoder->encode($image);
+        $encoded = $this->readFilePointer($result->toFilePointer());
+        $this->assertSame($image->width(), $encoded->width());
+        $this->assertSame($image->height(), $encoded->height());
+    }
+
     private function isJpeg2000(string|EncodedImage $input): bool
     {
         return 1 === preg_match(

diff --git a/tests/Unit/Encoders/PngEncoderTest.php b/tests/Unit/Encoders/PngEncoderTest.php
@@ -37,6 +37,17 @@ public function testEncodeInterlaced(): void
         $this->assertTrue($this->isInterlacedPng($result));
     }
 
+    public function testEncodeAnimated(): void
+    {
+        $image = $this->readTestImage('animation.gif');
+        $encoder = new PngEncoder();
+        $encoder->setDriver(new Driver());
+        $result = $encoder->encode($image);
+        $encoded = $this->readFilePointer($result->toFilePointer());
+        $this->assertSame($image->width(), $encoded->width());
+        $this->assertSame($image->height(), $encoded->height());
+    }
+
     #[DataProvider('indexedDataProvider')]
     public function testEncoderIndexed(ImageInterface $image, PngEncoder $encoder, string $result): void
     {

diff --git a/tests/Unit/Encoders/TiffEncoderTest.php b/tests/Unit/Encoders/TiffEncoderTest.php
@@ -21,4 +21,15 @@ public function testEncode(): void
         $this->assertMediaType('image/tiff', $result);
         $this->assertEquals('image/tiff', $result->mimetype());
     }
+
+    public function testEncodeAnimated(): void
+    {
+        $image = $this->readTestImage('animation.gif');
+        $encoder = new TiffEncoder(75);
+        $encoder->setDriver(new Driver());
+        $result = $encoder->encode($image);
+        $encoded = $this->readFilePointer($result->toFilePointer());
+        $this->assertSame($image->width(), $encoded->width());
+        $this->assertSame($image->height(), $encoded->height());
+    }
 }
diff --git a/tests/Unit/Encoders/WebpEncoderTest.php b/tests/Unit/Encoders/WebpEncoderTest.php
@@ -21,4 +21,15 @@ public function testEncode(): void
         $this->assertMediaType('image/webp', $result);
         $this->assertEquals('image/webp', $result->mimetype());
     }
+
+    public function testEncodeAnimated(): void
+    {
+        $image = $this->readTestImage('animation.gif');
+        $encoder = new WebpEncoder(75);
+        $encoder->setDriver(new Driver());
+        $result = $encoder->encode($image);
+        $encoded = $this->readFilePointer($result->toFilePointer());
+        $this->assertSame($image->width(), $encoded->width());
+        $this->assertSame($image->height(), $encoded->height());
+    }
 }