Author: vhennebert
Date: Mon Jul 14 21:24:52 2014
New Revision: 1610537
URL: http://svn.apache.org/r1610537
Log:
Rename toWriteableString into output and added StringBuilder parameter
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=1610537&r1=1610536&r2=1610537&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:52 2014
@@ -118,7 +118,9 @@ public class PDFFunction extends PDFObje
out.append(pdfFunctions.get(functionIndex).referencePDF());
}
};
- return encode(function.toWriteableString(subFunctionRenderer));
+ StringBuilder out = new StringBuilder();
+ function.output(out, subFunctionRenderer);
+ return encode(out.toString());
}
/** {@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=1610537&r1=1610536&r2=1610537&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:52 2014
@@ -338,8 +338,7 @@ public class Function {
return cOne;
}
- public String toWriteableString(SubFunctionRenderer subFunctionRenderer) {
- StringBuilder out = new StringBuilder(256);
+ public String output(StringBuilder out, SubFunctionRenderer
subFunctionRenderer) {
out.append("<<\n/FunctionType " + functionType + "\n");
outputDomain(out);
if (this.functionType == 0) {
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=1610537&r1=1610536&r2=1610537&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:52 2014
@@ -121,7 +121,7 @@ public class PSSVGGraphics2D extends PSG
return p.toString();
}
- private void outputShading(StringBuilder p, Shading shading) {
+ private void outputShading(StringBuilder out, Shading shading) {
final Function function = shading.getFunction();
Shading.FunctionRenderer functionRenderer = new
Shading.FunctionRenderer() {
@@ -131,13 +131,13 @@ public class PSSVGGraphics2D extends PSG
public void outputFunction(StringBuilder out, int
functionIndex) {
Function subFunction =
function.getFunctions().get(functionIndex);
assert subFunction.getFunctions().isEmpty();
- out.append(subFunction.toWriteableString(null));
+ subFunction.output(out, null);
}
};
- out.append(function.toWriteableString(subFunctionRenderer));
+ function.output(out, subFunctionRenderer);
}
};
- shading.output(p, functionRenderer);
+ shading.output(out, functionRenderer);
}
protected AffineTransform getBaseTransform() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
