RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 01:17:35 +00:00
Code Issues Activity Actions

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
26 changed files with 101 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibGfx/JPGLoader.cpp
View file

@ -1276,23 +1276,23 @@ size_t JPGImageDecoderPlugin::frame_count()
return 1;
}
ImageFrameDescriptor JPGImageDecoderPlugin::frame(size_t i)
ErrorOr<ImageFrameDescriptor> JPGImageDecoderPlugin::frame(size_t index)
{
if (i > 0)
return {};
if (index > 0)
return Error::from_string_literal("JPGImageDecoderPlugin: Invalid frame index"sv);
if (m_context->state == JPGLoadingContext::State::Error)
return {};
return Error::from_string_literal("JPGImageDecoderPlugin: Decoding failed"sv);
if (m_context->state < JPGLoadingContext::State::BitmapDecoded) {
if (!decode_jpg(*m_context)) {
m_context->state = JPGLoadingContext::State::Error;
return {};
return Error::from_string_literal("JPGImageDecoderPlugin: Decoding failed"sv);
}
m_context->state = JPGLoadingContext::State::BitmapDecoded;
}
return { m_context->bitmap, 0 };
return ImageFrameDescriptor { m_context->bitmap, 0 };
}
}