flagged addfont() as deprecated

[swftools.git] / lib / gfxdevice.h

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index 47068ed..02aa686 100644 (file)
--- 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;
@@ -82,11 +83,21 @@ typedef struct _gfxbbox
     gfxcoord_t xmin, ymin, xmax, ymax;
 } gfxbbox_t;
 
+typedef struct _gfxresult
+{
+    void (*write)(struct _gfxresult*gfx, int filedesc);
+    int (*save)(struct _gfxresult*gfx, char*filename);
+    void* (*get)(struct _gfxresult*gfx, char*name);
+    void (*destroy)(struct _gfxresult*gfx);
+
+    void*internal;
+} gfxresult_t;
+
 typedef struct _gfxdevice
 {
     int (*setparameter)(struct _gfxdevice*dev, const char*key, const char*value);
 
-    void (*startpage)(struct _gfxdevice*dev, int xmin, int ymin, int xmax, int ymax); /*xmin/ymin?*/
+    void (*startpage)(struct _gfxdevice*dev, int width, int height);
 
     void (*startclip)(struct _gfxdevice*dev, gfxline_t*line);
     void (*endclip)(struct _gfxdevice*dev);
@@ -95,14 +106,15 @@ typedef struct _gfxdevice
     void (*fillbitmap)(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, 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 (*endpage)(struct _gfxdevice*dev); //?
+    void (*endpage)(struct _gfxdevice*dev);
     
-    void* (*finish)(struct _gfxdevice*dev);
+    gfxresult_t* (*finish)(struct _gfxdevice*dev);
 
     void* internal;
 } gfxdevice_t;