From 64587d67fb86f2dd3187c5fc679357a7283c123f Mon Sep 17 00:00:00 2001 From: umgfoin Date: Wed, 12 Mar 2025 12:22:49 +0100 Subject: [PATCH] fix(GenerateBlurhashMetadata): Suppress imagescale errors Suppress errors in imagescale during file-scans: Most of these errors are caused by out of range x/y-dims. Triggering un unhandled exception, metadata-generation aborts at this point (e.g. occ files:scan --generate-metadata), effectively preventing these images from being added to photos or maps. This problem might be the root cause for an issue described here: https://github.com/nextcloud/photos/issues/2768 Signed-off-by: umgfoin --- lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php index 66976601f4e84..4e4232768f82d 100644 --- a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php +++ b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php @@ -115,7 +115,7 @@ private function resizedImageFromFile(File $file): GdImage|false { $newX = intval($currX * $newY / $currY); } - $newImage = imagescale($image, $newX, $newY); + $newImage = @imagescale($image, $newX, $newY); return ($newImage !== false) ? $newImage : $image; }