瀏覽代碼

LibGfx: Provide an implementation for `ImageDecoderPlugin::icc_data()`

Lucas CHOLLET 1 年之前
父節點
當前提交
e721c74598

+ 0 - 5
Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp

@@ -671,9 +671,4 @@ ErrorOr<ImageFrameDescriptor> DDSImageDecoderPlugin::frame(size_t index, Optiona
     return ImageFrameDescriptor { m_context->bitmap, 0 };
     return ImageFrameDescriptor { m_context->bitmap, 0 };
 }
 }
 
 
-ErrorOr<Optional<ReadonlyBytes>> DDSImageDecoderPlugin::icc_data()
-{
-    return OptionalNone {};
-}
-
 }
 }

+ 0 - 1
Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h

@@ -244,7 +244,6 @@ public:
     virtual IntSize size() override;
     virtual IntSize size() override;
 
 
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
-    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override;
 
 
 private:
 private:
     DDSImageDecoderPlugin(FixedMemoryStream);
     DDSImageDecoderPlugin(FixedMemoryStream);

+ 0 - 5
Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp

@@ -644,9 +644,4 @@ ErrorOr<ImageFrameDescriptor> GIFImageDecoderPlugin::frame(size_t index, Optiona
     return frame;
     return frame;
 }
 }
 
 
-ErrorOr<Optional<ReadonlyBytes>> GIFImageDecoderPlugin::icc_data()
-{
-    return OptionalNone {};
-}
-
 }
 }

+ 0 - 1
Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h

@@ -28,7 +28,6 @@ public:
     virtual size_t frame_count() override;
     virtual size_t frame_count() override;
     virtual size_t first_animated_frame_index() override;
     virtual size_t first_animated_frame_index() override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
-    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override;
 
 
 private:
 private:
     GIFImageDecoderPlugin(FixedMemoryStream);
     GIFImageDecoderPlugin(FixedMemoryStream);

+ 0 - 5
Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp

@@ -225,9 +225,4 @@ ErrorOr<ImageFrameDescriptor> ICOImageDecoderPlugin::frame(size_t index, Optiona
     return ImageFrameDescriptor { m_context->images[m_context->largest_index].bitmap, 0 };
     return ImageFrameDescriptor { m_context->images[m_context->largest_index].bitmap, 0 };
 }
 }
 
 
-ErrorOr<Optional<ReadonlyBytes>> ICOImageDecoderPlugin::icc_data()
-{
-    return OptionalNone {};
-}
-
 }
 }

+ 0 - 1
Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h

@@ -22,7 +22,6 @@ public:
     virtual IntSize size() override;
     virtual IntSize size() override;
 
 
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
-    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override;
 
 
 private:
 private:
     ICOImageDecoderPlugin(u8 const*, size_t);
     ICOImageDecoderPlugin(u8 const*, size_t);

+ 0 - 4
Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.cpp

@@ -365,8 +365,4 @@ ErrorOr<ImageFrameDescriptor> ILBMImageDecoderPlugin::frame(size_t index, Option
     return ImageFrameDescriptor { m_context->bitmap, 0 };
     return ImageFrameDescriptor { m_context->bitmap, 0 };
 }
 }
 
 
-ErrorOr<Optional<ReadonlyBytes>> ILBMImageDecoderPlugin::icc_data()
-{
-    return OptionalNone {};
-}
 }
 }

+ 0 - 1
Userland/Libraries/LibGfx/ImageFormats/ILBMLoader.h

@@ -20,7 +20,6 @@ public:
     virtual ~ILBMImageDecoderPlugin() override;
     virtual ~ILBMImageDecoderPlugin() override;
 
 
     virtual IntSize size() override;
     virtual IntSize size() override;
-    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override;
 
 
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
 
 

+ 1 - 1
Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h

