removed SWF_OUTLINE- gfxdevice's outlines are now used.

diff --git a/pdf2swf/swfoutput.h b/pdf2swf/swfoutput.h
index c67246e..5b00cd9 100644 (file)
--- a/pdf2swf/swfoutput.h
+++ b/pdf2swf/swfoutput.h
@@ -24,6 +24,7 @@
 
 extern "C" {
 #include "../lib/rfxswf.h"
+#include "../lib/gfxdevice.h"
 }
 typedef long int twip;
 
@@ -48,47 +49,6 @@ struct swfoutput
     void*internal;
 };
 
-/* outline definition, adapted from t1lib.h */
-
-/* A fractional point */
-typedef struct {
-  long x;
-  long y;
-} SWF_PATHPOINT;
-
-/* A straight outline segment, stroked or not stroked */
-typedef struct pathsegment {  
-  char type;                /* type of segment (line or move) */
-  unsigned char flag;       /* type1 rasterizer internal stuff */
-  short references;         /* type1 rasterizer internal stuff */
-  unsigned char size;       /* size of the structure */
-  unsigned char context;    /* index to device context */
-  struct pathsegment *link; /* pointer to next structure in linked list */
-  struct pathsegment *last; /* pointer to last structure in list */
-  SWF_PATHPOINT    dest;     /* relative ending location of path segment */
-} SWF_PATHSEGMENT;
-
-/* A third order bezier segment */
-typedef struct bezierpathsegment {
-  char type;                /* type of segment (bezier) */
-  unsigned char flag;     /* type1 rasterizer internal stuff */
-  short references;       /* type1 rasterizer internal stuff */
-  unsigned char size;     /* as with any 'segment' type */
-  unsigned char context;  /* as with any 'segment' type */
-  SWF_PATHSEGMENT *link;   /* as with any 'segment' type */
-  SWF_PATHSEGMENT *last;   /* as with any 'segment' type */
-  SWF_PATHPOINT    dest;   /* ending point (D) */
-  SWF_PATHPOINT    B;      /* control point B */
-  SWF_PATHPOINT    C;      /* control point C */
-} SWF_BEZIERSEGMENT;
-
-typedef SWF_PATHSEGMENT  SWF_OUTLINE;
-
-#define   SWF_PATHTYPE_LINE           0x10
-#define   SWF_PATHTYPE_BEZIER         0x12
-#define   SWF_PATHTYPE_MOVE           0x15
-
-
 #define DRAWMODE_STROKE 1
 #define DRAWMODE_FILL 2
 #define DRAWMODE_EOFILL 3
@@ -108,23 +68,12 @@ void swfoutput_newpage(struct swfoutput*, int pageNum, int movex, int movey, int
 void swfoutput_setfont(struct swfoutput*, char*fontid, char*filename);
 int swfoutput_queryfont(struct swfoutput*, char*fontid);
 int getCharID(SWFFONT *font, int charnr, char *charname, int u);
-
-void swfoutput_setdrawmode(struct swfoutput*, int drawmode);
-void swfoutput_setfillcolor(struct swfoutput*, unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-void swfoutput_setstrokecolor(struct swfoutput*, unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 void swfoutput_setfontmatrix(struct swfoutput*,double,double,double,double);
-void swfoutput_setlinewidth(struct swfoutput*, double linewidth);
-
-int swfoutput_drawchar(struct swfoutput*,double x,double y,char*a, int charnr, int u);
-void swfoutput_drawpath(struct swfoutput*, SWF_OUTLINE*outline, struct swfmatrix*m);
-#define LINE_CAP_BUTT 0
-#define LINE_CAP_ROUND 1 
-#define LINE_CAP_SQUARE 2
-#define LINE_JOIN_MITER 0 
-#define LINE_JOIN_ROUND 1
-#define LINE_JOIN_BEVEL 2
-void swfoutput_drawpath2poly(struct swfoutput*, SWF_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit);
-void swfoutput_startclip(struct swfoutput*, SWF_OUTLINE*outline, struct swfmatrix*m);
+int swfoutput_drawchar(struct swfoutput*,double x,double y,char*a, int charnr, int u, gfxcolor_t* col);
+
+void swfoutput_drawgfxline(struct swfoutput*, gfxline_t*line, gfxcoord_t width, gfxcolor_t*col, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit);
+void swfoutput_fillgfxline(struct swfoutput*, gfxline_t*line, gfxcolor_t*col);
+void swfoutput_startclip(struct swfoutput*, gfxline_t*line);
 void swfoutput_endclip(struct swfoutput*);
 
 void swfoutput_drawimagejpeg(struct swfoutput*, RGBA*pic, int sizex,int sizey,