Merge remote-tracking branch 'upstream/master'

[swfed/swfed.git] / src / swf_fill_style_solid.c

diff --git a/src/swf_fill_style_solid.c b/src/swf_fill_style_solid.c
index e44ee9d..f4c4e62 100644 (file)
--- a/src/swf_fill_style_solid.c
+++ b/src/swf_fill_style_solid.c
@@ -9,7 +9,7 @@ swf_fill_style_solid_parse(bitstream_t *bs,
     if (tag->code == 46 || tag->code == 84) { // DefineMorphShape, DefineMorphShape2
         swf_rgba_parse(bs, &(fill_style_solid->rgba));
         swf_rgba_parse(bs, &(fill_style_solid->rgba_morph));
-    } else if (tag->code == 32) { // DefineShape3
+    } else if (tag->code >= 32) { // DefineShape3, DefineShape4
         swf_rgba_parse(bs, &(fill_style_solid->rgba));
     } else {
         swf_rgb_parse(bs, &(fill_style_solid->rgb));
@@ -24,7 +24,7 @@ swf_fill_style_solid_build(bitstream_t *bs,
     if (tag->code == 46 || tag->code == 84) { // DefineMorphShape, DefineMorphShape2
         swf_rgba_build(bs, &(fill_style_solid->rgba));
         swf_rgba_build(bs, &(fill_style_solid->rgba_morph));
-    } else if (tag->code == 32) { // DefineShape3
+    } else if (tag->code >= 32) { // DefineShape3, DefineShape4
         swf_rgba_build(bs, &(fill_style_solid->rgba));
     } else {
         swf_rgb_build(bs, &(fill_style_solid->rgb));
@@ -48,7 +48,7 @@ swf_fill_style_solid_print(swf_fill_style_solid_t *fill_style_solid,
                fill_style_solid->rgba_morph.green,
                fill_style_solid->rgba_morph.blue,
                fill_style_solid->rgba_morph.alpha);
-    } else if (tag->code == 32) { // DefineShape3
+    } else if (tag->code >= 32) { // DefineShape3, DefineShape4
         printf("  #%02x%02x%02x(%02x)",
                fill_style_solid->rgba.red,
                fill_style_solid->rgba.green,