From: kramm <kramm>
Date: Sun, 16 Jun 2002 18:16:01 +0000 (+0000)
Subject: fixed morph shape ID enumerating.
X-Git-Tag: release-0-4-0~8
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=d92541bade3801afd3c188f30e9672a861c90cc1;p=swftools.git

fixed morph shape ID enumerating.
---

diff --git a/lib/modules/swftools.c b/lib/modules/swftools.c
index 564825d..2356dfb 100644
--- a/lib/modules/swftools.c
+++ b/lib/modules/swftools.c
@@ -575,8 +575,7 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 	    callback(tag, tag->pos + base, callback_data);
 	break;
 
-	//case ST_DEFINEMORPHSHAPE: /* disabled for now (doesn't work) */
-
+	case ST_DEFINEMORPHSHAPE: /* disabled for now (doesn't work) */
 	case ST_DEFINESHAPE3: // these thingies might have bitmap ids in their fillstyles
 	num++; //fallthrough
 	case ST_DEFINESHAPE2:
@@ -585,23 +584,28 @@ void enumerateUsedIDs(TAG * tag, int base, void (*callback)(TAG*, int, void*), v
 	    int fillbits;
 	    int linebits;
 	    int id; 
+	    int numshapes = 1;
 	    int morph = 0;
-	    if(tag->id == ST_DEFINEMORPHSHAPE)
+	    if(tag->id == ST_DEFINEMORPHSHAPE) {
+		numshapes = 2;
 		morph = 1;
+	    }
 
 	    id = swf_GetU16(tag); // id;
 	    swf_GetRect(tag, NULL); // bounds
 	    if(morph) {
+		swf_ResetReadBits(tag);
 		swf_GetRect(tag, NULL); // bounds2
 		swf_GetU32(tag); //offset to endedges
 	    }
-    
+   
 	    DEBUG_ENUMERATE printf("Tag:%d Name:%s ID:%d\n", tag->id, swf_TagGetName(tag), id);
 
 	    enumerateUsedIDs_styles(tag, callback, callback_data, num, morph);
 	    DEBUG_ENUMERATE printf("-------\n");
-	    while(--morph>=0) /* morph shapes define two shapes */
+	    while(--numshapes>=0) /* morph shapes define two shapes */
 	    {
+		DEBUG_ENUMERATE printf("shape:%d\n", numshapes);
 		fillbits = swf_GetBits(tag, 4);
 		linebits = swf_GetBits(tag, 4);
 		DEBUG_ENUMERATE printf("%d %d\n", fillbits, linebits);