You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/12/30 18:02:36 UTC
svn commit: r1648546 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/
Author: jahewson
Date: Tue Dec 30 17:02:36 2014
New Revision: 1648546
URL: http://svn.apache.org/r1648546
Log:
PDFBOX-2576: Do not format array literals like control flow
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java?rev=1648546&r1=1648545&r2=1648546&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java Tue Dec 30 17:02:36 2014
@@ -85,10 +85,7 @@ public class AxialShadingContext extends
else
{
// set default values
- domain = new float[]
- {
- 0, 1
- };
+ domain = new float[] { 0, 1 };
}
// extend values
COSArray extendValues = shading.getExtend();
@@ -101,10 +98,7 @@ public class AxialShadingContext extends
else
{
// set default values
- extend = new boolean[]
- {
- false, false
- };
+ extend = new boolean[] { false, false };
}
// calculate some constants to be used in getRaster
x1x0 = coords[2] - coords[0];
@@ -208,10 +202,7 @@ public class AxialShadingContext extends
continue;
}
useBackground = false;
- float[] values = new float[]
- {
- x + i, y + j
- };
+ float[] values = new float[] { x + i, y + j };
rat.transform(values, 0, values, 0, 1);
currentX = values[0];
currentY = values[1];
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java?rev=1648546&r1=1648545&r2=1648546&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PatchMeshesShadingContext.java Tue Dec 30 17:02:36 2014
@@ -52,6 +52,7 @@ abstract class PatchMeshesShadingContext
/**
* Constructor creates an instance to be used for fill operations.
+ * Constructor creates an instance to be used for fill operations.
*
* @param shading the shading type to be used
* @param colorModel the color model to be used
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java?rev=1648546&r1=1648545&r2=1648546&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java Tue Dec 30 17:02:36 2014
@@ -35,8 +35,7 @@ import org.apache.pdfbox.util.Matrix;
/**
* AWT PaintContext for radial shading.
*
- * Performance improvement done as part of GSoC2014, Tilman Hausherr is the
- * mentor.
+ * Performance improvement done as part of GSoC2014, Tilman Hausherr is the mentor.
*
* @author Andreas Lehmkühler
* @author Shaola Ren
@@ -71,12 +70,13 @@ public class RadialShadingContext extend
* @param colorModel the color model to be used
* @param xform transformation for user to device space
* @param ctm the transformation matrix
- * @param dBounds device bounds
+ * @param deviceBounds device bounds
*/
- public RadialShadingContext(PDShadingType3 shading, ColorModel colorModel, AffineTransform xform,
- Matrix ctm, Rectangle dBounds) throws IOException
+ public RadialShadingContext(PDShadingType3 shading, ColorModel colorModel,
+ AffineTransform xform, Matrix ctm, Rectangle deviceBounds)
+ throws IOException
{
- super(shading, colorModel, xform, ctm, dBounds);
+ super(shading, colorModel, xform, ctm, deviceBounds);
this.radialShadingType = shading;
coords = shading.getCoords().toFloatArray();
@@ -88,10 +88,7 @@ public class RadialShadingContext extend
else
{
// set default values
- domain = new float[]
- {
- 0, 1
- };
+ domain = new float[] { 0, 1 };
}
// extend values
@@ -105,10 +102,7 @@ public class RadialShadingContext extend
else
{
// set default values
- extend = new boolean[]
- {
- false, false
- };
+ extend = new boolean[] { false, false };
}
// calculate some constants to be used in getRaster
x1x0 = coords[3] - coords[0];
@@ -243,10 +237,7 @@ public class RadialShadingContext extend
continue;
}
- float[] values = new float[]
- {
- x + i, y + j
- };
+ float[] values = new float[] { x + i, y + j };
rat.transform(values, 0, values, 0, 1);
currentX = values[0];
currentY = values[1];
@@ -394,17 +385,11 @@ public class RadialShadingContext extend
float root2 = (float) ((-p - root) / denom);
if (denom < 0)
{
- return new float[]
- {
- root1, root2
- };
+ return new float[] { root1, root2 };
}
else
{
- return new float[]
- {
- root2, root1
- };
+ return new float[] { root2, root1 };
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java?rev=1648546&r1=1648545&r2=1648546&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java Tue Dec 30 17:02:36 2014
@@ -67,10 +67,7 @@ class Type1ShadingContext extends Shadin
}
else
{
- domain = new float[]
- {
- 0, 1, 0, 1
- };
+ domain = new float[] { 0, 1, 0, 1 };
}
matrix = shading.getMatrix();
@@ -129,10 +126,7 @@ class Type1ShadingContext extends Shadin
}
int index = (j * w + i) * 4;
boolean useBackground = false;
- float[] values = new float[]
- {
- x + i, y + j
- };
+ float[] values = new float[] { x + i, y + j };
rat.transform(values, 0, values, 0, 1);
if (values[0] < domain[0] || values[0] > domain[1] || values[1] < domain[2] || values[1] > domain[3])
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java?rev=1648546&r1=1648545&r2=1648546&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java Tue Dec 30 17:02:36 2014
@@ -116,14 +116,8 @@ class Type4ShadingContext extends Gourau
LOG.error("bad triangle: " + flag);
}
p2 = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, ctm, xform);
- ps = new Point2D[]
- {
- p0.point, p1.point, p2.point
- };
- cs = new float[][]
- {
- p0.color, p1.color, p2.color
- };
+ ps = new Point2D[] { p0.point, p1.point, p2.point };
+ cs = new float[][] { p0.color, p1.color, p2.color };
list.add(new ShadedTriangle(ps, cs));
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
break;
@@ -138,18 +132,12 @@ class Type4ShadingContext extends Gourau
{
ShadedTriangle preTri = list.get(lastIndex);
p2 = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, ctm, xform);
- ps = new Point2D[]
- {
- flag == 1 ? preTri.corner[1] : preTri.corner[0],
- preTri.corner[2],
- p2.point
- };
- cs = new float[][]
- {
- flag == 1 ? preTri.color[1] : preTri.color[0],
- preTri.color[2],
- p2.color
- };
+ ps = new Point2D[] { flag == 1 ? preTri.corner[1] : preTri.corner[0],
+ preTri.corner[2],
+ p2.point };
+ cs = new float[][] { flag == 1 ? preTri.color[1] : preTri.color[0],
+ preTri.color[2],
+ p2.color };
list.add(new ShadedTriangle(ps, cs));
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java?rev=1648546&r1=1648545&r2=1648546&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java Tue Dec 30 17:02:36 2014
@@ -113,23 +113,28 @@ class Type5ShadingContext extends Gourau
{
for (int j = 0; j < numPerRow - 1; j++)
{
- Point2D[] ps = new Point2D[]
- {
- latticeArray[i][j].point, latticeArray[i][j + 1].point, latticeArray[i + 1][j].point
- };
- float[][] cs = new float[][]
- {
- latticeArray[i][j].color, latticeArray[i][j + 1].color, latticeArray[i + 1][j].color
- };
+ Point2D[] ps = new Point2D[] {
+ latticeArray[i][j].point,
+ latticeArray[i][j + 1].point,
+ latticeArray[i + 1][j].point };
+
+ float[][] cs = new float[][] {
+ latticeArray[i][j].color,
+ latticeArray[i][j + 1].color,
+ latticeArray[i + 1][j].color };
+
list.add(new ShadedTriangle(ps, cs));
- ps = new Point2D[]
- {
- latticeArray[i][j + 1].point, latticeArray[i + 1][j].point, latticeArray[i + 1][j + 1].point
- };
- cs = new float[][]
- {
- latticeArray[i][j + 1].color, latticeArray[i + 1][j].color, latticeArray[i + 1][j + 1].color
- };
+
+ ps = new Point2D[] {
+ latticeArray[i][j + 1].point,
+ latticeArray[i + 1][j].point,
+ latticeArray[i + 1][j + 1].point };
+
+ cs = new float[][]{
+ latticeArray[i][j + 1].color,
+ latticeArray[i + 1][j].color,
+ latticeArray[i + 1][j + 1].color };
+
list.add(new ShadedTriangle(ps, cs));
}
}