Support embedding textures inside font files

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

diff --git a/source/font.h b/source/font.h
index b48c6445bb53a6d4136cd1d3c2b040edbf913c40..a2406b9ee043009824dbe1787fd7a05d6b583038 100644 (file)
--- a/source/font.h
+++ b/source/font.h
@@ -38,11 +38,12 @@ public:
                DataFile::Collection &get_collection();
        private:
                void init();
-               void texture(const std::string &);
                void glyph(unsigned);
+               void texture_inline();
        };
 
        Font();
+       ~Font();
 
        void  set_texture(const Texture2D &);
        const Texture2D &get_texture() const;
@@ -109,6 +110,7 @@ private:
        typedef std::map<unsigned, Glyph> GlyphMap;
 
        const Texture2D *tex;
+       bool     own_tex;
        float    default_size;
        float    ascent;
        float    descent;