X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftexture2d.h;h=485867dd14f48e3a7dce09b7a4d9600856f152a9;hb=4f8c3fd99d21b455e83d2d315be60669b2afc122;hp=ff4d35b64b24685661f842b6f652604b0d4220a4;hpb=e003d7a1497dad3b13e4e88e681f8fa2afc40c83;p=libs%2Fgl.git

diff --git a/source/texture2d.h b/source/texture2d.h
index ff4d35b6..485867dd 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -18,7 +18,7 @@ most common type of texture.
 class Texture2D: public Texture
 {
 public:
-	class Loader: public Texture::Loader
+	class Loader: public Msp::DataFile::DerivedObjectLoader<Texture2D, Texture::Loader>
 	{
 	public:
 		Loader(Texture2D &);
@@ -62,11 +62,15 @@ public:
 	the image must be compatible with the defined storage. */
 	void load_image(const std::string &fn);
 
-	unsigned get_width() const  { return width; }
+	/** Uploads an image to the texture.  If storage has not been defined, it
+	will be set to match the image.  Otherwise the image must be compatible with
+	the defined storage. */
+	void image(const Graphics::Image &);
+
+	unsigned get_width() const { return width; }
 	unsigned get_height() const { return height; }
 
 private:
-	void image(const Graphics::Image &);
 	void get_level_size(unsigned, unsigned &, unsigned &);
 };