mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 07:27:45 +00:00
LibGfx+Fallout: Make ImageDecoder return ErrorOr
...from try_create_for_raw_bytes(). If a plugin returns `true` from sniff but then fails when calling its `create()` method, we now no longer swallow that error. Allows `image` (and other places in the system) to print a more actionable error if early image headers are invalid. (We now no longer try to find another plugin that can also handle the image.) Fixes a regression from #20063 / #19893 -- before then, we didn't do fallible work this early.
This commit is contained in:
parent
be5e7a360f
commit
2e2cae26c6
12 changed files with 22 additions and 22 deletions
|
@ -341,11 +341,12 @@ void MapWidget::process_tile_queue()
|
|||
m_first_image_loaded = true;
|
||||
|
||||
// Decode loaded PNG image data
|
||||
auto decoder = Gfx::ImageDecoder::try_create_for_raw_bytes(payload, "image/png");
|
||||
if (!decoder || (decoder->frame_count() == 0)) {
|
||||
auto decoder_or_err = Gfx::ImageDecoder::try_create_for_raw_bytes(payload, "image/png");
|
||||
if (decoder_or_err.is_error() || !decoder_or_err.value() || (decoder_or_err.value()->frame_count() == 0)) {
|
||||
dbgln("Maps: Can't decode image: {}", url);
|
||||
return;
|
||||
}
|
||||
auto decoder = decoder_or_err.release_value();
|
||||
m_tiles.set(tile_key, decoder->frame(0).release_value_but_fixme_should_propagate_errors().image);
|
||||
|
||||
// FIXME: only update the part of the screen that this tile covers
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue