Make Texture2D::image(Graphics::Image) public

[libs/gl.git] / source / texture2d.h

diff --git a/source/texture2d.h b/source/texture2d.h
index f81231d18466eebf8746cb2cb9a19d552513a3fc..485867dd14f48e3a7dce09b7a4d9600856f152a9 100644 (file)
--- 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,12 @@ public:
        the image must be compatible with the defined storage. */
        void load_image(const std::string &fn);
 
-private:
+       /** 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 &);
 
-public:
-       unsigned get_width() const  { return width; }
+       unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
 
 private: