swf_tag_sprite_detail 構築処理の refine と ->prev 対応

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/swfed/trunk@519 7c90b180-03d5-4157-b861-58a559ae9d1e

diff --git a/src/swf_tag_sprite.c b/src/swf_tag_sprite.c
index 7beef7a..d489ad3 100644 (file)
--- a/src/swf_tag_sprite.c
+++ b/src/swf_tag_sprite.c
@@ -41,7 +41,7 @@ swf_tag_sprite_input_detail(swf_tag_t *tag, struct swf_object_ *swf) {
     unsigned char *data  = tag->data;
     unsigned long length = tag->length;
     bitstream_t *bs;
-    swf_tag_t **_tag;
+    swf_tag_t *tag_in_sprite, *prev_tag;
     (void) swf;
     if (swf_tag_sprite == NULL) {
         fprintf(stderr, "ERROR: swf_tag_sprite_input_detail: swf_tag_sprite == NULL\n");
@@ -52,18 +52,29 @@ swf_tag_sprite_input_detail(swf_tag_t *tag, struct swf_object_ *swf) {
     swf_tag_sprite->sprite_id = bitstream_getbytesLE(bs, 2);
     swf_tag_sprite->frame_count = bitstream_getbytesLE(bs, 2);
     //
-    _tag = &swf_tag_sprite->tag;
+
+    prev_tag = NULL;
     while(1) {
         long pos;
         pos = bitstream_getbytepos(bs);
         if ((pos == -1) || ((long) length <= pos)) {
             break;
         }
-        *_tag = swf_tag_create(bs);
-        if (_tag == NULL) {
+        tag_in_sprite = swf_tag_create(bs);
+        if (tag_in_sprite == NULL) {
             fprintf(stderr, "swf_object_input: swf_tag_create failed\n");
+            break;
+        }
+        if (prev_tag == NULL) {
+            swf_tag_sprite->tag = tag_in_sprite;
+            tag_in_sprite->prev = NULL;
+            tag_in_sprite->next = NULL;
+        } else {
+            prev_tag->next = tag_in_sprite;
+            tag_in_sprite->prev = prev_tag;
+            tag_in_sprite->next = NULL;
         }
-        _tag = &((*_tag)->next);
+        prev_tag = tag_in_sprite;
     }
     bitstream_close(bs);
     return 0;