From 80e2b271c1d0b20eae0c950aba5a536305a639a6 Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Fri, 16 Jun 2006 07:03:39 +0000
Subject: [PATCH] pass font id to loadfont

---
 lib/gfxfont.c |    3 ++-
 lib/gfxfont.h |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/gfxfont.c b/lib/gfxfont.c
index 6ec1a4f..21c85ab 100644
--- a/lib/gfxfont.c
+++ b/lib/gfxfont.c
@@ -136,7 +136,7 @@ static void glyph_clear(gfxglyph_t*g)
 
 static int errorno = 0;
 
-gfxfont_t* gfxfont_load(char*filename, double quality)
+gfxfont_t* gfxfont_load(char*id, char*filename, double quality)
 {
     FT_Face face;
     FT_Error error;
@@ -179,6 +179,7 @@ gfxfont_t* gfxfont_load(char*filename, double quality)
     //font->leading = font->layout->ascent + font->layout->descent;
     //font->encoding = FONT_ENCODING_UNICODE;
     font->max_unicode = 0;
+    font->id = strdup(id);
     
     font->glyphs = rfx_calloc(face->num_glyphs*sizeof(gfxglyph_t));
     glyph2unicode = rfx_calloc(face->num_glyphs*sizeof(int));
diff --git a/lib/gfxfont.h b/lib/gfxfont.h
index 9644213..9cf3d4c 100644
--- a/lib/gfxfont.h
+++ b/lib/gfxfont.h
@@ -32,7 +32,7 @@ extern "C" {
 
 /* The quality parameter is given by 1 divided by the zoom factor at which the font
    still looks good. 1=normal, 0.5=double resolution etc. */
-gfxfont_t* gfxfont_load(char*filename, double quality);
+gfxfont_t* gfxfont_load(char*id, char*filename, double quality);
 void gfxfont_free(gfxfont_t*font);
 
 #ifdef __cplusplus
-- 
1.7.10.4