beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibGfx: Use calloc() instead of malloc()+memset() Gfx::BitmapFont

Browse source
This commit is contained in:
Andreas Kling 2021-07-21 22:09:40 +02:00
parent 027bfc4eff
commit e4c1514033
Notes: sideshowbarker 2024-07-18 08:35:07 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/e4c15140337
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Userland/Libraries/LibGfx/BitmapFont.cpp
View file

@ -45,10 +45,8 @@ NonnullRefPtr<BitmapFont> BitmapFont::create(u8 glyph_height, u8 glyph_width, bo
{
size_t bytes_per_glyph = sizeof(u32) * glyph_height;
size_t count = glyph_count_by_type(type);
auto* new_rows = static_cast<unsigned*>(malloc(bytes_per_glyph * count));
memset(new_rows, 0, bytes_per_glyph * count);
auto* new_widths = static_cast<u8*>(malloc(count));
memset(new_widths, 0, count);
auto* new_rows = static_cast<unsigned*>(calloc(count, bytes_per_glyph));
auto* new_widths = static_cast<u8*>(calloc(count, 1));
return adopt_ref(*new BitmapFont("Untitled", "Untitled", new_rows, new_widths, fixed, glyph_width, glyph_height, 1, type, 0, 0, 0, 400, true));
}
@ -295,12 +293,10 @@ void BitmapFont::set_type(FontTypes type)
size_t bytes_per_glyph = sizeof(u32) * glyph_height();
auto* new_rows = static_cast<unsigned*>(kmalloc(bytes_per_glyph * new_glyph_count));
memset(new_rows, (unsigned)0, bytes_per_glyph * new_glyph_count);
auto* new_rows = static_cast<unsigned*>(calloc(new_glyph_count, bytes_per_glyph));
memcpy(new_rows, m_rows, bytes_per_glyph * item_count_to_copy);
auto* new_widths = static_cast<u8*>(kmalloc(new_glyph_count));
memset(new_widths, (u8)0, new_glyph_count);
auto* new_widths = static_cast<u8*>(calloc(new_glyph_count, 1));
memcpy(new_widths, m_glyph_widths, item_count_to_copy);
kfree(m_rows);