X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.cpp;h=dfd93f57c42e811a9c15c199083c50bd49d5497b;hb=a64e2e362cd7bce6f103f8878d69fcca4261bac9;hp=be4e1a112d08e8c02f189fbcd951dce4dfcdcf2c;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/texture2d.cpp b/source/texture2d.cpp
index be4e1a11..dfd93f57 100644
--- a/source/texture2d.cpp
+++ b/source/texture2d.cpp
@@ -20,6 +20,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;
@@ -99,7 +100,7 @@ void Texture2D::get_level_size(unsigned level, unsigned &w, unsigned &h)
 
 
 Texture2D::Loader::Loader(Texture2D &t):
-	Texture::Loader(t)
+	DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>(t)
 {
 	add("image_data", &Loader::image_data);
 	add("raw_data", &Loader::raw_data);
@@ -112,18 +113,17 @@ void Texture2D::Loader::image_data(const string &data)
 	Graphics::Image img;
 	img.load_memory(data.data(), data.size());
 
-	static_cast<Texture2D &>(obj).image(img);
+	obj.image(img);
 }
 
 void Texture2D::Loader::raw_data(const string &data)
 {
-	Texture2D &t2d = static_cast<Texture2D &>(obj);
-	t2d.image(0, t2d.ifmt, UNSIGNED_BYTE, data.data());
+	obj.image(0, obj.ifmt, UNSIGNED_BYTE, data.data());
 }
 
 void Texture2D::Loader::storage(PixelFormat fmt, unsigned w, unsigned h)
 {
-	static_cast<Texture2D &>(obj).storage(fmt, w, h);
+	obj.storage(fmt, w, h);
 }
 
 void Texture2D::Loader::storage_b(PixelFormat fmt, unsigned w, unsigned h, unsigned)