RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 13:37:44 +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

22
Userland/Libraries/LibGfx/BMPLoader.cpp
View file

@ -1321,18 +1321,6 @@ IntSize BMPImageDecoderPlugin::size()
return { m_context->dib.core.width, abs(m_context->dib.core.height) };
}
RefPtr<Gfx::Bitmap> BMPImageDecoderPlugin::bitmap()
{
if (m_context->state == BMPLoadingContext::State::Error)
return nullptr;
if (m_context->state < BMPLoadingContext::State::PixelDataDecoded && !decode_bmp_pixel_data(*m_context))
return nullptr;
VERIFY(m_context->bitmap);
return m_context->bitmap;
}
void BMPImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
@ -1370,7 +1358,15 @@ ImageFrameDescriptor BMPImageDecoderPlugin::frame(size_t i)
{
if (i > 0)
return {};
return { bitmap(), 0 };
if (m_context->state == BMPLoadingContext::State::Error)
return {};
if (m_context->state < BMPLoadingContext::State::PixelDataDecoded && !decode_bmp_pixel_data(*m_context))
return {};
VERIFY(m_context->bitmap);
return { m_context->bitmap, 0 };
}
}