Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-09 17:44:56 +09:00
Code Activity

LibGfx: Make ImageDecoderPlugin::frame() return ErrorOr<>

Browse source 
This is a first step towards better error propagation from image codecs.
This commit is contained in:
Andreas Kling 2021-11-20 14:29:33 +01:00
parent ae7656072a
commit 5a79c69b02
Notes: sideshowbarker 2024-07-18 00:54:14 +09:00
26 changed files with 101 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Userland/Libraries/LibGfx/ICOLoader.cpp
View file

@ -263,11 +263,12 @@ static bool load_ico_bitmap(ICOLoadingContext& context, Optional<size_t> index)
PNGImageDecoderPlugin png_decoder(context.data + desc.offset, desc.size);
if (png_decoder.sniff()) {
desc.bitmap = png_decoder.frame(0).image;
if (!desc.bitmap) {
auto decoded_png_frame = png_decoder.frame(0);
if (!decoded_png_frame.is_error() || !decoded_png_frame.value().image) {
dbgln_if(ICO_DEBUG, "load_ico_bitmap: failed to load PNG encoded image index: {}", real_index);
return false;
}
desc.bitmap = decoded_png_frame.value().image;
return true;
} else {
if (!load_ico_bmp(context, desc)) {
@ -338,26 +339,26 @@ size_t ICOImageDecoderPlugin::frame_count()
return 1;
}
ImageFrameDescriptor ICOImageDecoderPlugin::frame(size_t i)
ErrorOr<ImageFrameDescriptor> ICOImageDecoderPlugin::frame(size_t index)
{
if (i > 0)
return {};
if (index > 0)
return Error::from_string_literal("ICOImageDecoderPlugin: Invalid frame index"sv);
if (m_context->state == ICOLoadingContext::State::Error)
return {};
return Error::from_string_literal("ICOImageDecoderPlugin: Decoding failed"sv);
if (m_context->state < ICOLoadingContext::State::BitmapDecoded) {
// NOTE: This forces the chunk decoding to happen.
bool success = load_ico_bitmap(*m_context, {});
if (!success) {
m_context->state = ICOLoadingContext::State::Error;
return {};
return Error::from_string_literal("ICOImageDecoderPlugin: Decoding failed"sv);
}
m_context->state = ICOLoadingContext::State::BitmapDecoded;
}
VERIFY(m_context->images[m_context->largest_index].bitmap);
return { m_context->images[m_context->largest_index].bitmap, 0 };
return ImageFrameDescriptor { m_context->images[m_context->largest_index].bitmap, 0 };
}
}