print 系での rgb(a)表示の短略化

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

diff --git a/src/swf_fill_style_solid.c b/src/swf_fill_style_solid.c
index f339578..b7d53c5 100644 (file)
--- a/src/swf_fill_style_solid.c
+++ b/src/swf_fill_style_solid.c
@@ -37,14 +37,29 @@ swf_fill_style_solid_print(swf_fill_style_solid_t *fill_style_solid,
                            int indent_depth, swf_tag_t *tag
 ) {
     print_indent(indent_depth);
-    printf("fill_style_solid\n");
+    printf("fill_style_solid");
     if (tag->tag == 46 || tag->tag == 84) { // DefineMorphShape, DefineMorphShape2
-        swf_rgba_print(&(fill_style_solid->rgba), indent_depth + 1);
-        swf_rgba_print(&(fill_style_solid->rgba_morph), indent_depth + 1);
+        printf("  #02x02x02x(02x)  morph:#02x02x02x(02x)",
+               fill_style_solid->rgba.red,
+               fill_style_solid->rgba.green,
+               fill_style_solid->rgba.blue,
+               fill_style_solid->rgba.alpha,
+               fill_style_solid->rgba_morph.red,
+               fill_style_solid->rgba_morph.green,
+               fill_style_solid->rgba_morph.blue,
+               fill_style_solid->rgba_morph.alpha);
     } else if (tag->tag == 32) { // DefineShape3
-        swf_rgba_print(&(fill_style_solid->rgba), indent_depth + 1);
+        printf("  #02x02x02x(02x)",
+               fill_style_solid->rgba.red,
+               fill_style_solid->rgba.green,
+               fill_style_solid->rgba.blue,
+               fill_style_solid->rgba.alpha);
     } else {
-        swf_rgb_print(&(fill_style_solid->rgb), indent_depth + 1);
+        printf("  #02x02x02x",
+               fill_style_solid->rgb.red,
+               fill_style_solid->rgb.green,
+               fill_style_solid->rgb.blue);
     }
+    printf("\n");
     return 0;
 }

diff --git a/src/swf_tag_edit.c b/src/swf_tag_edit.c
index aae7934..b599108 100644 (file)
--- a/src/swf_tag_edit.c
+++ b/src/swf_tag_edit.c
@@ -213,13 +213,18 @@ swf_tag_edit_print_detail(swf_tag_t *tag,
            swf_tag_edit->edit_border?1:0);
     if (swf_tag_edit->edit_has_font) {
         print_indent(indent_depth);
-        printf("font_id=%d font_height=%d\n",
+        printf("font_id=%d font_height=%d",
                swf_tag_edit->edit_font_id_ref,
                swf_tag_edit->edit_font_height / SWF_TWIPS);
     }
     if (swf_tag_edit->edit_has_color) {
-        swf_rgba_print(&swf_tag_edit->edit_color, indent_depth + 1);
+        printf("  color=#02x#02x#02x(#02x)",
+               swf_tag_edit->edit_color.red,
+               swf_tag_edit->edit_color.green,
+               swf_tag_edit->edit_color.blue,
+               swf_tag_edit->edit_color.alpha);
     }
+    printf("\n");
     if (swf_tag_edit->edit_has_max_length) {
         print_indent(indent_depth);
         printf("max_length=%d\n",