Use the appropriate double formatter depending on the selected output

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP-2393_gradient-rendering@1610539 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 18 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/pdf/PDFFunction.java b/src/java/org/apache/fop/pdf/PDFFunction.java
index ed2d1d16c..f84c52609 100644
--- a/src/java/org/apache/fop/pdf/PDFFunction.java
+++ b/src/java/org/apache/fop/pdf/PDFFunction.java
@@ -26,6 +26,8 @@ import java.util.List;
 
 import org.apache.fop.render.gradient.Function;
 import org.apache.fop.render.gradient.Function.SubFunctionRenderer;
+import org.apache.fop.render.gradient.GradientMaker;
+import org.apache.fop.render.gradient.GradientMaker.DoubleFormatter;
 
 /**
  * class representing a PDF Function.
@@ -119,7 +121,13 @@ public class PDFFunction extends PDFObject {
             }
         };
         StringBuilder out = new StringBuilder();
-        function.output(out, subFunctionRenderer);
+        GradientMaker.DoubleFormatter doubleFormatter = new DoubleFormatter() {
+
+            public String formatDouble(double d) {
+                return PDFNumber.doubleOut(d);
+            }
+        };
+        function.output(out, doubleFormatter, subFunctionRenderer);
         return encode(out.toString());
     }
 
diff --git a/src/java/org/apache/fop/pdf/PDFShading.java b/src/java/org/apache/fop/pdf/PDFShading.java
index 577e10a09..fa12771b9 100644
--- a/src/java/org/apache/fop/pdf/PDFShading.java
+++ b/src/java/org/apache/fop/pdf/PDFShading.java
@@ -21,6 +21,8 @@ package org.apache.fop.pdf;
 
 import java.util.List;
 
+import org.apache.fop.render.gradient.GradientMaker;
+import org.apache.fop.render.gradient.GradientMaker.DoubleFormatter;
 import org.apache.fop.render.gradient.Shading;
 
 
@@ -102,7 +104,13 @@ public class PDFShading extends PDFObject {
             }
         };
         StringBuilder out = new StringBuilder();
-        shading.output(out, functionRenderer);
+        GradientMaker.DoubleFormatter doubleFormatter = new DoubleFormatter() {
+
+            public String formatDouble(double d) {
+                return PDFNumber.doubleOut(d);
+            }
+        };
+        shading.output(out, doubleFormatter, functionRenderer);
         return out.toString();
     }