X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxdevice.h;h=b4dd19ff186b93e3d3f612c495c5aafb327d740a;hb=5386028e78548134c4a475dcfd815569e7dc9676;hp=1526a4b781fd48df9fb19d04fee25c9cdd2610b7;hpb=d109ab584bd30055f3662ac4039ced44221823cf;p=swftools.git

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index 1526a4b..b4dd19f 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;
@@ -94,23 +95,26 @@ typedef struct _gfxresult
 
 typedef struct _gfxdevice
 {
+    char* name; // gfx device name
+
     int (*setparameter)(struct _gfxdevice*dev, const char*key, const char*value);
 
-    void (*startpage)(struct _gfxdevice*dev, int xmin, int ymin, int xmax, int ymax); /*xmin/ymin?*/
+    void (*startpage)(struct _gfxdevice*dev, int width, int height);
 
     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 (*fillbitmap)(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*imgcoord2devcoord, 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);
     
-    void (*endpage)(struct _gfxdevice*dev); //?
+    void (*endpage)(struct _gfxdevice*dev);
     
     gfxresult_t* (*finish)(struct _gfxdevice*dev);