RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 23:58:11 +00:00
Code Issues Activity Actions

LibGfx: Remove ImageDecoderPlugin::bitmap() in favor of frame(index)

Browse source 
To encourage proper support for multi-frame images throughout the
system, get rid of the single-frame convenience bitmap() API.
This commit is contained in:
Andreas Kling 2021-11-18 13:47:29 +01:00
parent 750f1d580a
commit 2b866e3c9b
22 changed files with 105 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Userland/Libraries/LibGfx/PNGLoader.cpp
View file

@ -931,22 +931,6 @@ IntSize PNGImageDecoderPlugin::size()
return { m_context->width, m_context->height };
}
RefPtr<Gfx::Bitmap> PNGImageDecoderPlugin::bitmap()
{
if (m_context->state == PNGLoadingContext::State::Error)
return nullptr;
if (m_context->state < PNGLoadingContext::State::BitmapDecoded) {
// NOTE: This forces the chunk decoding to happen.
bool success = decode_png_bitmap(*m_context);
if (!success)
return nullptr;
}
VERIFY(m_context->bitmap);
return m_context->bitmap;
}
void PNGImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
@ -984,7 +968,19 @@ ImageFrameDescriptor PNGImageDecoderPlugin::frame(size_t i)
{
if (i > 0)
return {};
return { bitmap(), 0 };
if (m_context->state == PNGLoadingContext::State::Error)
return {};
if (m_context->state < PNGLoadingContext::State::BitmapDecoded) {
// NOTE: This forces the chunk decoding to happen.
bool success = decode_png_bitmap(*m_context);
if (!success)
return {};
}
VERIFY(m_context->bitmap);
return { m_context->bitmap, 0 };
}
}