aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorumgfoin <umgfoin@users.noreply.github.com>2025-03-12 12:22:49 +0100
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2025-03-26 09:02:19 +0000
commit64587d67fb86f2dd3187c5fc679357a7283c123f (patch)
tree0c35710e8921c384cacc90f005392b88755b1e20
parentec4187c7454892dd2bda554463bf4e4656564151 (diff)
downloadnextcloud-server-backport/51433/stable29.tar.gz
nextcloud-server-backport/51433/stable29.zip
fix(GenerateBlurhashMetadata): Suppress imagescale errorsbackport/51433/stable29
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 <umgfoin@users.noreply.github.com>
-rw-r--r--lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php
index 66976601f4e..4e4232768f8 100644
--- a/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php
+++ b/lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php
@@ -115,7 +115,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;
}