@@ -51,7 +51,7 @@ public:
     virtual size_t first_animated_frame_index() { return 0; }
     virtual size_t first_animated_frame_index() { return 0; }
 
 
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) = 0;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) = 0;
-    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() = 0;
+    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() { return OptionalNone {}; }
 
 
     virtual bool is_vector() { return false; }
     virtual bool is_vector() { return false; }
     virtual ErrorOr<VectorImageFrameDescriptor> vector_frame(size_t) { VERIFY_NOT_REACHED(); }
     virtual ErrorOr<VectorImageFrameDescriptor> vector_frame(size_t) { VERIFY_NOT_REACHED(); }

+ 0 - 7
Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h

@@ -61,7 +61,6 @@ public:
     virtual IntSize size() override;
     virtual IntSize size() override;
 
 
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
-    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override;
 
 
 private:
 private:
     PortableImageDecoderPlugin(NonnullOwnPtr<SeekableStream> stream);
     PortableImageDecoderPlugin(NonnullOwnPtr<SeekableStream> stream);
@@ -126,10 +125,4 @@ ErrorOr<ImageFrameDescriptor> PortableImageDecoderPlugin<TContext>::frame(size_t
     return ImageFrameDescriptor { m_context->bitmap, 0 };
     return ImageFrameDescriptor { m_context->bitmap, 0 };
 }
 }
 
 
-template<typename TContext>
-ErrorOr<Optional<ReadonlyBytes>> PortableImageDecoderPlugin<TContext>::icc_data()
-{
-    return OptionalNone {};
-}
-
 }
 }

+ 0 - 5
Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp

@@ -224,9 +224,4 @@ ErrorOr<void> QOIImageDecoderPlugin::decode_image_and_update_context()
     return {};
     return {};
 }
 }
 
 
-ErrorOr<Optional<ReadonlyBytes>> QOIImageDecoderPlugin::icc_data()
-{
-    return OptionalNone {};
-}
-
 }
 }

+ 0 - 1
Userland/Libraries/LibGfx/ImageFormats/QOILoader.h

@@ -46,7 +46,6 @@ public:
     virtual IntSize size() override;
     virtual IntSize size() override;
 
 
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
-    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override;
 
 
 private:
 private:
     ErrorOr<void> decode_header_and_update_context();
     ErrorOr<void> decode_header_and_update_context();

+ 0 - 5
Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp

@@ -237,9 +237,4 @@ ErrorOr<ImageFrameDescriptor> TGAImageDecoderPlugin::frame(size_t index, Optiona
     return ImageFrameDescriptor { m_context->bitmap, 0 };
     return ImageFrameDescriptor { m_context->bitmap, 0 };
 }
 }
 
 
-ErrorOr<Optional<ReadonlyBytes>> TGAImageDecoderPlugin::icc_data()
-{
-    return OptionalNone {};
-}
-
 }
 }

+ 0 - 1
Userland/Libraries/LibGfx/ImageFormats/TGALoader.h

@@ -22,7 +22,6 @@ public:
     virtual IntSize size() override;
     virtual IntSize size() override;
 
 
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
-    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override;
 
 
 private:
 private:
     TGAImageDecoderPlugin(NonnullOwnPtr<TGALoadingContext>);
     TGAImageDecoderPlugin(NonnullOwnPtr<TGALoadingContext>);

+ 0 - 1
Userland/Libraries/LibGfx/ImageFormats/TinyVGLoader.h

@@ -82,7 +82,6 @@ public:
 
 
     virtual IntSize size() override;
     virtual IntSize size() override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
     virtual ErrorOr<ImageFrameDescriptor> frame(size_t index, Optional<IntSize> ideal_size = {}) override;
-    virtual ErrorOr<Optional<ReadonlyBytes>> icc_data() override { return OptionalNone {}; }
 
 
     virtual bool is_vector() override { return true; }
     virtual bool is_vector() override { return true; }
     virtual ErrorOr<VectorImageFrameDescriptor> vector_frame(size_t index) override;
     virtual ErrorOr<VectorImageFrameDescriptor> vector_frame(size_t index) override;