RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:17:44 +00:00
Code Issues Activity Actions

LibGfx/QOI: Decode the header in create() and remove initialize()

Browse source 
This is done as a part of #19893.
This commit is contained in:
Lucas CHOLLET 2023-07-13 23:21:39 -04:00 • committed by Andreas Kling
parent 5fd1ee0365
commit b14d51ba1b
2 changed files with 5 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp
View file

@ -170,23 +170,9 @@ QOIImageDecoderPlugin::QOIImageDecoderPlugin(NonnullOwnPtr<Stream> stream)
IntSize QOIImageDecoderPlugin::size() IntSize QOIImageDecoderPlugin::size()
{ {
if (m_context->state < QOILoadingContext::State::HeaderDecoded) {
// FIXME: This is a weird API (inherited from ImageDecoderPlugin), should probably propagate errors by returning ErrorOr<IntSize>.
// For the time being, ignore the result and rely on the context's state.
(void)decode_header_and_update_context();
}
if (m_context->state == QOILoadingContext::State::Error)
return {};
return { m_context->header.width, m_context->header.height }; return { m_context->header.width, m_context->header.height };
} }
ErrorOr<void> QOIImageDecoderPlugin::initialize()
{
return decode_header_and_update_context();
}
bool QOIImageDecoderPlugin::sniff(ReadonlyBytes data) bool QOIImageDecoderPlugin::sniff(ReadonlyBytes data)
{ {
FixedMemoryStream stream { { data.data(), data.size() } }; FixedMemoryStream stream { { data.data(), data.size() } };
@ -196,7 +182,9 @@ bool QOIImageDecoderPlugin::sniff(ReadonlyBytes data)
ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> QOIImageDecoderPlugin::create(ReadonlyBytes data) ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> QOIImageDecoderPlugin::create(ReadonlyBytes data)
{ {
auto stream = TRY(try_make<FixedMemoryStream>(data)); auto stream = TRY(try_make<FixedMemoryStream>(data));
return adopt_nonnull_own_or_enomem(new (nothrow) QOIImageDecoderPlugin(move(stream))); auto plugin = TRY(adopt_nonnull_own_or_enomem(new (nothrow) QOIImageDecoderPlugin(move(stream))));
TRY(plugin->decode_header_and_update_context());
return plugin;
} }
ErrorOr<ImageFrameDescriptor> QOIImageDecoderPlugin::frame(size_t index, Optional<IntSize>) ErrorOr<ImageFrameDescriptor> QOIImageDecoderPlugin::frame(size_t index, Optional<IntSize>)
@ -207,12 +195,8 @@ ErrorOr<ImageFrameDescriptor> QOIImageDecoderPlugin::frame(size_t index, Optiona
// No one should try to decode the frame again after an error was already returned. // No one should try to decode the frame again after an error was already returned.
VERIFY(m_context->state != QOILoadingContext::State::Error); VERIFY(m_context->state != QOILoadingContext::State::Error);
if (m_context->state == QOILoadingContext::State::NotDecoded) { if (m_context->state == QOILoadingContext::State::HeaderDecoded)
TRY(decode_header_and_update_context());
TRY(decode_image_and_update_context()); TRY(decode_image_and_update_context());
} else if (m_context->state == QOILoadingContext::State::HeaderDecoded) {
TRY(decode_image_and_update_context());
}
VERIFY(m_context->state == QOILoadingContext::State::ImageDecoded); VERIFY(m_context->state == QOILoadingContext::State::ImageDecoded);
VERIFY(m_context->bitmap); VERIFY(m_context->bitmap);
@ -222,13 +206,8 @@ ErrorOr<ImageFrameDescriptor> QOIImageDecoderPlugin::frame(size_t index, Optiona
ErrorOr<void> QOIImageDecoderPlugin::decode_header_and_update_context() ErrorOr<void> QOIImageDecoderPlugin::decode_header_and_update_context()
{ {
VERIFY(m_context->state < QOILoadingContext::State::HeaderDecoded); VERIFY(m_context->state < QOILoadingContext::State::HeaderDecoded);
auto error_or_header = decode_qoi_header(*m_context->stream); m_context->header = TRY(decode_qoi_header(*m_context->stream));
if (error_or_header.is_error()) {
m_context->state = QOILoadingContext::State::Error;
return error_or_header.release_error();
}
m_context->state = QOILoadingContext::State::HeaderDecoded; m_context->state = QOILoadingContext::State::HeaderDecoded;
m_context->header = error_or_header.release_value();
return {}; return {};
} }

1
Userland/Libraries/LibGfx/ImageFormats/QOILoader.h
View file

@ -45,7 +45,6 @@ public:
virtual IntSize size() override; virtual IntSize size() override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override { return false; } virtual bool is_animated() override { return false; }
virtual size_t loop_count() override { return 0; } virtual size_t loop_count() override { return 0; }
virtual size_t frame_count() override { return 1; } virtual size_t frame_count() override { return 1; }