X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=2ecb49b68d9cc6a5a9f49667154210ace761173e;hb=f57077f3f4f3583c51dd83ec0989d600b1436b88;hp=b5e062c308f2a1c929f1d34775652566bb053e76;hpb=1956e0151faa149f8b66daad15a7244ede6e1ded;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index b5e062c..2ecb49b 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -151,6 +151,9 @@ typedef struct _TAG             // NEVER access a Tag-Struct directly !
   
 } TAG, * LPTAG;
 
+#define swf_ResetReadBits(tag)   if (tag->readBit)  { tag->pos++; tag->readBit = 0; }
+#define swf_ResetWriteBits(tag)  if (tag->writeBit) { tag->writeBit = 0; }
+
 typedef struct _SOUNDINFO 
 {
     U8 stop;
@@ -264,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);
 
@@ -488,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
@@ -510,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
@@ -554,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);
@@ -583,7 +592,9 @@ int swf_TextSetCharRecord(TAG * t,SWFFONT * font,U8 * s,int scale,U8 gbits,U8 ab
 int swf_TextPrintDefineText(TAG * t,SWFFONT * f);
 // Prints text defined in tag t with font f to stdout
 
-/* notice: if you set the fontid, make sure the corresponding font has layout information */
+void swf_FontPrepareForEditText(SWFFONT * f);
+
+/* notice: if you set the fontid, make sure you call swf_FontPrepareForEditText() for the font first */
 void swf_SetEditText(TAG*tag, U16 flags, SRECT r, char*text, RGBA*color, 
 	int maxlength, U16 font, U16 height, EditTextLayout*layout, char*variable);
 
@@ -597,6 +608,8 @@ SWFFONT* swf_LoadTrueTypeFont(char*filename);
 SWFFONT* swf_LoadT1Font(char*filename);
 SWFFONT* swf_LoadFont(char*filename);
 
+void swf_SetLoadFontParameters(int scale, int skip_unused, int full_unicode);
+
 // swfdump.c
 
 void swf_DumpHeader(FILE * f,SWF * swf);
@@ -876,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;