From 36aa350d9ee9af13c897b735cd78efedd9543ba8 Mon Sep 17 00:00:00 2001 From: umgfoin Date: Wed, 12 Mar 2025 12:22:49 +0100 Subject: 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 b8ae716ebf9..e633c1645a5 100644 --- a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php +++ b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php @@ -98,7 +98,7 @@ class GenerateBlurhashMetadata implements IEventListener { $newX = intval($currX * $newY / $currY); } - $newImage = imagescale($image, $newX, $newY); + $newImage = @imagescale($image, $newX, $newY); return ($newImage !== false) ? $newImage : $image; } -- cgit v1.2.3