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

LibGUI: Use new Bitmap::minimum_pitch method

Browse source 
Also, make sure that the painter actually draws on a RGB(A) bitmap.

Closes #3460.
This commit is contained in:
Ben Wiederhake 2020-09-12 11:14:44 +02:00 • committed by Andreas Kling
parent 568d53c9b1
commit e3101c74c6
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibGUI/Window.cpp
View file

@ -635,7 +635,7 @@ RefPtr<Gfx::Bitmap> Window::create_shared_bitmap(Gfx::BitmapFormat format, const
{ {
ASSERT(WindowServerConnection::the().server_pid()); ASSERT(WindowServerConnection::the().server_pid());
ASSERT(!size.is_empty()); ASSERT(!size.is_empty());
size_t pitch = round_up_to_power_of_two(size.width() * sizeof(Gfx::RGBA32), 16); size_t pitch = Gfx::Bitmap::minimum_pitch(size.width(), format);
size_t size_in_bytes = size.height() * pitch; size_t size_in_bytes = size.height() * pitch;
auto shared_buffer = SharedBuffer::create_with_size(size_in_bytes); auto shared_buffer = SharedBuffer::create_with_size(size_in_bytes);
ASSERT(shared_buffer); ASSERT(shared_buffer);

1
Libraries/LibGfx/Painter.cpp
View file

@ -68,6 +68,7 @@ ALWAYS_INLINE Color get_pixel(const Gfx::Bitmap& bitmap, int x, int y)
Painter::Painter(Gfx::Bitmap& bitmap) Painter::Painter(Gfx::Bitmap& bitmap)
: m_target(bitmap) : m_target(bitmap)
{ {
ASSERT(bitmap.format() == Gfx::BitmapFormat::RGB32 || bitmap.format() == Gfx::BitmapFormat::RGBA32);
m_state_stack.append(State()); m_state_stack.append(State());
state().font = &Font::default_font(); state().font = &Font::default_font();
state().clip_rect = { { 0, 0 }, bitmap.size() }; state().clip_rect = { { 0, 0 }, bitmap.size() };