FOP-2305: Poor resolution of PCL output in trunk vs. 1.1; fixed regression

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1570878 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/cli/CommandLineOptions.java b/src/java/org/apache/fop/cli/CommandLineOptions.java
index ad8019a7d449c1abab22cf6c37a6b89ebc082aa8..b559e90b8e46ba9e28cc46ce9fa7fda2e8cd84c0 100644 (file)
--- a/src/java/org/apache/fop/cli/CommandLineOptions.java
+++ b/src/java/org/apache/fop/cli/CommandLineOptions.java
@@ -124,6 +124,8 @@ public class CommandLineOptions {
     private boolean conserveMemoryPolicy = false;
     /* true if a complex script features are enabled */
     private boolean useComplexScriptFeatures = true;
+    /* set to true if -dpi used in command line */
+    private boolean overrideTargetResolution = false;
 
     private FopFactory factory;
     private FOUserAgent foUserAgent;
@@ -440,6 +442,7 @@ public class CommandLineOptions {
                     "if you use '-dpi', you must specify a resolution (dots per inch)");
         } else {
             this.targetResolution = Integer.parseInt(args[i + 1]);
+            this.overrideTargetResolution = true;
             return 1;
         }
     }
@@ -1017,6 +1020,9 @@ public class CommandLineOptions {
             try {
                 FopConfParser fopConfParser = new FopConfParser(userConfigFile, baseURI);
                 fopFactoryBuilder = fopConfParser.getFopFactoryBuilder();
+                if (this.overrideTargetResolution) {
+                    fopFactoryBuilder.setTargetResolution(targetResolution);
+                }
             } catch (SAXException e) {
                 throw new FOPException(e);
             }