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

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index 79f8f1c..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;
@@ -71,10 +70,10 @@ typedef struct _gfxgradient
 
 typedef struct _gfxcxform
 {
-    float rr,rg,rb,ra;
-    float gr,gg,gb,ga;
-    float br,bg,bb,ba;
-    float ar,ag,ab,aa;
+    float rr,rg,rb,ra, tr;
+    float gr,gg,gb,ga, tg;
+    float br,bg,bb,ba, tb;
+    float ar,ag,ab,aa, ta;
     gfxcolor_t t;
 } gfxcxform_t;
 
@@ -87,23 +86,23 @@ typedef struct _gfxdevice
 {
     int (*setparameter)(struct _gfxdevice*dev, const char*key, const char*value);
 
-    int (*startpage)(struct _gfxdevice*dev, int xmin, int ymin, int xmax, int ymax); /*xmin/ymin?*/
+    void (*startpage)(struct _gfxdevice*dev, int xmin, int ymin, int xmax, int ymax); /*xmin/ymin?*/
 
     void (*startclip)(struct _gfxdevice*dev, gfxline_t*line);
     void (*endclip)(struct _gfxdevice*dev);
     void (*stroke)(struct _gfxdevice*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit);
     void (*fill)(struct _gfxdevice*dev, gfxline_t*line, gfxcolor_t*color);
     void (*fillbitmap)(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform); //cxform? tiling?
-    void (*fillgradient)(struct _gfxdevice*dev, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix); //?
+    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);
     
-    int (*endpage)(struct _gfxdevice*dev); //?
+    void (*endpage)(struct _gfxdevice*dev); //?
     
-    int (*finish)(struct _gfxdevice*dev);
+    void* (*finish)(struct _gfxdevice*dev);
 
     void* internal;
 } gfxdevice_t;