X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Ftexture2d.h;h=674c778f9782116dce94ef4c663e1dda89931953;hp=030fe408ad0a2b08bcdc448fe1f305703c3d8dce;hb=d2efbd8a32efa2a3ee8542efc846277af19d63e0;hpb=e079d5a878e83dc0baffcec66a57659c885cd593

diff --git a/source/texture2d.h b/source/texture2d.h
index 030fe408..674c778f 100644
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -25,7 +25,6 @@ public:
 	private:
 		void init();
 
-		void image_data(const std::string &);
 		void raw_data(const std::string &);
 		void storage(PixelFormat, unsigned, unsigned);
 		void storage_b(PixelFormat, unsigned, unsigned, unsigned);
@@ -62,16 +61,13 @@ public:
 	void sub_image(unsigned level, int x, int y, unsigned wd, unsigned ht,
 		PixelFormat fmt, DataType type, const void *data);
 
-	/// Loads a Graphics::Image from a file and uploads it to the texture.
-	void load_image(const std::string &fn, bool srgb = false);
-
 	/** 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.
 
 	If srgb is true and storage is determined by this call, then an sRGB pixel
 	format will be used. */
-	void image(const Graphics::Image &, bool srgb = false);
+	virtual void image(const Graphics::Image &, bool srgb = false);
 
 private:
 	void image(const Graphics::Image &, bool, bool);