From 582e3d6a7b9af0be1b65d05fbe4e4e782d8d1865 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sat, 8 Nov 2014 01:09:37 +0100 Subject: [PATCH] small fixes --- .../decompiler/flash/exporters/shape/BitmapExporter.java | 6 ++++++ src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java index 4be4b2ebd..471d444da 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/BitmapExporter.java @@ -373,6 +373,12 @@ public class BitmapExporter extends ShapeExporterBase { thickness *= Math.max(graphics.getTransform().getScaleX(), graphics.getTransform().getScaleY()); break; } + + // todo: negative width??? (wordctr1.swf) + if (thickness < 0) { + thickness = 0; + } + if (joinStyle == BasicStroke.JOIN_MITER) { lineStroke = new BasicStroke((float) thickness, capStyle, joinStyle, miterLimit); } else { diff --git a/src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java b/src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java index ce7c99e3b..ed4340c9e 100644 --- a/src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/FolderPreviewPanel.java @@ -185,8 +185,11 @@ public class FolderPreviewPanel extends JPanel { } g.fillRect(x * CELL_WIDTH, y * CELL_HEIGHT, CELL_WIDTH, CELL_HEIGHT); if (cachedPreviews.contains(index)) { - BufferedImage img = cachedPreviews.get(index).getBufferedImage(); - g.drawImage(img, x * CELL_WIDTH + BORDER_SIZE + PREVIEW_SIZE / 2 - img.getWidth() / 2, y * CELL_HEIGHT + BORDER_SIZE + PREVIEW_SIZE / 2 - img.getHeight() / 2, null); + SerializableImage sImg = cachedPreviews.get(index); + if (sImg != null) { + BufferedImage img = cachedPreviews.get(index).getBufferedImage(); + g.drawImage(img, x * CELL_WIDTH + BORDER_SIZE + PREVIEW_SIZE / 2 - img.getWidth() / 2, y * CELL_HEIGHT + BORDER_SIZE + PREVIEW_SIZE / 2 - img.getHeight() / 2, null); + } } else { cachedPreviews.put(index, noImage); renderImageTask(index, items.get(index));