diff --git a/Libraries/LibGfx/Bitmap.cpp b/Libraries/LibGfx/Bitmap.cpp index efbb6622188..b4f97b4bbd7 100644 --- a/Libraries/LibGfx/Bitmap.cpp +++ b/Libraries/LibGfx/Bitmap.cpp @@ -7,16 +7,8 @@ */ #include -#include #include -#include -#include -#include -#include -#include -#include #include -#include #include #include @@ -105,30 +97,6 @@ ErrorOr> Bitmap::create_wrapper(BitmapFormat format, Alpha return adopt_ref(*new Bitmap(format, alpha_type, size, pitch, data, move(destruction_callback))); } -ErrorOr> Bitmap::load_from_file(StringView path, Optional ideal_size) -{ - auto file = TRY(Core::File::open(path, Core::File::OpenMode::Read)); - return load_from_file(move(file), path, ideal_size); -} - -ErrorOr> Bitmap::load_from_file(NonnullOwnPtr file, StringView path, Optional ideal_size) -{ - auto mapped_file = TRY(Core::MappedFile::map_from_file(move(file), path)); - auto mime_type = Core::guess_mime_type_based_on_filename(path); - return load_from_bytes(mapped_file->bytes(), ideal_size, mime_type); -} - -ErrorOr> Bitmap::load_from_bytes(ReadonlyBytes bytes, Optional ideal_size, Optional mine_type) -{ - if (auto decoder = TRY(ImageDecoder::try_create_for_raw_bytes(bytes, mine_type))) { - auto frame = TRY(decoder->frame(0, ideal_size)); - if (auto& bitmap = frame.image) - return bitmap.release_nonnull(); - } - - return Error::from_string_literal("Gfx::Bitmap unable to load from file"); -} - Bitmap::Bitmap(BitmapFormat format, AlphaType alpha_type, IntSize size, size_t pitch, void* data, Function&& destruction_callback) : m_size(size) , m_data(data) diff --git a/Libraries/LibGfx/Bitmap.h b/Libraries/LibGfx/Bitmap.h index e83a65feb9f..5bd90592874 100644 --- a/Libraries/LibGfx/Bitmap.h +++ b/Libraries/LibGfx/Bitmap.h @@ -7,11 +7,9 @@ #pragma once -#include #include #include #include -#include #include #include #include @@ -70,9 +68,6 @@ public: [[nodiscard]] static ErrorOr> create(BitmapFormat, AlphaType, IntSize); [[nodiscard]] static ErrorOr> create_shareable(BitmapFormat, AlphaType, IntSize); [[nodiscard]] static ErrorOr> create_wrapper(BitmapFormat, AlphaType, IntSize, size_t pitch, void*, Function&& destruction_callback = {}); - [[nodiscard]] static ErrorOr> load_from_file(StringView path, Optional ideal_size = {}); - [[nodiscard]] static ErrorOr> load_from_file(NonnullOwnPtr, StringView path, Optional ideal_size = {}); - [[nodiscard]] static ErrorOr> load_from_bytes(ReadonlyBytes, Optional ideal_size = {}, Optional mine_type = {}); [[nodiscard]] static ErrorOr> create_with_anonymous_buffer(BitmapFormat, AlphaType, Core::AnonymousBuffer, IntSize); ErrorOr> clone() const;