Revert "Fix unhandled image detection"

This reverts commit 1069cfb57043ab4c9f202157488a85aca61289ee.

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 1bac70cdfd560064623d00cdb2d6aa8bc1e4a350..3a064c48ac5f699d797a616bb5d29092fb216cad 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -207,13 +207,13 @@ class Photo extends BaseApi
                        $mimetype = $img->getType();
                }
 
-               // if customsize is set and image resizing is supported for this image, resize it
-               if (Images::canResize($photo['type']) && $customsize > 0 && $customsize <= Proxy::PIXEL_THUMB && $square_resize) {
+               // if customsize is set and image is not a gif, resize it
+               if ($photo['type'] !== image_type_to_mime_type(IMAGETYPE_GIF) && $customsize > 0 && $customsize <= Proxy::PIXEL_THUMB && $square_resize) {
                        $img = new Image($imgdata, $photo['type'], $photo['filename']);
                        $img->scaleToSquare($customsize);
                        $imgdata  = $img->asString();
                        $mimetype = $img->getType();
-               } elseif (Images::canResize($photo['type']) && $customsize > 0) {
+               } elseif ($photo['type'] !== image_type_to_mime_type(IMAGETYPE_GIF) && $customsize > 0) {
                        $img = new Image($imgdata, $photo['type'], $photo['filename']);
                        $img->scaleDown($customsize);
                        $imgdata  = $img->asString();

diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 8a72e40ea23a3e30c2f204268b8bb5e90ac146b8..12f58f3a844dfacfadb99feb2e5e5f0cbae24dd1 100644 (file)
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -106,8 +106,8 @@ class Proxy extends BaseModule
                        // stop.
                }
 
-               // reduce quality - if it is supported for this image type
-               if (Images::canResize($image->getType())) {
+               // reduce quality - if it isn't a GIF
+               if ($image->getImageType() != IMAGETYPE_GIF) {
                        $image->scaleDown($request['size']);
                }
 

diff --git a/src/Object/Image.php b/src/Object/Image.php
index e2be2dcfd3d22c443c05e69e922e44cfe7162103..d938643751f8e276e538b5862d7cfba6ee7bcc3e 100644 (file)
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -66,7 +66,7 @@ class Image
 
                if (Images::isSupportedMimeType($type)) {
                        $this->imageType = Images::getImageTypeByMimeType($type);
-               } elseif (($type == '') || substr($type, 0, 6) == 'image/' || substr($type, 0, 12) == ' application/') {
+               } elseif (($type == '') || substr($type, 0, 6) != 'image/' || substr($type, 0, 12) != ' application/') {
                        $this->imageType = IMAGETYPE_WEBP;
                        DI::logger()->debug('Unhandled image mime type, use WebP instead', ['type' => $type, 'filename' => $filename, 'size' => strlen($data)]);
                } else {

diff --git a/src/Util/Images.php b/src/Util/Images.php
index f5a7e5af3d156db69f0b9bef13a9b0f3966ad668..33bae87a794b9665ce8d6787be4b53a59e24a577 100644 (file)
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -183,21 +183,6 @@ class Images
                return $types;
        }
 
-       /**
-        * Checks if the provided mime type can be handled for resizing.
-        * Only with Imagick installed, animated GIF and WebP keep their animation after resize.
-        *
-        * @param string $mimetype
-        * @return boolean
-        */
-       public static function canResize(string $mimetype): bool
-       {
-               if (in_array(self::getImageTypeByMimeType($mimetype), [IMAGETYPE_GIF, IMAGETYPE_WEBP])) {
-                       return class_exists('Imagick');
-               }
-               return true;
-       }
-
        /**
         * Fetch image mimetype from the image data or guessing from the file name
         *