*** empty log message ***

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

diff --git a/src/org/apache/fop/datatypes/Length.java b/src/org/apache/fop/datatypes/Length.java
index 58da8c9242b3f943d3af3dee59e8f15fcbca39c2..0dad1fd77fe7495e78e034ecf377fa9dd9593380 100644 (file)
--- a/src/org/apache/fop/datatypes/Length.java
+++ b/src/org/apache/fop/datatypes/Length.java
@@ -59,9 +59,9 @@ public class Length {
         if (unit.equals("in"))
             dvalue = dvalue * 72;
         else if (unit.equals("cm"))
-            dvalue = dvalue * 28.35;
+            dvalue = dvalue * 28.3464567;
         else if (unit.equals("mm"))
-            dvalue = dvalue * 2.84;
+            dvalue = dvalue * 2.83464567;
         else if (unit.equals("pt"))
             dvalue = dvalue;
         else if (unit.equals("pc"))

diff --git a/src/org/apache/fop/render/pdf/PDFRenderer.java b/src/org/apache/fop/render/pdf/PDFRenderer.java
index dca1fedb2d2290b52c4eec50c33da9d1906c09d6..ff59db46ee3a7ddab2bc90a9ce23cb4e73cdfb9e 100644 (file)
--- a/src/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/org/apache/fop/render/pdf/PDFRenderer.java
@@ -872,7 +872,9 @@ public class PDFRenderer extends PrintRenderer {
          * Returns a customized the pixel to mm factor.
          */
         public float getPixelToMM() {
-            return 0.264583333333333333333f;    // 72 dpi
+            // this is set to 72dpi as the values in fo are 72dpi
+            return 0.35277777777777777778f; // 72 dpi
+            // return 0.26458333333333333333333333333333f;    // 96dpi
         }
 
         /**

diff --git a/src/org/apache/fop/render/ps/PSRenderer.java b/src/org/apache/fop/render/ps/PSRenderer.java
index 59c6495ad9ee7b01e686f5d594699c1d935fbf4e..5bfcca1a3fc419d8753d835dbb3e5d0bb60d49f4 100644 (file)
--- a/src/org/apache/fop/render/ps/PSRenderer.java
+++ b/src/org/apache/fop/render/ps/PSRenderer.java
@@ -961,7 +961,9 @@ public class PSRenderer implements Renderer {
          * Returns a customized the pixel to mm factor.
          */
         public float getPixelToMM() {
-            return 0.264583333333333333333f;    // 72 dpi
+            // this is set to 72dpi as the values in fo are 72dpi
+            return 0.3527777777777777778f; // 72 dpi
+            // return 0.26458333333333333333333333333333f;    // 96dpi
         }
 
         /**