X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=lib%2Fmodules%2Fswftools.c;h=2a6e542ac44d8bd2fc4d8a048512441a1781aabe;hb=a822c616be5fcdad5a3ef2c8e402571da5facee0;hp=bbbfee3dcc451d76180108664ff1f58bf4f3e9f8;hpb=e448c7a56df8e289c9dbd5b8d87753addd541091;p=swftools.git

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index bbbfee3..2a6e542 100644
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -78,6 +78,7 @@ U16 swf_GetDefineID(TAG * t)
     case ST_DEFINESHAPE2:
     case ST_DEFINESHAPE3:
     case ST_DEFINEMORPHSHAPE:
+    case ST_DEFINEEDITTEXT:
     case ST_DEFINEBITS:
     case ST_DEFINEBITSJPEG2:
     case ST_DEFINEBITSJPEG3:
@@ -131,7 +132,7 @@ U16 swf_GetPlaceID(TAG * t)
   return id;
 }
 
-int definingtagids[] =
+static int swf_definingtagids[] =
 {ST_DEFINESHAPE,
  ST_DEFINESHAPE2,
  ST_DEFINESHAPE3,
@@ -155,7 +156,7 @@ int definingtagids[] =
 };
 
 // tags which may be used inside a sprite definition
-int spritetagids[] =
+static int swf_spritetagids[] =
 {ST_SHOWFRAME,
  ST_PLACEOBJECT,
  ST_PLACEOBJECT2,
@@ -175,9 +176,9 @@ U8 swf_isAllowedSpriteTag(TAG * tag)
 {
     int id = tag->id;
     int t=0;
-    while(spritetagids[t]>=0)
+    while(swf_spritetagids[t]>=0)
     {
-        if(spritetagids[t] == id) 
+        if(swf_spritetagids[t] == id) 
             return 1;
         t++;
     }
@@ -188,9 +189,9 @@ U8 swf_isDefiningTag(TAG * tag)
 {
     int id = tag->id;
     int t=0;
-    while(definingtagids[t]>=0)
+    while(swf_definingtagids[t]>=0)
     {
-        if(definingtagids[t] == id) 
+        if(swf_definingtagids[t] == id) 
             return 1;
         t++;
     }
@@ -223,7 +224,7 @@ U16 swf_GetDepth(TAG * t)
   return depth;
 }
 
-char* swf_GetTagName(TAG * t)
+char* swf_GetName(TAG * t)
 {
     char* name = 0;
     U32 oldTagPos;
@@ -248,7 +249,7 @@ char* swf_GetTagName(TAG * t)
             if(flags&PF_RATIO)
               swf_GetU16(t);
             if(flags&PF_NAME) {
-              swf_ResetBitmask(t);
+              swf_ResetReadBits(t);
               name = &t->data[swf_GetTagPos(t)];
             }
         }