X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimage.cpp;h=2835d05e872936d0cc069fa806812ff3ab952661;hb=917c43de100807f4397e36b66b1a748dbf44370e;hp=3e1124faaf06800158413189c054529db2ca4060;hpb=cfd3548464e6424fc9decf0539d6cd04b031ba10;p=libs%2Fgui.git

diff --git a/source/graphics/image.cpp b/source/graphics/image.cpp
index 3e1124f..2835d05 100644
--- a/source/graphics/image.cpp
+++ b/source/graphics/image.cpp
@@ -14,12 +14,44 @@ Image::Data::Data():
 	fmt(RGB),
 	width(0),
 	height(0),
-	data(0)
+	owned_pixels(0),
+	pixels(0)
 { }
 
+Image::Data::Data(const Data &other):
+	fmt(other.fmt),
+	width(other.width),
+	height(other.height),
+	stride(other.stride),
+	owned_pixels(other.pixels ? new char[stride*height] : 0),
+	pixels(owned_pixels)
+{
+	if(pixels)
+		copy(other.pixels, other.pixels+stride*height, pixels);
+}
+
+Image::Data &Image::Data::operator=(const Data &other)
+{
+	delete[] owned_pixels;
+	pixels = owned_pixels = 0;
+
+	fmt = other.fmt;
+	width = other.width;
+	height = other.height;
+	stride = other.stride;
+
+	if(other.pixels)
+	{
+		pixels = owned_pixels = new char[stride*height];
+		copy(other.pixels, other.pixels+stride*height, pixels);
+	}
+
+	return *this;
+}
+
 Image::Data::~Data()
 {
-	delete[] data;
+	delete[] owned_pixels;
 }
 
 
@@ -29,7 +61,7 @@ void Image::load_file(const string &fn)
 	load(*loader);
 }
 
-void Image::load_io(IO::Base &io)
+void Image::load_io(IO::Seekable &io)
 {
 	RefPtr<ImageLoader> loader = ImageLoader::open_io(io);
 	load(*loader);
@@ -37,8 +69,23 @@ void Image::load_io(IO::Base &io)
 
 void Image::load(ImageLoader &loader)
 {
+	if(loader.get_state()==ImageLoader::INITIAL)
+		data = Data();
 	loader.load(data);
 }
 
+void Image::load_into(ImageLoader &loader, void *buffer)
+{
+	data.pixels = reinterpret_cast<char *>(buffer);
+	load(loader);
+}
+
+void Image::load_headers(ImageLoader &loader)
+{
+	if(loader.get_state()==ImageLoader::INITIAL)
+		data = Data();
+	loader.load_headers(data);
+}
+
 } // namespace Graphics
 } // namespace Msp