From afe339c8fefbe852b44f3698c44cbab8fb69fa5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sun, 28 Sep 2014 08:59:59 +0200 Subject: [PATCH] canvas export - defining shape path only once --- .../flash/exporters/morphshape/CanvasMorphShapeExporter.java | 5 +++-- .../flash/exporters/shape/CanvasShapeExporter.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/morphshape/CanvasMorphShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/morphshape/CanvasMorphShapeExporter.java index 5e44b3ac7..d35b54576 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/morphshape/CanvasMorphShapeExporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/morphshape/CanvasMorphShapeExporter.java @@ -431,8 +431,9 @@ public class CanvasMorphShapeExporter extends MorphShapeExporterBase { protected void finalizePath() { if (!"".equals(pathData)) { - String drawStroke = "\tdrawMorphPath(ctx,\"" + pathData.trim() + "\",ratio,true,scaleMode);\r\n"; - String drawFill = "\tdrawMorphPath(ctx,\"" + pathData.trim() + "\",ratio,false);\r\n";; + shapeData+="\tvar pathData=\""+pathData.trim()+"\";\r\n"; + String drawStroke = "\tdrawMorphPath(ctx,pathData,ratio,true,scaleMode);\r\n"; + String drawFill = "\tdrawMorphPath(ctx,pathData,ratio,false);\r\n";; pathData = ""; if (lineFillData != null) { String preLineFillData = ""; diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java index ef479836e..669f26a7e 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/exporters/shape/CanvasShapeExporter.java @@ -420,8 +420,9 @@ public class CanvasShapeExporter extends ShapeExporterBase { protected void finalizePath() { if (!"".equals(pathData)) { - String drawStroke = "\tdrawPath(ctx,\"" + pathData.trim() + "\",true,scaleMode);\r\n"; - String drawFill = "\tdrawPath(ctx,\"" + pathData.trim() + "\",false);\r\n";; + shapeData+="\tvar pathData=\""+pathData.trim()+"\";\r\n"; + String drawStroke = "\tdrawPath(ctx,pathData,true,scaleMode);\r\n"; + String drawFill = "\tdrawPath(ctx,pathData,false);\r\n";; pathData = ""; if (lineFillData != null) { String preLineFillData = "";