more fiddling with edgestyles

[swftools.git] / lib / gfxdevice.h

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index f01d79c..699e7f6 100644 (file)
--- a/lib/gfxdevice.h
+++ b/lib/gfxdevice.h
@@ -30,13 +30,24 @@ typedef struct _gfxglyph
     const char*name;
 } gfxglyph_t;
 
+typedef struct _gfxkerning
+{
+    int c1,c2,advance;
+} gfxkerning_t;
+
 typedef struct _gfxfont
 {
     const char*id;
     int num_glyphs;
     int max_unicode;
+    
+    double ascent,descent;
+
     gfxglyph_t*glyphs;
     int* unicode2glyph;
+
+    gfxkerning_t*kerning;
+    int kerning_size;
 } gfxfont_t;
 
 typedef struct _gfxcolor
@@ -62,8 +73,10 @@ typedef struct _gfximage
     int height;
 } gfximage_t;
 
+/* gradients: A radial gradient will start at 0,0 and have a radius of 1,0 
+              An axial gradient starts at -1,0 and ends at 1,0
+ */
 typedef enum {gfxgradient_radial, gfxgradient_linear} gfxgradienttype_t;
-
 typedef struct _gfxgradient
 {
     gfxcolor_t color;
@@ -106,10 +119,13 @@ 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);
+
+    /* expects alpha channel in image to be non-premultiplied */
     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);
+    void (*fillgradient)(struct _gfxdevice*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*gradcoord2devcoord); //?
+
+    void (*addfont)(struct _gfxdevice*dev, gfxfont_t*font);
 
     void (*drawchar)(struct _gfxdevice*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix);
 
@@ -117,6 +133,8 @@ typedef struct _gfxdevice
     
     void (*endpage)(struct _gfxdevice*dev);
     
+    const char* (*geterror)();
+    
     gfxresult_t* (*finish)(struct _gfxdevice*dev);
 
     void* internal;