git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added memset
[swftools.git]
/
lib
/
rfxswf.h
diff --git
a/lib/rfxswf.h
b/lib/rfxswf.h
index
d52192a
..
724134d
100644
(file)
--- a/
lib/rfxswf.h
+++ b/
lib/rfxswf.h
@@
-230,13
+230,6
@@
int swf_SetRGBA(TAG * t,RGBA * col);
// Advanced Funtions
// Advanced Funtions
-// swfdump.c
-
-void swf_DumpHeader(FILE * f,SWF * swf);
-void swf_DumpMatrix(FILE * f,MATRIX * m);
-void swf_DumpTag(FILE * f,TAG * t);
-char* swf_TagGetName(TAG*tag);
-
// swfshape.c
typedef struct _LINESTYLE
// swfshape.c
typedef struct _LINESTYLE
@@
-306,33
+299,40
@@
int swf_ShapeSetEnd(TAG * t);
// does not support wide characters !
// does not support wide characters !
-#define MAX_CHAR_PER_FONT 256
+#define MAX_CHAR_PER_FONT 512
+
+typedef struct _KERNING
+{
+ U16 char1;
+ U16 char2;
+ U16 adjustment;
+} SWFKERNING;
typedef struct _SWFLAYOUT
typedef struct _SWFLAYOUT
-{ S16 ascent;
- S16 descent;
- S16 leading;
- SRECT bounds[MAX_CHAR_PER_FONT];
- struct
- { U16 count;
- U8 * data; // size = count*4 bytes
- } kerning;
+{ S16 ascent;
+ S16 descent;
+ S16 leading;
+ SRECT * bounds;
+ U16 kerningcount;
+ SWFKERNING * kerning;
} SWFLAYOUT, * LPSWFLAYOUT;
} SWFLAYOUT, * LPSWFLAYOUT;
+typedef struct
+{ S16 advance;
+ SHAPE * shape;
+} SWFGLYPH;
+
typedef struct _SWFFONT
typedef struct _SWFFONT
-{ U16 id;
+{ int id; // -1 = not set
+ U8 version; // 0 = not set, 1 = definefont, 2 = definefont2
U8 * name;
SWFLAYOUT * layout;
U8 * name;
SWFLAYOUT * layout;
-
+ U16 numchars;
+ U16 maxascii; // highest mapped ascii value
U8 flags; // bold/italic/unicode/ansi ...
U8 flags; // bold/italic/unicode/ansi ...
-
- U16 codes[MAX_CHAR_PER_FONT];
-
- struct
- { U16 advance;
- U16 gid; // Glyph-ID after DefineFont
- SHAPE * shape;
- } glyph[MAX_CHAR_PER_FONT];
+ U16 * glyph2ascii;
+ int * ascii2glyph;
+ SWFGLYPH * glyph;
} SWFFONT, * LPSWFFONT;
typedef struct _FONTUSAGE
} SWFFONT, * LPSWFFONT;
typedef struct _FONTUSAGE
@@
-375,6
+375,13
@@
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
int swf_TextPrintDefineText(TAG * t,SWFFONT * f);
// Prints text defined in tag t with font f to stdout
+// swfdump.c
+
+void swf_DumpHeader(FILE * f,SWF * swf);
+void swf_DumpMatrix(FILE * f,MATRIX * m);
+void swf_DumpTag(FILE * f,TAG * t);
+char* swf_TagGetName(TAG*tag);
+void swf_DumpFont(SWFFONT * font);
// swfobject.c
// swfobject.c