Skip to content

NOW MANAGED ON CODEBERG

Images: Added base avif support

Dan Brown3a9d18a6cdde
diff --git a/app/Http/Controller.php b/app/Http/Controller.php
index 090cf523a..652e2ccf3 100644
--- a/app/Http/Controller.php
+++ b/app/Http/Controller.php
@@ -163,7 +163,7 @@ abstract class Controller extends BaseController
*/
protected function getImageValidationRules(): array
{
- return ['image_extension', 'mimes:jpeg,png,gif,webp', 'max:' . (config('app.upload_limit') * 1000)];
+ return ['image_extension', 'mimes:jpeg,png,gif,webp,avif', 'max:' . (config('app.upload_limit') * 1000)];
}
/**
diff --git a/app/Uploads/ImageResizer.php b/app/Uploads/ImageResizer.php
index 5f095658f..8d7571c82 100644
--- a/app/Uploads/ImageResizer.php
+++ b/app/Uploads/ImageResizer.php
@@ -6,6 +6,7 @@ use BookStack\Exceptions\ImageUploadException;
use Exception;
use GuzzleHttp\Psr7\Utils;
use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Log;
use Intervention\Image\Decoders\BinaryImageDecoder;
use Intervention\Image\Drivers\Gd\Decoders\NativeObjectDecoder;
use Intervention\Image\Drivers\Gd\Driver;
@@ -93,8 +94,8 @@ class ImageResizer
$imageData = $disk->get($imagePath);
- // Do not resize apng images where we're not cropping
- if ($keepRatio && $this->isApngData($image, $imageData)) {
+ // Do not resize animated images where we're not cropping
+ if ($keepRatio && $this->isAnimated($image, $imageData)) {
Cache::put($thumbCacheKey, $image->path, static::THUMBNAIL_CACHE_TIME);
return $this->storage->getPublicUrl($image->path);
@@ -240,15 +241,50 @@ class ImageResizer
/**
* Check if the given image and image data is apng.
*/
- protected function isApngData(Image $image, string &$imageData): bool
+ protected function isApngData(string &$imageData): bool
{
- $isPng = strtolower(pathinfo($image->path, PATHINFO_EXTENSION)) === 'png';
- if (!$isPng) {
+ $initialHeader = substr($imageData, 0, strpos($imageData, 'IDAT'));
+
+ return str_contains($initialHeader, 'acTL');
+ }
+
+ /**
+ * Check if the given avif image data represents an animated image.
+ * This is based up the answer here: https://stackoverflow.com/a/79457313
+ */
+ protected function isAnimatedAvifData(string &$imageData): bool
+ {
+ $stszPos = strpos($imageData, 'stsz');
+ if ($stszPos === false) {
return false;
}
- $initialHeader = substr($imageData, 0, strpos($imageData, 'IDAT'));
+ // Look 12 bytes after the start of 'stsz'
+ $start = $stszPos + 12;
+ $end = $start + 4;
+ if ($end > strlen($imageData) - 1) {
+ return false;
+ }
- return str_contains($initialHeader, 'acTL');
+ $data = substr($imageData, $start, 4);
+ $count = unpack('Nvalue', $data)['value'];
+ return $count > 1;
+ }
+
+ /**
+ * Check if the given image is animated.
+ */
+ protected function isAnimated(Image $image, string &$imageData): bool
+ {
+ $extension = strtolower(pathinfo($image->path, PATHINFO_EXTENSION));
+ if ($extension === 'png') {
+ return $this->isApngData($imageData);
+ }
+
+ if ($extension === 'avif') {
+ return $this->isAnimatedAvifData($imageData);
+ }
+
+ return false;
}
}
diff --git a/app/Uploads/ImageService.php b/app/Uploads/ImageService.php
index 4d6d49197..a8f144517 100644
--- a/app/Uploads/ImageService.php
+++ b/app/Uploads/ImageService.php
@@ -13,7 +13,7 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
class ImageService
{
- protected static array $supportedExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp'];
+ protected static array $supportedExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'avif'];
public function __construct(
protected ImageStorage $storage,