Make it possible to load an image into an externally allocated buffer

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

diff --git a/source/graphics/image.h b/source/graphics/image.h
index 29fd288c5634ca96a0b26c604b0cb56968ee89a3..51147cefdcf341a882a426933efe52576721d155 100644 (file)
--- a/source/graphics/image.h
+++ b/source/graphics/image.h
@@ -20,9 +20,12 @@ public:
                unsigned width;
                unsigned height;
                unsigned stride;
-               char *data;
+               char *owned_pixels;
+               char *pixels;
 
                Data();
+               Data(const Data &);
+               Data &operator=(const Data &);
                ~Data();
        };
 
@@ -33,12 +36,15 @@ 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; }
        unsigned get_width() const { return data.width; }
        unsigned get_height() const { return data.height; }
        unsigned get_stride() const { return data.stride; }
-       const void *get_data() const { return data.data; }
+       DEPRECATED const void *get_data() const { return data.pixels; }
+       const void *get_pixels() const { return data.pixels; }
 };
 
 } // namespace Graphics