svnno****@sourc*****
svnno****@sourc*****
2011年 3月 10日 (木) 20:48:30 JST
ForkRevision: 406
http://sourceforge.jp/projects/swfed/svn/view?view=rev&revision=406
Author: yoya
Date: 2011-03-10 20:48:30 +0900 (Thu, 10 Mar 2011)
Log Message:
-----------
swf_tag_get_bitmap_size (を呼ぶ側でなく)中で swf_tag_create_input_detail を実行するよう変更
Modified Paths:
--------------
trunk/src/swf_object.c
trunk/src/swf_tag.c
-------------- next part --------------
Modified: trunk/src/swf_object.c
===================================================================
--- trunk/src/swf_object.c 2011-03-10 04:25:33 UTC (rev 405)
+++ trunk/src/swf_object.c 2011-03-10 11:48:30 UTC (rev 406)
@@ -474,9 +474,6 @@
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 @@
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 @@
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 @@
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);
}
Modified: trunk/src/swf_tag.c
===================================================================
--- trunk/src/swf_tag.c 2011-03-10 04:25:33 UTC (rev 405)
+++ trunk/src/swf_tag.c 2011-03-10 11:48:30 UTC (rev 406)
@@ -380,9 +380,8 @@
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)) {