X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture1d.h;h=e77f6484242d1b177a5acff236245fd7ad6988bf;hb=acaefb4c669f01855252818ef0a2958cbdababc3;hp=09d805e7869f8afd2819596bab336a8db23389a8;hpb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;p=libs%2Fgl.git

diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index 09d805e7..e77f6484 100644
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_TEXTURE1D_H_
 #define MSP_GL_TEXTURE1D_H_
 
+#include <string>
 #include "texture.h"
 
 namespace Msp {
@@ -25,27 +26,14 @@ public:
 private:
 	unsigned width;
 	unsigned levels;
-	unsigned allocated;
 
 public:
 	Texture1D();
 
 	void storage(PixelFormat, unsigned, unsigned = 0);
 
-	DEPRECATED void storage(PixelComponents c, unsigned w, unsigned l = 0)
-	{ storage(make_pixelformat(c, UNSIGNED_BYTE), w, l); }
-
-	void allocate(unsigned);
-private:
-	void allocate_(unsigned);
-public:
 	void image(unsigned, const void *);
-private:
-	void image_(unsigned, const void *);
-public:
-	DEPRECATED void image(unsigned, PixelComponents, DataType, const void *);
 	void sub_image(unsigned, int, unsigned, const void *);
-	DEPRECATED void sub_image(unsigned, int, unsigned, PixelComponents, DataType, const void *);
 	virtual void image(const Graphics::Image &, unsigned = 0);
 	using Texture::image;
 	unsigned get_width() const { return width; }
@@ -56,7 +44,7 @@ private:
 
 public:
 	virtual AsyncLoader *load(IO::Seekable &, const Resources * = 0) { return 0; }
-	virtual UInt64 get_data_size() const;
+	virtual std::uint64_t get_data_size() const;
 	virtual void unload() { }
 };