diff options
Diffstat (limited to 'Userland/Libraries/LibGfx')
-rw-r--r-- | Userland/Libraries/LibGfx/Bitmap.cpp | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibGfx/BitmapFont.cpp | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGfx/BitmapFont.h | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibGfx/Font.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibGfx/TrueTypeFont/Font.cpp | 4 | ||||
-rw-r--r-- | Userland/Libraries/LibGfx/TrueTypeFont/Font.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/Userland/Libraries/LibGfx/Bitmap.cpp b/Userland/Libraries/LibGfx/Bitmap.cpp index 06f2afe419..32ff60175c 100644 --- a/Userland/Libraries/LibGfx/Bitmap.cpp +++ b/Userland/Libraries/LibGfx/Bitmap.cpp @@ -6,13 +6,13 @@ #include <AK/Checked.h> #include <AK/LexicalPath.h> -#include <AK/MappedFile.h> #include <AK/Memory.h> #include <AK/MemoryStream.h> #include <AK/Optional.h> #include <AK/ScopeGuard.h> #include <AK/String.h> #include <AK/Try.h> +#include <LibCore/MappedFile.h> #include <LibGfx/Bitmap.h> #include <LibGfx/ImageDecoder.h> #include <LibGfx/ShareableBitmap.h> @@ -134,7 +134,7 @@ ErrorOr<NonnullRefPtr<Bitmap>> Bitmap::try_load_from_file(String const& path, in ErrorOr<NonnullRefPtr<Bitmap>> Bitmap::try_load_from_fd_and_close(int fd, String const& path) { - auto file = TRY(MappedFile::map_from_fd_and_close(fd, path)); + auto file = TRY(Core::MappedFile::map_from_fd_and_close(fd, path)); if (auto decoder = ImageDecoder::try_create(file->bytes())) { auto frame = TRY(decoder->frame(0)); if (auto& bitmap = frame.image) diff --git a/Userland/Libraries/LibGfx/BitmapFont.cpp b/Userland/Libraries/LibGfx/BitmapFont.cpp index a3c6dc06ea..c7db009236 100644 --- a/Userland/Libraries/LibGfx/BitmapFont.cpp +++ b/Userland/Libraries/LibGfx/BitmapFont.cpp @@ -202,7 +202,7 @@ RefPtr<BitmapFont> BitmapFont::load_from_file(String const& path) if (Core::File::is_device(path)) return nullptr; - auto file_or_error = MappedFile::map(path); + auto file_or_error = Core::MappedFile::map(path); if (file_or_error.is_error()) return nullptr; diff --git a/Userland/Libraries/LibGfx/BitmapFont.h b/Userland/Libraries/LibGfx/BitmapFont.h index 5734fe64ec..6adb4858c1 100644 --- a/Userland/Libraries/LibGfx/BitmapFont.h +++ b/Userland/Libraries/LibGfx/BitmapFont.h @@ -7,12 +7,12 @@ #pragma once #include <AK/CharacterTypes.h> -#include <AK/MappedFile.h> #include <AK/RefCounted.h> #include <AK/RefPtr.h> #include <AK/String.h> #include <AK/Types.h> #include <AK/Vector.h> +#include <LibCore/MappedFile.h> #include <LibGfx/Font.h> #include <LibGfx/Size.h> @@ -128,7 +128,7 @@ private: u8* m_rows { nullptr }; u8* m_glyph_widths { nullptr }; - RefPtr<MappedFile> m_mapped_file; + RefPtr<Core::MappedFile> m_mapped_file; u8 m_glyph_width { 0 }; u8 m_glyph_height { 0 }; diff --git a/Userland/Libraries/LibGfx/Font.h b/Userland/Libraries/LibGfx/Font.h index f622724846..32facfa1f9 100644 --- a/Userland/Libraries/LibGfx/Font.h +++ b/Userland/Libraries/LibGfx/Font.h @@ -8,11 +8,11 @@ #include <AK/Bitmap.h> #include <AK/ByteReader.h> -#include <AK/MappedFile.h> #include <AK/RefCounted.h> #include <AK/RefPtr.h> #include <AK/String.h> #include <AK/Types.h> +#include <LibCore/MappedFile.h> #include <LibGfx/Bitmap.h> #include <LibGfx/Size.h> diff --git a/Userland/Libraries/LibGfx/TrueTypeFont/Font.cpp b/Userland/Libraries/LibGfx/TrueTypeFont/Font.cpp index 6f5beddb8f..fe7e0b02e7 100644 --- a/Userland/Libraries/LibGfx/TrueTypeFont/Font.cpp +++ b/Userland/Libraries/LibGfx/TrueTypeFont/Font.cpp @@ -6,11 +6,11 @@ */ #include <AK/Checked.h> -#include <AK/MappedFile.h> #include <AK/Try.h> #include <AK/Utf32View.h> #include <AK/Utf8View.h> #include <LibCore/File.h> +#include <LibCore/MappedFile.h> #include <LibGfx/TrueTypeFont/Cmap.h> #include <LibGfx/TrueTypeFont/Font.h> #include <LibGfx/TrueTypeFont/Glyf.h> @@ -227,7 +227,7 @@ GlyphHorizontalMetrics Hmtx::get_glyph_horizontal_metrics(u32 glyph_id) const ErrorOr<NonnullRefPtr<Font>> Font::try_load_from_file(String path, unsigned index) { - auto file = TRY(MappedFile::map(path)); + auto file = TRY(Core::MappedFile::map(path)); auto font = TRY(try_load_from_externally_owned_memory(file->bytes(), index)); font->m_mapped_file = move(file); return font; diff --git a/Userland/Libraries/LibGfx/TrueTypeFont/Font.h b/Userland/Libraries/LibGfx/TrueTypeFont/Font.h index a5cb528d04..3f4341d850 100644 --- a/Userland/Libraries/LibGfx/TrueTypeFont/Font.h +++ b/Userland/Libraries/LibGfx/TrueTypeFont/Font.h @@ -87,7 +87,7 @@ private: { } - RefPtr<MappedFile> m_mapped_file; + RefPtr<Core::MappedFile> m_mapped_file; ReadonlyBytes m_buffer; |