added swf_ExpandRect3() method.

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index e37fda0..6e5cbd6 100644 (file)
--- 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);