X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxdevice.h;h=02aa686be74e7d16aa23cb69f60741f3fa72601f;hb=9916c6d9fdd191129957fda1eca9b6cc97169c59;hp=a61f27cb14466fc27ed3403081959e698815fe64;hpb=47f4e05ca2188b8055a38381846a42487fe76ef1;p=swftools.git

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index a61f27c..02aa686 100644
--- a/lib/gfxdevice.h
+++ b/lib/gfxdevice.h
@@ -32,6 +32,7 @@ typedef struct _gfxglyph
 
 typedef struct _gfxfont
 {
+    char*id;
     int num_glyphs;
     int max_unicode;
     gfxglyph_t*glyphs;
@@ -105,8 +106,9 @@ typedef struct _gfxdevice
     void (*fillbitmap)(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform); //cxform? tiling?
     void (*fillgradient)(struct _gfxdevice*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix); //?
 
-    void (*addfont)(struct _gfxdevice*dev, char*fontid, gfxfont_t*font);
-    void (*drawchar)(struct _gfxdevice*dev, char*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix);
+    /* deprecated */ void (*addfont)(struct _gfxdevice*dev, gfxfont_t*font);
+
+    void (*drawchar)(struct _gfxdevice*dev, gfxfont_t*fontid, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix);
 
     void (*drawlink)(struct _gfxdevice*dev, gfxline_t*line, char*action);