X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=7a9701f5e616f448465c1335f695b871d3d34d04;hb=e042e093a4761f1227d4dd80d695e01642e17ffd;hp=dfd93f57c42e811a9c15c199083c50bd49d5497b;hpb=41b4cb3002f3551ce1bd6fdf15994ee7bc523788;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index dfd93f57..7a9701f5 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,5 +1,7 @@
+#include <msp/io/memory.h>
 #include "bindable.h"
 #include "error.h"
+#include "pixelstore.h"
 #include "texture2d.h"
 
 using namespace std;
@@ -80,10 +82,13 @@ void Texture2D::image(const Graphics::Image &img)
 	unsigned h = img.get_height();
 	PixelFormat fmt = pixelformat_from_graphics(img.get_format());
 	if(width==0)
-		storage(fmt, w, h);
+		storage(storage_pixelformat_from_graphics(img.get_format()), w, h);
 	else if(w!=width || h!=height)
 		throw incompatible_data("Texture2D::image");
 
+	PixelStore pstore = PixelStore::from_image(img);
+	Bind _bind_ps(pstore, true);
+
 	image(0, fmt, UNSIGNED_BYTE, img.get_data());
 }
 
@@ -111,7 +116,8 @@ Texture2D::Loader::Loader(Texture2D &t):
 void Texture2D::Loader::image_data(const string &data)
 {
 	Graphics::Image img;
-	img.load_memory(data.data(), data.size());
+	IO::Memory mem(data.data(), data.size());
+	img.load_io(mem);
 
 	obj.image(img);
 }