X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=2ed41e06773fb8cab47bf3aae1a75e68c8fe19c4;hb=08436744d1326f8314bcbc18df64f7b1977b1685;hp=07b9ea00d7f70fb1ed5cd6a45d3951c773e6d9a5;hpb=133453cc112df7e7d5ce35f3dde5178303154da5;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 07b9ea0..2ed41e0 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -453,6 +453,7 @@ void	swf_DumpShape(SHAPE2*shape2);
 
 // swfdraw.c
 
+void swf_Shape10DrawerInit(drawer_t*draw, TAG*tag);
 void swf_Shape01DrawerInit(drawer_t*draw, TAG*tag);
 void swf_Shape11DrawerInit(drawer_t*draw, TAG*tag);
 SHAPE* swf_ShapeDrawerToShape(drawer_t*draw);
@@ -561,8 +562,7 @@ int swf_FontSetInfo(TAG * t,SWFFONT * f);
 void swf_FontCreateLayout(SWFFONT*f);
 void swf_FontAddLayout(SWFFONT * f, int ascent, int descent, int leading);
 
-int swf_FontExtract_DefineTextCallback(int id,SWFFONT * f,TAG * t,int jobs, 
-	void(*callback)(int*chars, int nr, int id));
+int swf_ParseDefineText(TAG * t, void(*callback)(void*self, int*chars, int*xpos, int nr, int fontid, int fontsize, int xstart, int ystart, RGBA* color), void*self);
 
 void swf_WriteFont(SWFFONT* font, char* filename);
 SWFFONT* swf_ReadFont(char* filename);
@@ -613,6 +613,10 @@ void swf_DumpFont(SWFFONT * font);
 
 // Button Conditions
 
+/* missing: IDLE_OUTDOWN 
+            OUTDOWN_OVERUP
+	    OVERUP_OUTDOWN
+*/
 #define BC_OVERDOWN_IDLE        0x0100
 #define BC_IDLE_OVERDOWN        0x0080
 #define BC_OUTDOWN_IDLE         0x0040
@@ -693,14 +697,6 @@ int swf_SetJPEGBits3(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality);
 #define BMF_16BIT       4
 #define BMF_32BIT       5
 
-#define BM16_BLUE       0xf800          // Bitmasks for 16 Bit Color
-#define BM16_RED        0x00f0
-#define BM16_GREEN      0x000f
-
-#define BM32_BLUE       0xff000000      // Bitmasks for 32 Bit Color
-#define BM32_GREEN      0x00ff0000
-#define BM32_RED        0x0000ff00
-
 int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags);
 int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palette,U16 ncolors);
 int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap);
@@ -730,6 +726,8 @@ void swf_GetUsedIDs(TAG * t, int * positions);
 void swf_Relocate(SWF*swf, char*bitmap); // bitmap is 65536 bytes, bitmap[a]==0 means id a is free
 void swf_RelocateDepth(SWF*swf, char*bitmap); // bitmap is 65536 bytes, bitmap[d]==0 means depth d is free
 
+TAG* swf_Concatenate (TAG*list1,TAG*list2); // warning: both list1 and list2 are invalid after this call.
+
 // swfcgi.c
 
 void swf_uncgi();  // same behaviour as Steven Grimm's uncgi-library