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

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index b4dd19f..f01d79c 100644
--- a/lib/gfxdevice.h
+++ b/lib/gfxdevice.h
@@ -27,12 +27,12 @@ typedef struct _gfxglyph
     gfxcoord_t advance;
 
     int unicode; // array?
-    char*name;
+    const char*name;
 } gfxglyph_t;
 
 typedef struct _gfxfont
 {
-    char*id;
+    const char*id;
     int num_glyphs;
     int max_unicode;
     gfxglyph_t*glyphs;
@@ -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
@@ -86,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;
@@ -95,7 +96,7 @@ typedef struct _gfxresult
 
 typedef struct _gfxdevice
 {
-    char* name; // gfx device name
+    const char* name; // gfx device name
 
     int (*setparameter)(struct _gfxdevice*dev, const char*key, const char*value);
 
@@ -110,9 +111,9 @@ typedef struct _gfxdevice
 
     /* 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 (*drawchar)(struct _gfxdevice*dev, gfxfont_t*font, 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);