Use nullptr in place of 0 or NULL

[libs/gui.git] / source / graphics / image.h

diff --git a/source/graphics/image.h b/source/graphics/image.h
index 7b5236ecd4f30c151c9c42148e955086c73cc17b..3f8f556e85a42fa88e5f7f886918037b3143434e 100644 (file)
--- a/source/graphics/image.h
+++ b/source/graphics/image.h
@@ -16,13 +16,14 @@ class Image
 public:
        struct Data
        {
-               PixelFormat fmt;
-               unsigned width;
-               unsigned height;
-               unsigned stride;
-               char *pixels;
-
-               Data();
+               PixelFormat fmt = RGB;
+               unsigned width = 0;
+               unsigned height = 0;
+               unsigned stride = 0;
+               char *owned_pixels = nullptr;
+               char *pixels = nullptr;
+
+               Data() = default;
                Data(const Data &);
                Data &operator=(const Data &);
                ~Data();
@@ -35,6 +36,7 @@ public:
        void load_file(const std::string &);
        void load_io(IO::Seekable &);
        void load(ImageLoader &);
+       void load_into(ImageLoader &, void *);
        void load_headers(ImageLoader &);
 
        PixelFormat get_format() const { return data.fmt; }