From 6c64dc19e1466c0cb16feb11130620e0c4d5650c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Fri, 26 Mar 2021 21:04:24 +0100 Subject: [PATCH] Fixed: #1669 FILLSTYLE color handling in DefineShape3/4 --- CHANGELOG.md | 4 +++- .../src/com/jpexs/decompiler/flash/SWFInputStream.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f14426439..82977b988 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. - PDF Export - Text position on font change - Writing DefineFont2/3 ascent/descent as SI16 - it's UI16 - [#1660] Empty thumbnail view on remove item +- [#1669] FILLSTYLE color handling in DefineShape3/4 ## [14.3.1] - 2021-03-25 ### Fixed @@ -2161,8 +2162,9 @@ All notable changes to this project will be documented in this file. [#1015]: https://www.free-decompiler.com/flash/issues/1015 [#1466]: https://www.free-decompiler.com/flash/issues/1466 [#1513]: https://www.free-decompiler.com/flash/issues/1513 -[#1665]: https://www.free-decompiler.com/flash/issues/1665 [#1660]: https://www.free-decompiler.com/flash/issues/1660 +[#1669]: https://www.free-decompiler.com/flash/issues/1669 +[#1665]: https://www.free-decompiler.com/flash/issues/1665 [#1661]: https://www.free-decompiler.com/flash/issues/1661 [#1435]: https://www.free-decompiler.com/flash/issues/1435 [#1488]: https://www.free-decompiler.com/flash/issues/1488 diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java index ca7e26d7d..547754336 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -2599,6 +2599,7 @@ public class SWFInputStream implements AutoCloseable { } else { ret.color = readRGB("color"); } + ret.inShape3 = shapeNum >= 3; endDumpLevel(); return ret; } @@ -2668,6 +2669,7 @@ public class SWFInputStream implements AutoCloseable { ret.color = readRGB("color"); } } + ret.inShape3 = shapeNum >= 3; if ((ret.fillStyleType == FILLSTYLE.LINEAR_GRADIENT) || (ret.fillStyleType == FILLSTYLE.RADIAL_GRADIENT) || (ret.fillStyleType == FILLSTYLE.FOCAL_RADIAL_GRADIENT)) {