X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimage.h;h=15685c606e98353bf92d00c701c8f756f00b1fe2;hb=a6eecc5117d91534aaf13e93baf64855f4b963c0;hp=7b5236ecd4f30c151c9c42148e955086c73cc17b;hpb=054fca09f0bbd64fdbd6406a0643de938a9cd4fb;p=libs%2Fgui.git

diff --git a/source/graphics/image.h b/source/graphics/image.h
index 7b5236e..15685c6 100644
--- a/source/graphics/image.h
+++ b/source/graphics/image.h
@@ -4,6 +4,7 @@
 #include <stdexcept>
 #include <string>
 #include <msp/io/seekable.h>
+#include "mspgui_api.h"
 #include "pixelformat.h"
 
 namespace Msp {
@@ -11,18 +12,19 @@ namespace Graphics {
 
 class ImageLoader;
 
-class Image
+class MSPGUI_API 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 +37,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; }