From 24087ef6eb8bfc86b40a21954ee94e0094a7d758 Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Sun, 12 Mar 2023 18:45:41 -0400 Subject: [PATCH] LibGfx: Return true from `PortableImageDecoderPlugin::initialize()` Reading the two magic bytes are always done in `decode()` by calling `read_magic_number()`. So no need to read it twice. --- .../ImageFormats/PortableImageMapLoader.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h index 655f836054..df9dda312f 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h @@ -59,7 +59,7 @@ public: virtual void set_volatile() override; [[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override; - virtual bool initialize() override; + virtual bool initialize() override { return true; } virtual bool is_animated() override; virtual size_t loop_count() override; virtual size_t frame_count() override; @@ -111,22 +111,6 @@ bool PortableImageDecoderPlugin::set_nonvolatile(bool& was_purged) return m_context->bitmap->set_nonvolatile(was_purged); } -template -bool PortableImageDecoderPlugin::initialize() -{ - using Context = TContext; - if (m_context->data_size < 2) - return false; - - if (m_context->data[0] == 'P' && m_context->data[1] == Context::FormatDetails::ascii_magic_number) - return true; - - if (m_context->data[0] == 'P' && m_context->data[1] == Context::FormatDetails::binary_magic_number) - return true; - - return false; -} - template ErrorOr> PortableImageDecoderPlugin::create(ReadonlyBytes data) {