mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-22 10:19:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibGfx: Simplify get_pixel()

Browse source 
There appears to be no reason for Bitmap::get_pixel() to be split into
three layers of methods. Make the code simpler by inlining everything
into a single method.
This commit is contained in:
InvalidUsernameException 2025-04-19 17:26:57 +02:00 • committed by Jelle Raaijmakers
commit 7568ea3160
Notes: github-actions[bot] 2025-04-23 07:31:19 +00:00
1 changed files with 5 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Libraries/LibGfx/Bitmap.h
View file

@ -120,11 +120,6 @@ public:
[[nodiscard]] static constexpr size_t size_in_bytes(size_t pitch, int height) { return pitch * height; } [[nodiscard]] static constexpr size_t size_in_bytes(size_t pitch, int height) { return pitch * height; }
[[nodiscard]] size_t size_in_bytes() const { return size_in_bytes(m_pitch, height()); } [[nodiscard]] size_t size_in_bytes() const { return size_in_bytes(m_pitch, height()); }
template<StorageFormat>
[[nodiscard]] Color unchecked_get_pixel(int physical_x, int physical_y) const;
template<StorageFormat>
[[nodiscard]] Color get_pixel(int physical_x, int physical_y) const;
[[nodiscard]] Color get_pixel(int physical_x, int physical_y) const; [[nodiscard]] Color get_pixel(int physical_x, int physical_y) const;
[[nodiscard]] Color get_pixel(IntPoint physical_position) const [[nodiscard]] Color get_pixel(IntPoint physical_position) const
{ {
@ -232,49 +227,20 @@ ALWAYS_INLINE size_t Bitmap::data_size() const
return m_size.height() * m_pitch; return m_size.height() * m_pitch;
} }
template<>
ALWAYS_INLINE Color Bitmap::unchecked_get_pixel<StorageFormat::BGRx8888>(int x, int y) const
{
return Color::from_rgb(unchecked_scanline(y)[x]);
}
template<>
ALWAYS_INLINE Color Bitmap::unchecked_get_pixel<StorageFormat::BGRA8888>(int x, int y) const
{
return Color::from_argb(unchecked_scanline(y)[x]);
}
template<>
ALWAYS_INLINE Color Bitmap::unchecked_get_pixel<StorageFormat::RGBx8888>(int x, int y) const
{
return Color::from_bgr(unchecked_scanline(y)[x]);
}
template<>
ALWAYS_INLINE Color Bitmap::unchecked_get_pixel<StorageFormat::RGBA8888>(int x, int y) const
{
return Color::from_abgr(unchecked_scanline(y)[x]);
}
template<StorageFormat storage_format>
ALWAYS_INLINE Color Bitmap::get_pixel(int x, int y) const ALWAYS_INLINE Color Bitmap::get_pixel(int x, int y) const
{ {
VERIFY(x >= 0); VERIFY(x >= 0);
VERIFY(x < width()); VERIFY(x < width());
return unchecked_get_pixel<storage_format>(x, y); auto pixel = unchecked_scanline(y)[x];
}
ALWAYS_INLINE Color Bitmap::get_pixel(int x, int y) const
{
switch (determine_storage_format(m_format)) { switch (determine_storage_format(m_format)) {
case StorageFormat::BGRx8888: case StorageFormat::BGRx8888:
return get_pixel<StorageFormat::BGRx8888>(x, y); return Color::from_rgb(pixel);
case StorageFormat::BGRA8888: case StorageFormat::BGRA8888:
return get_pixel<StorageFormat::BGRA8888>(x, y); return Color::from_argb(pixel);
case StorageFormat::RGBA8888: case StorageFormat::RGBA8888:
return get_pixel<StorageFormat::RGBA8888>(x, y); return Color::from_abgr(pixel);
case StorageFormat::RGBx8888: case StorageFormat::RGBx8888:
return get_pixel<StorageFormat::RGBx8888>(x, y); return Color::from_bgr(pixel);
default: default:
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }