Skip to content

[stable30] fix(GenerateBlurhashMetadata): Suppress imagescale errors #51717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 1 commit into from
Mar 28, 2025
Merged

[stable30] fix(GenerateBlurhashMetadata): Suppress imagescale errors #51717

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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:
nextcloud/photos#2768

Signed-off-by: umgfoin <[email protected]>
  • Loading branch information
@umgfoin @AndyScherzinger
umgfoin authored and AndyScherzinger committed Mar 28, 2025
commit 36aa350d9ee9af13c897b735cd78efedd9543ba8
2 changes: 1 addition & 1 deletion lib/private/Blurhash/Listener/GenerateBlurhashMetadata.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,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;
}

Expand Down
Loading