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

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index a61f27c..d0e7d14 100644
--- a/lib/gfxdevice.h
+++ b/lib/gfxdevice.h
@@ -27,11 +27,12 @@ typedef struct _gfxglyph
     gfxcoord_t advance;
 
     int unicode; // array?
-    char*name;
+    const char*name;
 } gfxglyph_t;
 
 typedef struct _gfxfont
 {
+    const 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;
@@ -74,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
@@ -85,8 +87,8 @@ typedef struct _gfxbbox
 typedef struct _gfxresult
 {
     void (*write)(struct _gfxresult*gfx, int filedesc);
-    int (*save)(struct _gfxresult*gfx, char*filename);
-    void* (*get)(struct _gfxresult*gfx, char*name);
+    int (*save)(struct _gfxresult*gfx, const char*filename);
+    void* (*get)(struct _gfxresult*gfx, const char*name);
     void (*destroy)(struct _gfxresult*gfx);
 
     void*internal;
@@ -94,6 +96,8 @@ typedef struct _gfxresult
 
 typedef struct _gfxdevice
 {
+    const 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,13 +106,14 @@ 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);
+    void (*drawlink)(struct _gfxdevice*dev, gfxline_t*line, const char*action);
     
     void (*endpage)(struct _gfxdevice*dev);