X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=0e9b40c6320d0a5514a9bde091abffe5cb131d69;hb=8bbb661c53f52d0e6f9c89aeffc626f66573f52d;hp=8c8ad3784e4a0a32faad55b49a25dca54fd9c2fb;hpb=edd2a01b3c696df8630ac6a97e9b55a95fe7e112;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index 8c8ad378..0e9b40c6 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -1,3 +1,4 @@
+#include <msp/io/memory.h>
 #include "bindable.h"
 #include "error.h"
 #include "texture2d.h"
@@ -20,6 +21,7 @@ void Texture2D::storage(PixelFormat fmt, unsigned wd, unsigned ht)
 		throw invalid_operation("Texture2D::storage");
 	if(wd==0 || ht==0)
 		throw invalid_argument("Texture2D::storage");
+	require_pixelformat(fmt);
 
 	ifmt = fmt;
 	width = wd;
@@ -110,7 +112,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);
 }