use int for font numchars/maxascii fields

[swftools.git] / lib / rfxswf.h

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 70a1f35..56a1876 100644 (file)
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -48,11 +48,11 @@ extern "C" {
 #define NO_MP3
 #endif
 
-typedef         signed long     SFIXED;
-typedef         signed long     SCOORD;
+typedef signed SFIXED;
+typedef signed SCOORD;
 
-#define SCOORD_MAX 0x7fffffff
-#define SCOORD_MIN -0x80000000
+#define SCOORD_MAX 0x7fffffffl
+#define SCOORD_MIN -0x80000000l
 
 // Basic Structures
 
@@ -192,7 +192,7 @@ void swf_OptimizeTagOrder(SWF*swf);
 
 TAG * swf_InsertTag(TAG * after,U16 id);    // updates frames, if necessary
 TAG * swf_InsertTagBefore(SWF*swf, TAG * before,U16 id);     // like InsertTag, but insert tag before argument
-int   swf_DeleteTag(TAG * t);
+TAG * swf_DeleteTag(SWF*swf, TAG * t);
 
 void  swf_ClearTag(TAG * t);                //frees tag data
 void  swf_ResetTag(TAG*tag, U16 id);        //set's tag position and length to 0, without freeing it
@@ -215,7 +215,7 @@ int   swf_CountUBits(U32 v,int nbits);
 int   swf_CountBits(U32 v,int nbits);
 
 int   swf_GetBlock(TAG * t,U8 * b,int l);   // resets Bitcount
-int   swf_SetBlock(TAG * t,U8 * b,int l);
+int   swf_SetBlock(TAG * t,const U8 * b,int l);
 
 U8    swf_GetU8(TAG * t);                   // resets Bitcount
 U16   swf_GetU16(TAG * t);
@@ -515,8 +515,8 @@ typedef struct _SWFFONT
   U8           version; // 0 = not set, 1 = definefont, 2 = definefont2
   U8 *          name;
   SWFLAYOUT *   layout;
-  U16          numchars;
-  U16          maxascii; // highest mapped ascii value
+  int           numchars;
+  int           maxascii; // highest mapped ascii/unicode value
 
   U8           style;
   U8           encoding;
@@ -937,9 +937,9 @@ void action_fixjump(ActionMarker m1, ActionMarker m2);
 
 extern char*blendModeNames[];
 
-int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name);
-int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction);
-int swf_ObjectPlaceBlend(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U8 blendmode);
+int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const U8 * name);
+int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const U8 * name, U16 clipaction);
+int swf_ObjectPlaceBlend(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,const U8 * name, U8 blendmode);
 int swf_ObjectMove(TAG * t,U16 depth,MATRIX * m,CXFORM * cx);
 
 #define PF_MOVE         0x01