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:49 +0000
commiteb97cfe75535c74ee4d6ce91241622ac70f74e09 (patch)
tree7fd3fefa539061b8d6cdba17c10a0cd86924d098
parent927739cb2b689163f2b3e4f3e9b266dd6f0f0b36 (diff)
downloadnextcloud-server-backport/51433/stable31.tar.gz
nextcloud-server-backport/51433/stable31.zip
fix(GenerateBlurhashMetadata): Suppress imagescale errorsbackport/51433/stable31
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 b84dd61fc5f..16f63594f19 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;
}