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

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index a61f27c..f852814 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;
@@ -54,6 +55,8 @@ typedef struct _gfxmatrix
 
 typedef struct _gfximage
 {
+    /* if the data contains an alpha layer (a != 255), the
+       r,g,b values will have to be premultiplied */
     gfxcolor_t*data;
     int width;
     int height;
@@ -94,6 +97,8 @@ 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 width, int height);
@@ -102,11 +107,12 @@ typedef struct _gfxdevice
     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);