Remove the deprecated form of Texture3D::load_image

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

diff --git a/source/texture3d.h b/source/texture3d.h
index 437c852ab92f943ed569de54eb4c61f6b34402bf..0808471624db87d3f64d00ed5481171457bd9068 100644 (file)
--- a/source/texture3d.h
+++ b/source/texture3d.h
@@ -24,6 +24,7 @@ public:
 
                void raw_data(const std::string &);
                void storage(PixelFormat, unsigned, unsigned, unsigned);
+               void storage_levels(PixelFormat, unsigned, unsigned, unsigned, unsigned);
        };
 
 private:
@@ -61,20 +62,6 @@ public:
                int x, int y, int z, unsigned wd, unsigned ht, unsigned dp,
                PixelFormat fmt, DataType type, const void *data);
 
-       /** Loads an image from a file and uploads it to the texture.  If storage
-       has not been defined, it will be set to match the loaded image.  To
-       construct a three-dimensional texture from a two-dimensional image, the
-       image is interpreted as an array of consecutive images.  If dp is -1, the
-       texture's width and height are equal.  If dp is -2, the texture's height and
-       depth are equal.  Otherwise, dp must be positive and determines the
-       texture's depth.  In all cases, the image's height must equal the texture's
-       height times its depth.
-       
-       Deprecated in favor of the base class version.*/
-       void load_image(const std::string &fn, int dp = -1);
-
-       using Texture::load_image;
-
        /** Uploads an image to the texture.  If storage has not been defined, it
        will be set to match the image.  In this case the image will be treated as
        a stack of square layers and its height must be divisible by its width.
@@ -82,7 +69,9 @@ public:
 
        If srgb is true and storage is determined by this call, then an sRGB pixel
        format will be used. */
-       virtual void image(const Graphics::Image &, bool = false);
+       virtual void image(const Graphics::Image &, unsigned, bool = false);
+
+       using Texture::image;
 
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }