X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=2a07fdb87a81d0cc8ee6f473d4566dcde59ccdc8;hb=6c3ab5574d31504d24710c2756899d49275c1a37;hp=60b35619b734fe69bb016ab694250d7e10a26fc1;hpb=57c76fea2ab1652cb1727342ab7caf02569eeab7;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 60b3561..2a07fdb 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -24,10 +24,6 @@
 #ifndef __RFX_SWF_INCLUDED__
 #define __RFX_SWF_INCLUDED__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -227,7 +223,7 @@ int   swf_SetU8(TAG * t,U8 v);              // resets Bitcount
 int   swf_SetU16(TAG * t,U16 v);
 void  swf_SetS16(TAG * t,int v);
 int   swf_SetU32(TAG * t,U32 v);
-#define swf_SetString(t,s)  swf_SetBlock(t,s,strlen(s)+1)
+#define swf_SetString(t,s)  swf_SetBlock(t,s,strlen((const char *)s)+1)
 
 //int   swf_GetPoint(TAG * t,SPOINT * p);     // resets Bitcount
 int   swf_GetRect(TAG * t,SRECT * r);
@@ -326,11 +322,15 @@ SRECT swf_TurnRect(SRECT r, MATRIX* m);
 #define ST_DEFINEFONTALIGNZONES 73 /* version 8 */
 #define ST_CSMTEXTSETTINGS	74 /* version 8 */
 #define ST_DEFINEFONT3		75 /* version 8 */
+#define ST_SYMBOLCLASS		76 /* version 9 */
 #define ST_METADATA		77 /* version 8 */
 #define ST_DEFINESCALINGGRID    78 /* version 8 */
+#define ST_DOABC		82 /* version 9 */
 #define ST_DEFINESHAPE4		83 /* version 8 */
 #define ST_DEFINEMORPHSHAPE2    84 /* version 8 */
 #define ST_SCENEDESCRIPTION	86 /* version 9 */
+#define ST_DEFINEBINARY		87 /* version 9 */
+#define ST_DEFINEFONTNAME	88 /* version 9 */
 
 /* custom tags- only valid for swftools */
 #define ST_REFLEX              777 /* to identify generator software */
@@ -393,9 +393,10 @@ typedef struct _SHAPE2
     SRECT* bbox; // may be NULL
 } SHAPE2;
 
+enum SHAPELINETYPE {moveTo, lineTo, splineTo};
 typedef struct _SHAPELINE
 {
-    enum {moveTo, lineTo, splineTo} type;
+    enum SHAPELINETYPE type;
     SCOORD x,y;
     SCOORD sx,sy; //only if type==splineTo
     int fillstyle0;
@@ -554,6 +555,10 @@ int swf_FontEnumerate(SWF * swf,void (*FontCallback) (void*,U16,U8*), void*self)
 int swf_FontExtract(SWF * swf,int id,SWFFONT ** f);
 // Fetches all available information from DefineFont, DefineFontInfo, DefineText, ...
 // id = FontID, id=0 -> Extract first Font
+int swf_FontExtract_DefineFont2(int id, SWFFONT * font, TAG * tag);
+int swf_FontExtract_DefineFontInfo(int id, SWFFONT * f, TAG * t);
+int swf_FontExtract_DefineFont(int id, SWFFONT * f, TAG * t);
+int swf_FontExtract_GlyphNames(int id, SWFFONT * f, TAG * tag);
 
 int swf_FontIsItalic(SWFFONT * f);
 int swf_FontIsBold(SWFFONT * f);
@@ -882,7 +887,7 @@ ActionTAG* action_BitLShift(ActionTAG*atag);
 ActionTAG* action_BitRShift(ActionTAG*atag);
 ActionTAG* action_BitURShift(ActionTAG*atag);
 ActionTAG* action_GotoFrame(ActionTAG*atag, U16 frame);
-ActionTAG* action_GetUrl(ActionTAG*atag, char* url, char* label);
+ActionTAG* action_GetUrl(ActionTAG*atag, const char* url, char* label);
 ActionTAG* action_StoreRegister(ActionTAG*atag, U8 reg);
 ActionTAG* action_Constantpool(ActionTAG*atag, char* constantpool);
 ActionTAG* action_WaitForFrame(ActionTAG*atag, U16 frame, U8 skip);
@@ -890,7 +895,7 @@ ActionTAG* action_SetTarget(ActionTAG*atag, char* target);
 ActionTAG* action_GotoLabel(ActionTAG*atag, char* label);
 ActionTAG* action_WaitForFrame2(ActionTAG*atag, U8 skip);
 ActionTAG* action_With(ActionTAG*atag, char*object);
-ActionTAG* action_PushString(ActionTAG*atag, char*str);
+ActionTAG* action_PushString(ActionTAG*atag, const char*str);
 ActionTAG* action_PushFloat(ActionTAG*atag, float f);
 ActionTAG* action_PushNULL(ActionTAG*atag);
 ActionTAG* action_PushRegister(ActionTAG*atag, U8 reg);
@@ -985,7 +990,7 @@ void swf_Render_SetBackgroundColor(RENDERBUF*buf, RGBA color);
 RGBA* swf_Render(RENDERBUF*dest);
 void swf_RenderShape(RENDERBUF*dest, SHAPE2*shape, MATRIX*m, CXFORM*c, U16 depth,U16 clipdepth);
 void swf_RenderSWF(RENDERBUF*buf, SWF*swf);
-void swf_Render_AddImage(RENDERBUF*buf, U16 id, RGBA*img, int width, int height);
+void swf_Render_AddImage(RENDERBUF*buf, U16 id, RGBA*img, int width, int height); /* img is non-premultiplied */
 void swf_Render_ClearCanvas(RENDERBUF*dest);
 void swf_Render_Delete(RENDERBUF*dest);
 
@@ -1058,9 +1063,6 @@ void swf_SetFilter(TAG*tag, FILTER*f);
 FILTER*swf_GetFilter(TAG*tag);
 FILTER*swf_NewFilter(U8 type);
 
-#ifdef __cplusplus
-}
-#endif
+void AVM2_InsertStops(SWF*swf);
 
 #endif
-