mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 15:17:36 +00:00
LibGfx: Remove ImageDecoderPlugin::bitmap() in favor of frame(index)
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:
parent
750f1d580a
commit
2b866e3c9b
22 changed files with 105 additions and 155 deletions
|
@ -126,21 +126,6 @@ IntSize PPMImageDecoderPlugin::size()
|
|||
return { m_context->width, m_context->height };
|
||||
}
|
||||
|
||||
RefPtr<Gfx::Bitmap> PPMImageDecoderPlugin::bitmap()
|
||||
{
|
||||
if (m_context->state == PPMLoadingContext::State::Error)
|
||||
return nullptr;
|
||||
|
||||
if (m_context->state < PPMLoadingContext::State::Decoded) {
|
||||
bool success = decode(*m_context);
|
||||
if (!success)
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
VERIFY(m_context->bitmap);
|
||||
return m_context->bitmap;
|
||||
}
|
||||
|
||||
void PPMImageDecoderPlugin::set_volatile()
|
||||
{
|
||||
if (m_context->bitmap)
|
||||
|
@ -188,7 +173,18 @@ ImageFrameDescriptor PPMImageDecoderPlugin::frame(size_t i)
|
|||
{
|
||||
if (i > 0)
|
||||
return {};
|
||||
return { bitmap(), 0 };
|
||||
|
||||
if (m_context->state == PPMLoadingContext::State::Error)
|
||||
return {};
|
||||
|
||||
if (m_context->state < PPMLoadingContext::State::Decoded) {
|
||||
bool success = decode(*m_context);
|
||||
if (!success)
|
||||
return {};
|
||||
}
|
||||
|
||||
VERIFY(m_context->bitmap);
|
||||
return { m_context->bitmap, 0 };
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue