X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fgfxdevice.h;h=1526a4b781fd48df9fb19d04fee25c9cdd2610b7;hb=548ae10ba18976b2b0ed877fa94c86d3a9468d78;hp=0a881d1faf7d2b1f9e8285a8330643c77958aa19;hpb=65418be637dc1899f9f4888f3c101a879b32f8ef;p=swftools.git

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index 0a881d1..1526a4b 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;
@@ -83,6 +82,16 @@ typedef struct _gfxbbox
     gfxcoord_t xmin, ymin, xmax, ymax;
 } gfxbbox_t;
 
+typedef struct _gfxresult
+{
+    void (*write)(struct _gfxresult*gfx, int filedesc);
+    int (*save)(struct _gfxresult*gfx, char*filename);
+    void* (*get)(struct _gfxresult*gfx, char*name);
+    void (*destroy)(struct _gfxresult*gfx);
+
+    void*internal;
+} gfxresult_t;
+
 typedef struct _gfxdevice
 {
     int (*setparameter)(struct _gfxdevice*dev, const char*key, const char*value);
@@ -96,14 +105,14 @@ 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);
+    void (*drawlink)(struct _gfxdevice*dev, gfxline_t*line, char*action);
     
     void (*endpage)(struct _gfxdevice*dev); //?
     
-    void* (*finish)(struct _gfxdevice*dev);
+    gfxresult_t* (*finish)(struct _gfxdevice*dev);
 
     void* internal;
 } gfxdevice_t;