X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Ftexture2d.h;h=61a3f29f035c99b31dc5fc48cceff853ec3fbab8;hb=df9119a9bf2d348a513c515ed92953353da97b54;hp=427e179563943b312c7ea4f87b7ae3a5595e09db;hpb=190a7e11237351f6b730c28f7b16f183e8adc69c;p=libs%2Fgl.git

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 427e1795..61a3f29f 100644
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -24,7 +24,6 @@ public:
 	private:
 		void init();
 
-		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned);
 		void storage_levels(PixelFormat, unsigned, unsigned, unsigned);
 	};
@@ -42,15 +41,12 @@ public:
 	cannot be changed once set. */
 	void storage(PixelFormat, unsigned wd, unsigned ht, unsigned lv = 0);
 
-	/** Replaces contents of an entire mipmap level.  Allocated storage must
-	exist.  The image data is interpreted according to the storage format and
-	must have size matching the selected mipmap level. */
-	virtual void image(unsigned level, const void *);
+	void image(unsigned level, const void *) override;
 
 	/** Replaces a rectangular region of the texture.  Allocated storage must
 	exist.  The image data is interpreted according to the storage format and
 	the region must be fully inside the selected mipmap level. */
-	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht, const void *);
+	void sub_image(unsigned level, unsigned x, unsigned y, unsigned wd, unsigned ht, const void *);
 
 	virtual void image(const Graphics::Image &, unsigned = 0);