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

PixelPaint: Don't allow Image::try_create_from_bitmap(nullptr)

Browse source 
This is not a valid use-case so let's prevent it at compile time.
This commit is contained in:
Andreas Kling 2021-06-12 10:26:46 +02:00
parent 9038bc675f
commit 92203c9821
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Applications/PixelPaint/Image.cpp
View file

@ -52,7 +52,7 @@ void Image::paint_into(GUI::Painter& painter, Gfx::IntRect const& dest_rect)
} }
} }
RefPtr<Image> Image::try_create_from_bitmap(RefPtr<Gfx::Bitmap> bitmap) RefPtr<Image> Image::try_create_from_bitmap(NonnullRefPtr<Gfx::Bitmap> bitmap)
{ {
auto image = try_create_with_size({ bitmap->width(), bitmap->height() }); auto image = try_create_with_size({ bitmap->width(), bitmap->height() });
if (!image) if (!image)
@ -110,7 +110,7 @@ RefPtr<Image> Image::try_create_from_pixel_paint_file(String const& file_path)
RefPtr<Image> Image::try_create_from_file(String const& file_path) RefPtr<Image> Image::try_create_from_file(String const& file_path)
{ {
if (auto bitmap = Gfx::Bitmap::load_from_file(file_path)) if (auto bitmap = Gfx::Bitmap::load_from_file(file_path))
return try_create_from_bitmap(bitmap); return try_create_from_bitmap(bitmap.release_nonnull());
return try_create_from_pixel_paint_file(file_path); return try_create_from_pixel_paint_file(file_path);
} }

2
Userland/Applications/PixelPaint/Image.h
View file

@ -38,7 +38,7 @@ class Image : public RefCounted<Image> {
public: public:
static RefPtr<Image> try_create_with_size(Gfx::IntSize const&); static RefPtr<Image> try_create_with_size(Gfx::IntSize const&);
static RefPtr<Image> try_create_from_file(String const& file_path); static RefPtr<Image> try_create_from_file(String const& file_path);
static RefPtr<Image> try_create_from_bitmap(RefPtr<Gfx::Bitmap> bitmap); static RefPtr<Image> try_create_from_bitmap(NonnullRefPtr<Gfx::Bitmap>);
size_t layer_count() const { return m_layers.size(); } size_t layer_count() const { return m_layers.size(); }
Layer const& layer(size_t index) const { return m_layers.at(index); } Layer const& layer(size_t index) const { return m_layers.at(index); }