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

LibGfx: Use common class template for PBM/PGM/PPM image loaders

Browse source 
PBM, PGM, and PPM image loaders are mostly common. The only difference
is how the data is read and the associated magic numbers. The magic
numbers are already made common using the loading contexts. Now make
the implementations common via a class template which accepts the
context to disambiguate.
This commit is contained in:
Lenny Maiorani 2022-03-13 11:58:58 -06:00 • committed by Andreas Kling
parent 786b02730c
commit 6a23dfbc92
7 changed files with 123 additions and 327 deletions
Download patch file Download diff file Expand all files Collapse all files

89
Userland/Libraries/LibGfx/PGMLoader.cpp
View file

@ -28,7 +28,7 @@ static void set_adjusted_pixels(PGMLoadingContext& context, const Vector<Gfx::Co
}
}
static bool read_image_data(PGMLoadingContext& context, Streamer& streamer)
bool read_image_data(PGMLoadingContext& context, Streamer& streamer)
{
Vector<Gfx::Color> color_data;
@ -65,91 +65,4 @@ static bool read_image_data(PGMLoadingContext& context, Streamer& streamer)
context.state = PGMLoadingContext::State::Bitmap;
return true;
}
PGMImageDecoderPlugin::PGMImageDecoderPlugin(const u8* data, size_t size)
{
m_context = make<PGMLoadingContext>();
m_context->data = data;
m_context->data_size = size;
}
PGMImageDecoderPlugin::~PGMImageDecoderPlugin()
{
}
IntSize PGMImageDecoderPlugin::size()
{
if (m_context->state == PGMLoadingContext::State::Error)
return {};
if (m_context->state < PGMLoadingContext::State::Decoded) {
bool success = decode(*m_context);
if (!success)
return {};
}
return { m_context->width, m_context->height };
}
void PGMImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
m_context->bitmap->set_volatile();
}
bool PGMImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->bitmap)
return false;
return m_context->bitmap->set_nonvolatile(was_purged);
}
bool PGMImageDecoderPlugin::sniff()
{
if (m_context->data_size < 2)
return false;
if (m_context->data[0] == 'P' && m_context->data[1] == '2')
return true;
if (m_context->data[0] == 'P' && m_context->data[1] == '5')
return true;
return false;
}
bool PGMImageDecoderPlugin::is_animated()
{
return false;
}
size_t PGMImageDecoderPlugin::loop_count()
{
return 0;
}
size_t PGMImageDecoderPlugin::frame_count()
{
return 1;
}
ErrorOr<ImageFrameDescriptor> PGMImageDecoderPlugin::frame(size_t index)
{
if (index > 0)
return Error::from_string_literal("PGMImageDecoderPlugin: Invalid frame index"sv);
if (m_context->state == PGMLoadingContext::State::Error)
return Error::from_string_literal("PGMImageDecoderPlugin: Decoding failed"sv);
if (m_context->state < PGMLoadingContext::State::Decoded) {
bool success = decode(*m_context);
if (!success)
return Error::from_string_literal("PGMImageDecoderPlugin: Decoding failed"sv);
}
VERIFY(m_context->bitmap);
return ImageFrameDescriptor { m_context->bitmap, 0 };
}
}