Interlace all output JPEG

Progressive images are both smaller and faster to load.

Signed-off-by: Varun Patil <radialapps@gmail.com>

diff --git a/lib/private/legacy/OC_Image.php b/lib/private/legacy/OC_Image.php
index a212d6390848ccac37c917dd9edb5d0ab2ff9a1c..45584b7209a090b4c74914032b1a3cb0d7bc499d 100644 (file)
--- a/lib/private/legacy/OC_Image.php
+++ b/lib/private/legacy/OC_Image.php
@@ -290,6 +290,8 @@ class OC_Image implements \OCP\IImage {
                                $retVal = imagegif($this->resource, $filePath);
                                break;
                        case IMAGETYPE_JPEG:
+                               /** @psalm-suppress InvalidScalarArgument */
+                               imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
                                $retVal = imagejpeg($this->resource, $filePath, $this->getJpegQuality());
                                break;
                        case IMAGETYPE_PNG:
@@ -379,6 +381,8 @@ class OC_Image implements \OCP\IImage {
                                $res = imagepng($this->resource);
                                break;
                        case "image/jpeg":
+                               /** @psalm-suppress InvalidScalarArgument */
+                               imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
                                $quality = $this->getJpegQuality();
                                if ($quality !== null) {
                                        $res = imagejpeg($this->resource, null, $quality);

diff --git a/tests/lib/ImageTest.php b/tests/lib/ImageTest.php
index e6818c7e24359c2b963bd9659a9954dead7909b6..c843d5f5eb9753e34abca033d1d59fb01f27d246 100644 (file)
--- a/tests/lib/ImageTest.php
+++ b/tests/lib/ImageTest.php
@@ -149,6 +149,8 @@ class ImageTest extends \Test\TestCase {
                $img = new \OC_Image(null, null, $config);
                $img->loadFromFile(OC::$SERVERROOT.'/tests/data/testimage.jpg');
                $raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
+               /** @psalm-suppress InvalidScalarArgument */
+               imageinterlace($raw, (PHP_VERSION_ID >= 80000 ? true : 1));
                ob_start();
                imagejpeg($raw);
                $expected = ob_get_clean();