0ct0pu5/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions2

LibGfx: Remove ImageDecoder::set_[non]volatile()

Browse source 
These methods are unused so let's remove them.
This commit is contained in:
Lucas CHOLLET 2023-07-07 18:37:46 -04:00 • committed by Linus Groh
parent 210448b6ed
commit e5b70837de
Notes: sideshowbarker 2024-07-17 08:38:37 +09:00
22 changed files with 9 additions and 175 deletions

13
Userland/Libraries/LibGfx/ImageFormats/BMPLoader.cpp
View file

@ -1487,19 +1487,6 @@ IntSize BMPImageDecoderPlugin::size()
return { m_context->dib.core.width, abs(m_context->dib.core.height) };
}
void BMPImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
m_context->bitmap->set_volatile();
}
bool BMPImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->bitmap)
return false;
return m_context->bitmap->set_nonvolatile(was_purged);
}
ErrorOr<void> BMPImageDecoderPlugin::initialize()
{
return decode_bmp_header(*m_context);

3
Userland/Libraries/LibGfx/ImageFormats/BMPLoader.h
View file

@ -28,8 +28,7 @@ public:
virtual ~BMPImageDecoderPlugin() override;
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override;
bool sniff_dib();
virtual bool is_animated() override;

13
Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp
View file

@ -632,19 +632,6 @@ IntSize DDSImageDecoderPlugin::size()
return {};
}
void DDSImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
m_context->bitmap->set_volatile();
}
bool DDSImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->bitmap)
return false;
return m_context->bitmap->set_nonvolatile(was_purged);
}
ErrorOr<void> DDSImageDecoderPlugin::initialize()
{
// The header is always at least 128 bytes, so if the file is smaller, it can't be a DDS.

3
Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h
View file

@ -241,8 +241,7 @@ public:
virtual ~DDSImageDecoderPlugin() override;
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override;
virtual size_t loop_count() override;

14
Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp
View file

@ -548,20 +548,6 @@ IntSize GIFImageDecoderPlugin::size()
return { m_context->logical_screen.width, m_context->logical_screen.height };
}
void GIFImageDecoderPlugin::set_volatile()
{
if (m_context->frame_buffer) {
m_context->frame_buffer->set_volatile();
}
}
bool GIFImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->frame_buffer)
return false;
return m_context->frame_buffer->set_nonvolatile(was_purged);
}
ErrorOr<void> GIFImageDecoderPlugin::initialize()
{
FixedMemoryStream stream { { m_context->data, m_context->data_size } };

3
Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h
View file

@ -21,8 +21,7 @@ public:
virtual ~GIFImageDecoderPlugin() override;
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override;
virtual size_t loop_count() override;

13
Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
View file

@ -215,19 +215,6 @@ IntSize ICOImageDecoderPlugin::size()
return { m_context->images[m_context->largest_index].width, m_context->images[m_context->largest_index].height };
}
void ICOImageDecoderPlugin::set_volatile()
{
if (m_context->images[0].bitmap)
m_context->images[0].bitmap->set_volatile();
}
bool ICOImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->images[0].bitmap)
return false;
return m_context->images[0].bitmap->set_nonvolatile(was_purged);
}
ErrorOr<void> ICOImageDecoderPlugin::initialize()
{
FixedMemoryStream stream { { m_context->data, m_context->data_size } };

3
Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h
View file

@ -20,8 +20,7 @@ public:
virtual ~ICOImageDecoderPlugin() override;
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override;
virtual size_t loop_count() override;

5
Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h
View file

@ -31,9 +31,6 @@ public:
virtual IntSize size() = 0;
virtual void set_volatile() = 0;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) = 0;
virtual ErrorOr<void> initialize() = 0;
virtual bool is_animated() = 0;
@ -55,8 +52,6 @@ public:
IntSize size() const { return m_plugin->size(); }
int width() const { return size().width(); }
int height() const { return size().height(); }
void set_volatile() { m_plugin->set_volatile(); }
[[nodiscard]] bool set_nonvolatile(bool& was_purged) { return m_plugin->set_nonvolatile(was_purged); }
bool is_animated() const { return m_plugin->is_animated(); }
size_t loop_count() const { return m_plugin->loop_count(); }
size_t frame_count() const { return m_plugin->frame_count(); }

13
Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp
View file

