diff --git a/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp index 37eb965aea..c3890b6bc9 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp @@ -671,9 +671,4 @@ ErrorOr DDSImageDecoderPlugin::frame(size_t index, Optiona return ImageFrameDescriptor { m_context->bitmap, 0 }; } -ErrorOr> DDSImageDecoderPlugin::icc_data() -{ - return OptionalNone {}; -} - } diff --git a/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h index c8b0f33b13..69b46476b6 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h @@ -244,7 +244,6 @@ public: virtual IntSize size() override; virtual ErrorOr frame(size_t index, Optional ideal_size = {}) override; - virtual ErrorOr> icc_data() override; private: DDSImageDecoderPlugin(FixedMemoryStream); diff --git a/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp index c4c8a1181e..4cca71057c 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp @@ -644,9 +644,4 @@ ErrorOr GIFImageDecoderPlugin::frame(size_t index, Optiona return frame; } -ErrorOr> GIFImageDecoderPlugin::icc_data() -{ - return OptionalNone {}; -} - } diff --git a/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h index 0d5b0738dd..d44569fa22 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h @@ -28,7 +28,6 @@ public: virtual size_t frame_count() override; virtual size_t first_animated_frame_index() override; virtual ErrorOr frame(size_t index, Optional ideal_size = {}) override; - virtual ErrorOr> icc_data() override; private: GIFImageDecoderPlugin(FixedMemoryStream); diff --git a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp index bc1ad786e5..e9180e2432 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp @@ -225,9 +225,4 @@ ErrorOr ICOImageDecoderPlugin::frame(size_t index, Optiona return ImageFrameDescriptor { m_context->images[m_context->largest_index].bitmap, 0 }; } -ErrorOr> ICOImageDecoderPlugin::icc_data() -{ - return OptionalNone {}; -} - } diff --git a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h index 6580e57086..03c15304b5 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h @@ -22,7 +22,6 @@ public: virtual IntSize size() override; virtual ErrorOr frame(size_t index, Optional ideal_size = {}) override; - virtual ErrorOr> icc_data() override; private: ICOImageDecoderPlugin(u8 const*, size_t); diff --git a/Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.cpp index 3243b85694..119a5fd866 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.cpp @@ -365,8 +365,4 @@ ErrorOr ILBMImageDecoderPlugin::frame(size_t index, Option return ImageFrameDescriptor { m_context->bitmap, 0 }; } -ErrorOr> ILBMImageDecoderPlugin::icc_data() -{ - return OptionalNone {}; -} } diff --git a/Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.h b/Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.h index db3a4d5eb7..29c8fd70df 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.h @@ -20,7 +20,6 @@ public: virtual ~ILBMImageDecoderPlugin() override; virtual IntSize size() override; - virtual ErrorOr> icc_data() override; virtual ErrorOr frame(size_t index, Optional ideal_size = {}) override; diff --git a/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h b/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h index 466e4da524..aa15dfeb88 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h +++ b/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h @@ -51,7 +51,7 @@ public: virtual size_t first_animated_frame_index() { return 0; } virtual ErrorOr frame(size_t index, Optional ideal_size = {}) = 0; - virtual ErrorOr> icc_data() = 0; + virtual ErrorOr> icc_data() { return OptionalNone {}; } virtual bool is_vector() { return false; } virtual ErrorOr vector_frame(size_t) { VERIFY_NOT_REACHED(); } diff --git a/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h index 21199a63fd..ab3b393c08 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h @@ -61,7 +61,6 @@ public: virtual IntSize size() override; virtual ErrorOr frame(size_t index, Optional ideal_size = {}) override; - virtual ErrorOr> icc_data() override; private: PortableImageDecoderPlugin(NonnullOwnPtr stream); @@ -126,10 +125,4 @@ ErrorOr PortableImageDecoderPlugin::frame(size_t return ImageFrameDescriptor { m_context->bitmap, 0 }; } -template -ErrorOr> PortableImageDecoderPlugin::icc_data() -{ - return OptionalNone {}; -} - } diff --git a/Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp index 4ae923adff..8ca7442887 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp @@ -224,9 +224,4 @@ ErrorOr QOIImageDecoderPlugin::decode_image_and_update_context() return {}; } -ErrorOr> QOIImageDecoderPlugin::icc_data() -{ - return OptionalNone {}; -} - } diff --git a/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h index 4afbaf1d14..bb9a034d2f 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h @@ -46,7 +46,6 @@ public: virtual IntSize size() override; virtual ErrorOr frame(size_t index, Optional ideal_size = {}) override; - virtual ErrorOr> icc_data() override; private: ErrorOr decode_header_and_update_context(); diff --git a/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp index 088d570d10..32746f54a6 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp @@ -237,9 +237,4 @@ ErrorOr TGAImageDecoderPlugin::frame(size_t index, Optiona return ImageFrameDescriptor { m_context->bitmap, 0 }; } -ErrorOr> TGAImageDecoderPlugin::icc_data() -{ - return OptionalNone {}; -} - } diff --git a/Userland/Libraries/LibGfx/ImageFormats/TGALoader.h b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.h index 129a3e848f..ddcb25d8ad 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/TGALoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.h @@ -22,7 +22,6 @@ public: virtual IntSize size() override; virtual ErrorOr frame(size_t index, Optional ideal_size = {}) override; - virtual ErrorOr> icc_data() override; private: TGAImageDecoderPlugin(NonnullOwnPtr); diff --git a/Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h b/Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h index e41d4e89ca..76c49d9d10 100644 --- a/Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h @@ -82,7 +82,6 @@ public: virtual IntSize size() override; virtual ErrorOr frame(size_t index, Optional ideal_size = {}) override; - virtual ErrorOr> icc_data() override { return OptionalNone {}; } virtual bool is_vector() override { return true; } virtual ErrorOr vector_frame(size_t index) override;