X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxdevice.h;fp=lib%2Fgfxdevice.h;h=e338834747b0479a9f8b4cd275e65519efad3e16;hp=0a881d1faf7d2b1f9e8285a8330643c77958aa19;hb=40bf7835baaeaef0726be9183aceea27f4c223c8;hpb=a2bb73ec71c706910c4528e356a814d17411c65c

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index 0a881d1..e338834 100644
--- a/lib/gfxdevice.h
+++ b/lib/gfxdevice.h
@@ -32,7 +32,6 @@ typedef struct _gfxglyph
 
 typedef struct _gfxfont
 {
-    char*name;
     int num_glyphs;
     int max_unicode;
     gfxglyph_t*glyphs;
@@ -96,8 +95,8 @@ 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, gfxmatrix_t*matrix);
-    void (*drawchar)(struct _gfxdevice*dev, char*fontid, int glyph, int x, int y);
+    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);
 
     void (*drawlink)(struct _gfxdevice*dev, int x1, int y1, int x2, int y2, char*action);