diff options
author | Andreas Kling <kling@serenityos.org> | 2021-11-20 14:29:33 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-11-21 20:22:48 +0100 |
commit | 5a79c69b0216f070b07d8238e4c2c7e3420faeec (patch) | |
tree | a88ee6dff60c34b27f383d36a4dfd3ba4b11c482 /Userland/Libraries/LibGfx/JPGLoader.cpp | |
parent | ae7656072a403f69607109d941aa0c4b6274f60c (diff) | |
download | serenity-5a79c69b0216f070b07d8238e4c2c7e3420faeec.zip |
LibGfx: Make ImageDecoderPlugin::frame() return ErrorOr<>
This is a first step towards better error propagation from image codecs.
Diffstat (limited to 'Userland/Libraries/LibGfx/JPGLoader.cpp')
-rw-r--r-- | Userland/Libraries/LibGfx/JPGLoader.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Userland/Libraries/LibGfx/JPGLoader.cpp b/Userland/Libraries/LibGfx/JPGLoader.cpp index c32dac6cec..650684bf88 100644 --- a/Userland/Libraries/LibGfx/JPGLoader.cpp +++ b/Userland/Libraries/LibGfx/JPGLoader.cpp @@ -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 }; } } |