X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=pdf2swf%2Fswfoutput.h;h=0b4ceedd5ede1bfcbff6a2316a266681f6270092;hp=015fb39a8aea85120f30516070dbdbd678588e60;hb=9aa850fb4c4b28c64d53e144b4a107d982917b2e;hpb=aecc804e3bd0642924c2225b76f483c6f32491c7

diff --git a/pdf2swf/swfoutput.h b/pdf2swf/swfoutput.h
index 015fb39..0b4ceed 100644
--- a/pdf2swf/swfoutput.h
+++ b/pdf2swf/swfoutput.h
@@ -22,12 +22,6 @@
 #ifndef __swfoutput_h__
 #define __swfoutput_h__
 
-#include <t1lib.h>
-#include "CharTypes.h"
-#ifdef T1ERR_SCAN_ENCODING //t1lib 5.0.0
-#define T1_Get_no_fonts T1_GetNoFonts
-#endif
-
 extern "C" {
 #include "../lib/rfxswf.h"
 }
@@ -54,50 +48,56 @@ struct swfcoord {
     twip y;
 };
 
-class SWFFont
-{
-    T1_OUTLINE**outline;
-    char**charname;
-    int*width;
-    char*used;
-
-    char*name;
-    int charnum;
-
-    U16*char2swfcharid;
-    U16*swfcharid2char;
-    int swfcharpos;
-
-    char**standardtable;
-    int standardtablesize;
-
-    public:
-    
-    int t1id;
-    char*fontid;
-    unsigned int swfid;
-
-    SWFFont(char*name, int t1id, char*filename);
-    SWFFont::~SWFFont();
-    T1_OUTLINE*getOutline(char*charname, int charnr);
-    int getSWFCharID(char*name, int charnr);
-    int getWidth(char*name);
-    char*getName();
-    char*getCharName(int t);
-    int getCharWidth(int t) {return width[t];}
-};
-
 struct swfoutput 
 {
-    //int t1font;
     double fontm11,fontm12,fontm21,fontm22;
     unsigned short int linewidth;
-    SWFFont *font;
     SWFFONT *swffont;
     RGBA strokergb;
     RGBA fillrgb;
 };
 
+/* 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
@@ -109,9 +109,9 @@ void swfoutput_setprotected(); //write PROTECT tag
 
 void swfoutput_newpage(struct swfoutput*);
 
-void swfoutput_setfont(struct swfoutput*, char*fontid, int t1font, char*filename);
+void swfoutput_setfont(struct swfoutput*, char*fontid, char*filename);
 int swfoutput_queryfont(struct swfoutput*, char*fontid);
-int getCharID(SWFFONT *font, int charnr, char *charname, Unicode u);
+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);
@@ -119,16 +119,16 @@ void swfoutput_setstrokecolor(struct swfoutput*, unsigned char r, unsigned char
 void swfoutput_setfontmatrix(struct swfoutput*,double,double,double,double);
 void swfoutput_setlinewidth(struct swfoutput*, double linewidth);
 
-void swfoutput_drawchar(struct swfoutput*,double x,double y,char*a, int charnr, Unicode u);
-void swfoutput_drawpath(struct swfoutput*, T1_OUTLINE*outline, struct swfmatrix*m);
+void 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*, T1_OUTLINE*outline, struct swfmatrix*m, int line_join, int line_cap, double line_width, double miter_limit);
-void swfoutput_startclip(struct swfoutput*, T1_OUTLINE*outline, struct swfmatrix*m);
+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);
 void swfoutput_endclip(struct swfoutput*);
 int swfoutput_drawimagejpeg(struct swfoutput*, RGBA*pic, int sizex,int sizey, 
 	double x1,double y1,