From 3d0c5814d2a4115880b2048f02561cc4e7c77d1c Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Wed, 21 Jul 2021 18:08:42 +0200 Subject: [PATCH] LibGfx: Sprinkle [[nodiscard]] on Gfx::Bitmap --- Userland/Libraries/LibGfx/Bitmap.h | 84 +++++++++++++++--------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/Userland/Libraries/LibGfx/Bitmap.h b/Userland/Libraries/LibGfx/Bitmap.h index 2fc2247486..4e0c1d7c3d 100644 --- a/Userland/Libraries/LibGfx/Bitmap.h +++ b/Userland/Libraries/LibGfx/Bitmap.h @@ -109,49 +109,49 @@ public: return false; } - RefPtr clone() const; + [[nodiscard]] RefPtr clone() const; - RefPtr rotated(Gfx::RotationDirection) const; - RefPtr flipped(Gfx::Orientation) const; - RefPtr scaled(int sx, int sy) const; - RefPtr scaled(float sx, float sy) const; - RefPtr cropped(Gfx::IntRect) const; - RefPtr to_bitmap_backed_by_anonymous_buffer() const; - ByteBuffer serialize_to_byte_buffer() const; + [[nodiscard]] RefPtr rotated(Gfx::RotationDirection) const; + [[nodiscard]] RefPtr flipped(Gfx::Orientation) const; + [[nodiscard]] RefPtr scaled(int sx, int sy) const; + [[nodiscard]] RefPtr scaled(float sx, float sy) const; + [[nodiscard]] RefPtr cropped(Gfx::IntRect) const; + [[nodiscard]] RefPtr to_bitmap_backed_by_anonymous_buffer() const; + [[nodiscard]] ByteBuffer serialize_to_byte_buffer() const; - ShareableBitmap to_shareable_bitmap() const; + [[nodiscard]] ShareableBitmap to_shareable_bitmap() const; ~Bitmap(); - u8* scanline_u8(int physical_y); - const u8* scanline_u8(int physical_y) const; - RGBA32* scanline(int physical_y); - const RGBA32* scanline(int physical_y) const; + [[nodiscard]] u8* scanline_u8(int physical_y); + [[nodiscard]] const u8* scanline_u8(int physical_y) const; + [[nodiscard]] RGBA32* scanline(int physical_y); + [[nodiscard]] const RGBA32* scanline(int physical_y) const; - IntRect rect() const { return { {}, m_size }; } - IntSize size() const { return m_size; } - int width() const { return m_size.width(); } - int height() const { return m_size.height(); } - int scale() const { return m_scale; } + [[nodiscard]] IntRect rect() const { return { {}, m_size }; } + [[nodiscard]] IntSize size() const { return m_size; } + [[nodiscard]] int width() const { return m_size.width(); } + [[nodiscard]] int height() const { return m_size.height(); } + [[nodiscard]] int scale() const { return m_scale; } - IntRect physical_rect() const { return rect() * scale(); } - IntSize physical_size() const { return size() * scale(); } - int physical_width() const { return physical_size().width(); } - int physical_height() const { return physical_size().height(); } - size_t pitch() const { return m_pitch; } + [[nodiscard]] IntRect physical_rect() const { return rect() * scale(); } + [[nodiscard]] IntSize physical_size() const { return size() * scale(); } + [[nodiscard]] int physical_width() const { return physical_size().width(); } + [[nodiscard]] int physical_height() const { return physical_size().height(); } + [[nodiscard]] size_t pitch() const { return m_pitch; } - ALWAYS_INLINE bool is_indexed() const + [[nodiscard]] ALWAYS_INLINE bool is_indexed() const { return is_indexed(m_format); } - ALWAYS_INLINE static bool is_indexed(BitmapFormat format) + [[nodiscard]] ALWAYS_INLINE static bool is_indexed(BitmapFormat format) { return format == BitmapFormat::Indexed8 || format == BitmapFormat::Indexed4 || format == BitmapFormat::Indexed2 || format == BitmapFormat::Indexed1; } - static size_t palette_size(BitmapFormat format) + [[nodiscard]] static size_t palette_size(BitmapFormat format) { switch (format) { case BitmapFormat::Indexed1: @@ -167,9 +167,9 @@ public: } } - Vector palette_to_vector() const; + [[nodiscard]] Vector palette_to_vector() const; - static unsigned bpp_for_format(BitmapFormat format) + [[nodiscard]] static unsigned bpp_for_format(BitmapFormat format) { switch (format) { case BitmapFormat::Indexed1: @@ -190,30 +190,30 @@ public: } } - static size_t minimum_pitch(size_t physical_width, BitmapFormat); + [[nodiscard]] static size_t minimum_pitch(size_t physical_width, BitmapFormat); - unsigned bpp() const + [[nodiscard]] unsigned bpp() const { return bpp_for_format(m_format); } void fill(Color); - bool has_alpha_channel() const { return m_format == BitmapFormat::BGRA8888; } - BitmapFormat format() const { return m_format; } + [[nodiscard]] bool has_alpha_channel() const { return m_format == BitmapFormat::BGRA8888; } + [[nodiscard]] BitmapFormat format() const { return m_format; } void set_mmap_name(String const&); - static constexpr size_t size_in_bytes(size_t pitch, int physical_height) { return pitch * physical_height; } - size_t size_in_bytes() const { return size_in_bytes(m_pitch, physical_height()); } + [[nodiscard]] static constexpr size_t size_in_bytes(size_t pitch, int physical_height) { return pitch * physical_height; } + [[nodiscard]] size_t size_in_bytes() const { return size_in_bytes(m_pitch, physical_height()); } - Color palette_color(u8 index) const { return Color::from_rgba(m_palette[index]); } + [[nodiscard]] Color palette_color(u8 index) const { return Color::from_rgba(m_palette[index]); } void set_palette_color(u8 index, Color color) { m_palette[index] = color.value(); } template - Color get_pixel(int physical_x, int physical_y) const; - Color get_pixel(int physical_x, int physical_y) const; - Color get_pixel(const IntPoint& physical_position) 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(const IntPoint& physical_position) const { return get_pixel(physical_position.x(), physical_position.y()); } @@ -226,13 +226,13 @@ public: set_pixel(physical_position.x(), physical_position.y(), color); } - bool is_purgeable() const { return m_purgeable; } - bool is_volatile() const { return m_volatile; } + [[nodiscard]] bool is_purgeable() const { return m_purgeable; } + [[nodiscard]] bool is_volatile() const { return m_volatile; } void set_volatile(); [[nodiscard]] bool set_nonvolatile(); - Core::AnonymousBuffer& anonymous_buffer() { return m_buffer; } - const Core::AnonymousBuffer& anonymous_buffer() const { return m_buffer; } + [[nodiscard]] Core::AnonymousBuffer& anonymous_buffer() { return m_buffer; } + [[nodiscard]] Core::AnonymousBuffer const& anonymous_buffer() const { return m_buffer; } private: enum class Purgeable {