X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffont.h;h=fe5a9b34d2355b386e2f891be38e2b71df48ff4c;hb=dd32f2502f8d090c639df4a34d56d21ccbecac83;hp=a6873aacac6ed7921e035189d095d68aa37940bb;hpb=a6463a575c64115dc1ab80ec9b350622778a8f9b;p=libs%2Fgl.git

diff --git a/source/font.h b/source/font.h
index a6873aac..fe5a9b34 100644
--- a/source/font.h
+++ b/source/font.h
@@ -29,7 +29,6 @@ public:
 		void texture_ref(const std::string &);
 	};
 
-private:
 	struct Glyph
 	{
 		class Loader: public Msp::DataFile::ObjectLoader<Glyph>
@@ -48,6 +47,7 @@ private:
 		float advance;
 	};
 
+private:
 	typedef std::map<unsigned, Glyph> GlyphMap;
 
 	RefPtr<const Texture2D> texture;
@@ -58,10 +58,11 @@ private:
 
 public:
 	Font();
+	~Font();
 
 	void set_texture(const Texture2D &);
 	const Texture2D &get_texture() const;
-	void add_glyph(unsigned, float, float, float, float, float, float, float, float, float);
+	void add_glyph(const Glyph &);
 	float get_native_size() const { return native_size; }
 	float get_ascent() const { return ascent; }
 	float get_descent() const { return descent; }