Merge origin/master

This commit is contained in:
Jindra Petřík
2016-03-26 20:17:37 +01:00
43 changed files with 429 additions and 358 deletions

View File

@@ -434,7 +434,7 @@ public class CommandLineArgumentParser {
if (filter == null || filter.equals("zoom")) {
out.println(" " + (cnt++) + ") -zoom <N>");
out.println(" ...apply zoom during export (currently for FlashPaper conversion only)");
out.println(" ...apply zoom during export");
}
if (filter == null || filter.equals("replace")) {
@@ -2042,11 +2042,7 @@ public class CommandLineArgumentParser {
}
System.out.print("Page " + page + "/" + totalPages + "...");
RECT displayRect = new RECT(ds.getTimeline().displayRect);
//displayRect.Xmax *= zoom;
//displayRect.Ymax *= zoom;
Matrix m = new Matrix();
//m.scale(zoom);
BufferedImage img = SWF.frameToImageGet(ds.getTimeline(), 0, 0, null, 0, displayRect, m, m, null, Color.white, zoom).getBufferedImage();
BufferedImage img = SWF.frameToImageGet(ds.getTimeline(), 0, 0, null, 0, displayRect, new Matrix(), null, Color.white, zoom).getBufferedImage();
PageFormat pf = new PageFormat();
pf.setOrientation(PageFormat.PORTRAIT);
Paper p = new Paper();