swf_tag_get_bitmap_size (を呼ぶ側でなく)中で swf_tag_create_input_detail を実行するよう変更

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

diff --git a/src/swf_object.c b/src/swf_object.c
index 6722673..9a379be 100644 (file)
--- a/src/swf_object.c
+++ b/src/swf_object.c
@@ -474,9 +474,6 @@ swf_object_get_bitmap_size(swf_object_t *swf, int bitmap_id,
     if (tag == NULL) {
         return 1;
     }
-    if (tag->detail == NULL) {
-        swf_tag_create_input_detail(tag, swf);
-    }
     ret = swf_tag_get_bitmap_size(tag, width, height);
     return ret;
 }
@@ -550,9 +547,6 @@ swf_object_replace_jpegdata(swf_object_t *swf, int image_id,
         return 1;
     }
     if (swf->shape_adjust_mode) {
-        if (tag->detail == NULL) {
-            swf_tag_create_input_detail(tag, swf);
-        }
         swf_tag_get_bitmap_size(tag, &old_width, &old_height);
         jpeg_size(jpeg_data, jpeg_data_len, &new_width, &new_height);
     }
@@ -612,9 +606,6 @@ swf_object_replace_pngdata(swf_object_t *swf, int image_id,
         return 1;
     }
     if (swf->shape_adjust_mode) {
-        if (tag->detail == NULL) {
-            swf_tag_create_input_detail(tag, swf);
-        }
         swf_tag_get_bitmap_size(tag, &old_width, &old_height);
         png_size(png_data, png_data_len, &new_width, &new_height);
     }
@@ -654,9 +645,6 @@ swf_object_replace_gifdata(swf_object_t *swf, int image_id,
         return 1;
     }
     if (swf->shape_adjust_mode) {
-        if (tag->detail == NULL) {
-            swf_tag_create_input_detail(tag, swf);
-        }
         swf_tag_get_bitmap_size(tag, &old_width, &old_height);
         gif_size(gif_data, gif_data_len, &new_width, &new_height);
     }

diff --git a/src/swf_tag.c b/src/swf_tag.c
index da92acd..1e4efd6 100644 (file)
--- a/src/swf_tag.c
+++ b/src/swf_tag.c
@@ -380,9 +380,8 @@ swf_tag_get_bitmap_size(swf_tag_t *tag,
         fprintf(stderr, "swf_tag_get_bitmap_size: tag == NULL\n");
         return 1;
     }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_get_bitmap_size: tag->detail == NULL\n");
-        return 1;
+    if (tag->detail == NULL) {
+        swf_tag_create_input_detail(tag, NULL);
     }
 
     if (isBitsJPEGTag(tag->tag)) {