X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fgfxdevice.h;h=fd418951e637bf835adee6e918dd47cd6ec8c7b6;hb=83621997695ff8ca891644ad907d0c14940015dd;hp=02aa686be74e7d16aa23cb69f60741f3fa72601f;hpb=6c641a457a7ce2b58586c4900d75727c0a357a65;p=swftools.git

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index 02aa686..fd41895 100644
--- a/lib/gfxdevice.h
+++ b/lib/gfxdevice.h
@@ -55,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;
@@ -75,7 +77,6 @@ typedef struct _gfxcxform
     float gr,gg,gb,ga, tg;
     float br,bg,bb,ba, tb;
     float ar,ag,ab,aa, ta;
-    gfxcolor_t t;
 } gfxcxform_t;
 
 typedef struct _gfxbbox
@@ -95,6 +96,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);
@@ -103,7 +106,7 @@ 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); //?
 
     /* deprecated */ void (*addfont)(struct _gfxdevice*dev, gfxfont_t*font);