clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the handling of unhandled image types and of animations (#13904) 

* Fix the handling of unhandled image types and of animations

* Avoid warnings
This commit is contained in:
Michael Vogel 2024-02-17 15:46:48 +01:00 committed by GitHub
parent 7d10518e94
commit 08fa51d0bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Module/Photo.php
View File

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

4
src/Module/Proxy.php
View File

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

6
src/Object/Image.php
View File

@ -66,7 +66,7 @@ class Image
if (Images::isSupportedMimeType($type)) { if (Images::isSupportedMimeType($type)) {
$this->imageType = Images::getImageTypeByMimeType($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; $this->imageType = IMAGETYPE_WEBP;
DI::logger()->debug('Unhandled image mime type, use WebP instead', ['type' => $type, 'filename' => $filename, 'size' => strlen($data)]); DI::logger()->debug('Unhandled image mime type, use WebP instead', ['type' => $type, 'filename' => $filename, 'size' => strlen($data)]);
} else { } else {
@ -100,7 +100,7 @@ class Image
} }
if ($this->imageType == IMAGETYPE_GIF) { if ($this->imageType == IMAGETYPE_GIF) {
$count = preg_match_all("#\x00\x21\xF9\x04.{4}\x00(\x2C|\x21)#s", $data); $count = @preg_match_all("#\x00\x21\xF9\x04.{4}\x00(\x2C|\x21)#s", $data);
return ($count > 0); return ($count > 0);
} }
@ -115,7 +115,7 @@ class Image
*/ */
private function isAnimatedWebP(string $data) { private function isAnimatedWebP(string $data) {
$header_format = 'A4Riff/I1Filesize/A4Webp/A4Vp/A74Chunk'; $header_format = 'A4Riff/I1Filesize/A4Webp/A4Vp/A74Chunk';
$header = unpack($header_format, $data); $header = @unpack($header_format, $data);
if (!isset($header['Riff']) || strtoupper($header['Riff']) !== 'RIFF') { if (!isset($header['Riff']) || strtoupper($header['Riff']) !== 'RIFF') {
return false; return false;

15
src/Util/Images.php
View File

@ -183,6 +183,21 @@ class Images
return $types; 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 * Fetch image mimetype from the image data or guessing from the file name
* *