Author: vhennebert
Date: Mon Jul 14 21:25:13 2014
New Revision: 1610538
URL: http://svn.apache.org/r1610538
Log:
Factorized outputDoubles into GradientMaker
Removed conversion to Double when unnecessary
Modified:
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/gradient/GradientMaker.java
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Shading.java
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=1610538&r1=1610537&r2=1610538&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:25:13 2014
@@ -375,14 +375,14 @@ public class Function {
outputEncode(out);
out.append("/Bounds ");
if (bounds != null) {
- outputDoubles(out, bounds);
+ GradientMaker.outputDoubles(out, bounds);
} else if (!functions.isEmpty()) {
// if there are n functions,
// there must be n-1 bounds.
// so let each function handle an equal portion
// of the whole. e.g. if there are 4, then [ 0.25 0.25 0.25 ]
int numberOfFunctions = functions.size();
- String functionsFraction =
PDFNumber.doubleOut(Double.valueOf(1.0 / (numberOfFunctions)));
+ String functionsFraction = PDFNumber.doubleOut(1.0 /
numberOfFunctions);
out.append("[ ");
for (int i = 0; i + 1 < numberOfFunctions; i++) {
out.append(functionsFraction);
@@ -407,7 +407,7 @@ public class Function {
private void outputDomain(StringBuilder p) {
if (domain != null) {
p.append("/Domain ");
- outputDoubles(p, domain);
+ GradientMaker.outputDoubles(p, domain);
p.append("\n");
} else {
p.append("/Domain [ 0 1 ]\n");
@@ -417,7 +417,7 @@ public class Function {
private void outputSize(StringBuilder out) {
if (size != null) {
out.append("/Size ");
- outputDoubles(out, size);
+ GradientMaker.outputDoubles(out, size);
out.append("\n");
}
}
@@ -435,7 +435,7 @@ public class Function {
private void outputRange(StringBuilder out) {
if (range != null) {
out.append("/Range ");
- outputDoubles(out, range);
+ GradientMaker.outputDoubles(out, range);
out.append("\n");
}
}
@@ -443,7 +443,7 @@ public class Function {
private void outputEncode(StringBuilder out) {
if (encode != null) {
out.append("/Encode ");
- outputDoubles(out, encode);
+ GradientMaker.outputDoubles(out, encode);
out.append("\n");
} else {
out.append("/Encode [ ");
@@ -458,7 +458,7 @@ public class Function {
private void outputDecode(StringBuilder out) {
if (decode != null) {
out.append("/Decode ");
- outputDoubles(out, decode);
+ GradientMaker.outputDoubles(out, decode);
out.append("\n");
}
}
@@ -503,17 +503,8 @@ public class Function {
private void outputInterpolationExponentN(StringBuilder out) {
out.append("/N ");
-
out.append(PDFNumber.doubleOut(Double.valueOf(interpolationExponentN)));
+ out.append(PDFNumber.doubleOut(interpolationExponentN));
out.append("\n");
}
- private void outputDoubles(StringBuilder out, List<Double> doubles) {
- out.append("[ ");
- for (Double d : doubles) {
- out.append(PDFNumber.doubleOut(d));
- out.append(" ");
- }
- out.append("]");
- }
-
}
Modified:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/GradientMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/GradientMaker.java?rev=1610538&r1=1610537&r2=1610538&view=diff
==============================================================================
---
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/GradientMaker.java
(original)
+++
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/GradientMaker.java
Mon Jul 14 21:25:13 2014
@@ -32,6 +32,7 @@ import org.apache.batik.ext.awt.RadialGr
import org.apache.xmlgraphics.java2d.color.ColorUtil;
import org.apache.fop.pdf.PDFDeviceColorSpace;
+import org.apache.fop.pdf.PDFNumber;
public final class GradientMaker {
@@ -151,4 +152,13 @@ public final class GradientMaker {
return gradientColors;
}
+ static void outputDoubles(StringBuilder out, List<Double> doubles) {
+ out.append("[ ");
+ for (Double d : doubles) {
+ out.append(PDFNumber.doubleOut(d));
+ out.append(" ");
+ }
+ out.append("]");
+ }
+
}
Modified:
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Shading.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Shading.java?rev=1610538&r1=1610537&r2=1610538&view=diff
==============================================================================
---
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Shading.java
(original)
+++
xmlgraphics/fop/branches/FOP-2393_gradient-rendering/src/java/org/apache/fop/render/gradient/Shading.java
Mon Jul 14 21:25:13 2014
@@ -20,7 +20,6 @@ package org.apache.fop.render.gradient;
import java.util.List;
import org.apache.fop.pdf.PDFDeviceColorSpace;
-import org.apache.fop.pdf.PDFNumber;
public class Shading {
@@ -220,13 +219,13 @@ public class Shading {
if (background != null) {
out.append("/Background ");
- outputDoubles(out, background);
+ GradientMaker.outputDoubles(out, background);
out.append("\n");
}
if (bbox != null) {
out.append("/BBox");
- outputDoubles(out, bbox);
+ GradientMaker.outputDoubles(out, bbox);
out.append("\n");
}
@@ -255,19 +254,10 @@ public class Shading {
out.append(">>");
}
- private void outputDoubles(StringBuilder out, List<Double> doubles) {
- out.append("[ ");
- for (Double d : doubles) {
- out.append(PDFNumber.doubleOut(d));
- out.append(" ");
- }
- out.append("]");
- }
-
private void outputShadingType1(StringBuilder out,
Shading.FunctionRenderer functionRenderer) {
if (domain != null) {
out.append("/Domain ");
- outputDoubles(out, domain);
+ GradientMaker.outputDoubles(out, domain);
out.append("\n");
} else {
out.append("/Domain [ 0 1 ] \n");
@@ -275,7 +265,7 @@ public class Shading {
if (matrix != null) {
out.append("/Matrix ");
- outputDoubles(out, matrix);
+ GradientMaker.outputDoubles(out, matrix);
out.append("\n");
}
outputFunction(out, functionRenderer);
@@ -284,13 +274,13 @@ public class Shading {
private void outputShadingType2or3(StringBuilder out,
Shading.FunctionRenderer functionRenderer) {
if (coords != null) {
out.append("/Coords ");
- outputDoubles(out, coords);
+ GradientMaker.outputDoubles(out, coords);
out.append("\n");
}
if (domain != null) {
out.append("/Domain ");
- outputDoubles(out, domain);
+ GradientMaker.outputDoubles(out, domain);
out.append("\n");
} else {
out.append("/Domain [ 0 1 ] \n");
@@ -331,7 +321,7 @@ public class Shading {
if (decode != null) {
out.append("/Decode ");
- outputDoubles(out, decode);
+ GradientMaker.outputDoubles(out, decode);
out.append("\n");
}
@@ -353,7 +343,7 @@ public class Shading {
if (decode != null) {
out.append("/Decode ");
- outputDoubles(out, decode);
+ GradientMaker.outputDoubles(out, decode);
out.append("\n");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
