RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 17:47:44 +00:00
Code Issues Activity Actions

LibGfx: Move common loader functionality to load from memory functions

Browse source 
This will share functionality between the load from path and load from
memory functions.
This commit is contained in:
Timothy 2021-09-07 21:13:29 +10:00 • committed by Andreas Kling
parent eb5320023a
commit c966c32571
19 changed files with 54 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibGfx/BMPLoader.cpp
View file

@ -171,17 +171,14 @@ RefPtr<Gfx::Bitmap> load_bmp(String const& path)
auto file_or_error = MappedFile::map(path);
if (file_or_error.is_error())
return nullptr;
auto bitmap = load_bmp_impl((const u8*)file_or_error.value()->data(), file_or_error.value()->size());
if (bitmap)
bitmap->set_mmap_name(String::formatted("Gfx::Bitmap [{}] - Decoded BMP: {}", bitmap->size(), LexicalPath::canonicalized_path(path)));
return bitmap;
return load_bmp_from_memory((u8 const*)file_or_error.value()->data(), file_or_error.value()->size(), LexicalPath::canonicalized_path(path));
}
RefPtr<Gfx::Bitmap> load_bmp_from_memory(const u8* data, size_t length)
RefPtr<Gfx::Bitmap> load_bmp_from_memory(u8 const* data, size_t length, String const& mmap_name)
{
auto bitmap = load_bmp_impl(data, length);
if (bitmap)
bitmap->set_mmap_name(String::formatted("Gfx::Bitmap [{}] - Decoded BMP: <memory>", bitmap->size()));
bitmap->set_mmap_name(String::formatted("Gfx::Bitmap [{}] - Decoded BMP: {}", bitmap->size(), mmap_name));
return bitmap;
}