@ -1931,19 +1931,6 @@ IntSize JPEGImageDecoderPlugin::size()
return {};
}
void JPEGImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
m_context->bitmap->set_volatile();
}
bool JPEGImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->bitmap)
return false;
return m_context->bitmap->set_nonvolatile(was_purged);
}
ErrorOr<void> JPEGImageDecoderPlugin::initialize()
{
return {};

3
Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h
View file

@ -23,8 +23,7 @@ public:
virtual ~JPEGImageDecoderPlugin() override;
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override;
virtual size_t loop_count() override;

13
Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp
View file

@ -1309,19 +1309,6 @@ IntSize PNGImageDecoderPlugin::size()
return { m_context->width, m_context->height };
}
void PNGImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
m_context->bitmap->set_volatile();
}
bool PNGImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->bitmap)
return false;
return m_context->bitmap->set_nonvolatile(was_purged);
}
ErrorOr<void> PNGImageDecoderPlugin::initialize()
{
if (decode_png_header(*m_context))

3
Userland/Libraries/LibGfx/ImageFormats/PNGLoader.h
View file

@ -20,8 +20,7 @@ public:
virtual ~PNGImageDecoderPlugin() override;
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override;
virtual size_t loop_count() override;

19
Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h
View file

@ -64,9 +64,6 @@ public:
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override { return {}; }
virtual bool is_animated() override;
virtual size_t loop_count() override;
@ -104,22 +101,6 @@ IntSize PortableImageDecoderPlugin<TContext>::size()
return { m_context->width, m_context->height };
}
template<typename TContext>
void PortableImageDecoderPlugin<TContext>::set_volatile()
{
if (m_context->bitmap)
m_context->bitmap->set_volatile();
}
template<typename TContext>
bool PortableImageDecoderPlugin<TContext>::set_nonvolatile(bool& was_purged)
{
if (!m_context->bitmap)
return false;
return m_context->bitmap->set_nonvolatile(was_purged);
}
template<typename TContext>
ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> PortableImageDecoderPlugin<TContext>::create(ReadonlyBytes data)
{

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

@ -182,19 +182,6 @@ IntSize QOIImageDecoderPlugin::size()
return { m_context->header.width, m_context->header.height };
}
void QOIImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
m_context->bitmap->set_volatile();
}
bool QOIImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->bitmap)
return false;
return m_context->bitmap->set_nonvolatile(was_purged);
}
ErrorOr<void> QOIImageDecoderPlugin::initialize()
{
return decode_header_and_update_context(*m_context->stream);

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

@ -44,8 +44,7 @@ public:
virtual ~QOIImageDecoderPlugin() override = default;
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override { return false; }
virtual size_t loop_count() override { return 0; }

13
Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp
View file

@ -174,19 +174,6 @@ IntSize TGAImageDecoderPlugin::size()
return IntSize { m_context->header.width, m_context->header.height };
}
void TGAImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
m_context->bitmap->set_volatile();
}
bool TGAImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->bitmap)
return false;
return m_context->bitmap->set_nonvolatile(was_purged);
}
bool TGAImageDecoderPlugin::decode_tga_header()
{
auto& reader = m_context->reader;

3
Userland/Libraries/LibGfx/ImageFormats/TGALoader.h
View file

@ -21,8 +21,7 @@ public:
TGAImageDecoderPlugin(u8 const*, size_t);
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override;
virtual size_t loop_count() override;

13
Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.cpp
View file

@ -504,19 +504,6 @@ IntSize TinyVGImageDecoderPlugin::size()
return {};
}
void TinyVGImageDecoderPlugin::set_volatile()
{
if (m_context.bitmap)
m_context.bitmap->set_volatile();
}
bool TinyVGImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context.bitmap)
return false;
return m_context.bitmap->set_nonvolatile(was_purged);
}
ErrorOr<void> TinyVGImageDecoderPlugin::initialize()
{
FixedMemoryStream stream { { m_context.data.data(), m_context.data.size() } };

2
Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h
View file

@ -81,8 +81,6 @@ public:
static ErrorOr<NonnullOwnPtr<ImageDecoderPlugin>> create(ReadonlyBytes);
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool&) override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override { return false; }
virtual size_t loop_count() override { return 0; }

13
Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp
View file

@ -722,19 +722,6 @@ IntSize WebPImageDecoderPlugin::size()
return m_context->size.value();
}
void WebPImageDecoderPlugin::set_volatile()
{
if (m_context->bitmap)
m_context->bitmap->set_volatile();
}
bool WebPImageDecoderPlugin::set_nonvolatile(bool& was_purged)
{
if (!m_context->bitmap)
return false;
return m_context->bitmap->set_nonvolatile(was_purged);
}
ErrorOr<void> WebPImageDecoderPlugin::initialize()
{
auto header_okay_or_error = decode_webp_header(*m_context);

3
Userland/Libraries/LibGfx/ImageFormats/WebPLoader.h
View file

@ -20,8 +20,7 @@ public:
virtual ~WebPImageDecoderPlugin() override;
virtual IntSize size() override;
virtual void set_volatile() override;
[[nodiscard]] virtual bool set_nonvolatile(bool& was_purged) override;
virtual ErrorOr<void> initialize() override;
virtual bool is_animated() override;
virtual size_t loop_count() override;