X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=2ecb49b68d9cc6a5a9f49667154210ace761173e;hb=5d23cf0d32a9e907fc641db4a2f3946f0645ed3a;hp=e37fda073645636a159ca05fb75594766ce9a92e;hpb=7169758cfe50bc9fa3bbbf75a1859d9a6fb58776;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index e37fda0..2ecb49b 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -267,6 +267,7 @@ int   swf_VerifyPassword(TAG * t, const char * password);
 
 void swf_ExpandRect(SRECT*src, SPOINT add);
 void swf_ExpandRect2(SRECT*src, SRECT*add);
+void swf_ExpandRect3(SRECT*src, SPOINT center, int radius);
 SPOINT swf_TurnPoint(SPOINT p, MATRIX* m);
 SRECT swf_TurnRect(SRECT r, MATRIX* m);
 
@@ -491,6 +492,11 @@ typedef struct
   SHAPE *     shape;
 } SWFGLYPH;
 
+typedef struct _FONTUSAGE
+{ int* chars;
+  char is_reduced;
+} FONTUSAGE, * LPFONTUSAGE;
+
 #define FONT_STYLE_BOLD 1
 #define FONT_STYLE_ITALIC 2
 #define FONT_ENCODING_UNICODE 1
@@ -513,12 +519,11 @@ typedef struct _SWFFONT
   SWFGLYPH *	glyph;
   U8		language;
   char **	glyphnames;
+
+  FONTUSAGE *   use;
+
 } SWFFONT, * LPSWFFONT;
 
-// does not support wide characters !
-typedef struct _FONTUSAGE
-{ U8* code;
-} FONTUSAGE, * LPFONTUSAGE;
 
 #define ET_HASTEXT 32768
 #define ET_WORDWRAP 16384
@@ -557,10 +562,11 @@ int swf_FontIsItalic(SWFFONT * f);
 int swf_FontIsBold(SWFFONT * f);
 
 int swf_FontSetID(SWFFONT * f,U16 id);
-int swf_FontReduce(SWFFONT * f,FONTUSAGE * use);
+int swf_FontReduce(SWFFONT * f);
 
-int swf_FontInitUsage(SWFFONT * f,FONTUSAGE * use);
-int swf_FontUse(SWFFONT* f,FONTUSAGE * use,U8 * s);
+int swf_FontInitUsage(SWFFONT * f);
+int swf_FontUseGlyph(SWFFONT * f, int glyph);
+int swf_FontUse(SWFFONT* f,U8 * s);
 
 int swf_FontSetDefine(TAG * t,SWFFONT * f);
 int swf_FontSetDefine2(TAG * t,SWFFONT * f);
@@ -883,7 +889,7 @@ int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx);
 typedef struct _SWFPLACEOBJECT {
     U16 depth;
     U16 id; // may be 0
-    bool move; //true: move/replace character, false: set character
+    char move; //true: move/replace character, false: set character
     MATRIX matrix;
     CXFORM cxform;
     U16 ratio;