You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2014/07/14 23:24:32 UTC
svn commit: r1610535 - in
/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop:
pdf/PDFFunction.java render/gradient/Function.java
render/ps/svg/PSSVGGraphics2D.java
Author: vhennebert
Date: Mon Jul 14 21:24:32 2014
New Revision: 1610535
URL: http://svn.apache.org/r1610535
Log:
Delegate function rendering to dedicated class intead of taking as parameter a list of Strings coming from who knows where
Modified:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFunction.java
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Function.java
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFunction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFunction.java?rev=1610535&r1=1610534&r2=1610535&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFunction.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/pdf/PDFFunction.java Mon Jul 14 21:24:32 2014
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.fop.render.gradient.Function;
+import org.apache.fop.render.gradient.Function.SubFunctionRenderer;
/**
* class representing a PDF Function.
@@ -111,7 +112,13 @@ public class PDFFunction extends PDFObje
for (PDFFunction f : pdfFunctions) {
functionsStrings.add(f.referencePDF());
}
- return encode(function.toWriteableString(functionsStrings));
+ SubFunctionRenderer subFunctionRenderer = new SubFunctionRenderer() {
+
+ public void outputFunction(StringBuilder out, int functionIndex) {
+ out.append(pdfFunctions.get(functionIndex).referencePDF());
+ }
+ };
+ return encode(function.toWriteableString(subFunctionRenderer));
}
/** {@inheritDoc} */
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Function.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Function.java?rev=1610535&r1=1610534&r2=1610535&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Function.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Function.java Mon Jul 14 21:24:32 2014
@@ -24,6 +24,11 @@ import org.apache.fop.pdf.PDFNumber;
public class Function {
+ public interface SubFunctionRenderer {
+
+ void outputFunction(StringBuilder out, int functionIndex);
+ }
+
/**
* Required: The Type of function (0,2,3,4) default is 0.
*/
@@ -333,7 +338,7 @@ public class Function {
return cOne;
}
- public String toWriteableString(List<String> functionsStrings) {
+ public String toWriteableString(SubFunctionRenderer subFunctionRenderer) {
StringBuilder out = new StringBuilder(256);
out.append("<<\n/FunctionType " + functionType + "\n");
outputDomain(out);
@@ -362,8 +367,8 @@ public class Function {
outputRange(out);
if (!functions.isEmpty()) {
out.append("/Functions [ ");
- for (String f : functionsStrings) {
- out.append(f);
+ for (int i = 0; i < functions.size(); i++) {
+ subFunctionRenderer.outputFunction(out, i);
out.append(' ');
}
out.append("]\n");
Modified: xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java?rev=1610535&r1=1610534&r2=1610535&view=diff
==============================================================================
--- xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java (original)
+++ xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/ps/svg/PSSVGGraphics2D.java Mon Jul 14 21:24:32 2014
@@ -23,8 +23,6 @@ import java.awt.Graphics;
import java.awt.Paint;
import java.awt.geom.AffineTransform;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -36,6 +34,7 @@ import org.apache.xmlgraphics.java2d.ps.
import org.apache.xmlgraphics.ps.PSGenerator;
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.Pattern;
import org.apache.fop.render.gradient.Shading;
@@ -127,24 +126,20 @@ public class PSSVGGraphics2D extends PSG
Shading.FunctionRenderer functionRenderer = new Shading.FunctionRenderer() {
public void outputFunction(StringBuilder out) {
- List<String> functionsStrings = new ArrayList<String>(function.getFunctions().size());
- for (Function f : function.getFunctions()) {
- functionsStrings.add(functionToString(f));
- }
- out.append(function.toWriteableString(functionsStrings));
+ SubFunctionRenderer subFunctionRenderer = new Function.SubFunctionRenderer() {
+
+ public void outputFunction(StringBuilder out, int functionIndex) {
+ Function subFunction = function.getFunctions().get(functionIndex);
+ assert subFunction.getFunctions().isEmpty();
+ out.append(subFunction.toWriteableString(null));
+ }
+ };
+ out.append(function.toWriteableString(subFunctionRenderer));
}
};
shading.output(p, functionRenderer);
}
- private String functionToString(Function function) {
- List<String> functionsStrings = new ArrayList<String>(function.getFunctions().size());
- for (Function f : function.getFunctions()) {
- functionsStrings.add(functionToString(f));
- }
- return function.toWriteableString(functionsStrings);
- }
-
protected AffineTransform getBaseTransform() {
AffineTransform at = new AffineTransform(this.getTransform());
return at;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org