You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2014/08/09 17:11:35 UTC
svn commit: r1616964 [2/2] -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java Sat Aug 9 15:11:34 2014
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.pdfbox.pdmodel.graphics.shading;
import java.awt.Point;
@@ -33,22 +32,22 @@ class ShadedTriangle
protected final Point2D[] corner; // vertices coordinates of a triangle
protected final float[][] color;
private final double area; // area of the triangle
-
+
/*
- degree = 3 describes a normal triangle,
- degree = 2 when a triangle degenerates to a line,
- degree = 1 when a triangle degenerates to a point
- */
+ degree = 3 describes a normal triangle,
+ degree = 2 when a triangle degenerates to a line,
+ degree = 1 when a triangle degenerates to a point
+ */
private final int degree;
-
+
// describes a rasterized line when a triangle degerates to a line, otherwise null
private final Line line;
-
+
// corner's edge (the opposite edge of a corner) equation value
private final double v0;
private final double v1;
private final double v2;
-
+
/**
* Constructor.
*
@@ -61,23 +60,23 @@ class ShadedTriangle
color = c.clone();
area = getArea(p[0], p[1], p[2]);
degree = calcDeg(p);
-
+
if (degree == 2)
{
if (overlaps(corner[1], corner[2]) && !overlaps(corner[0], corner[2]))
{
- Point p0 = new Point((int)Math.round(corner[0].getX()),
- (int)Math.round(corner[0].getY()));
- Point p1 = new Point((int)Math.round(corner[2].getX()),
- (int)Math.round(corner[2].getY()));
+ Point p0 = new Point((int) Math.round(corner[0].getX()),
+ (int) Math.round(corner[0].getY()));
+ Point p1 = new Point((int) Math.round(corner[2].getX()),
+ (int) Math.round(corner[2].getY()));
line = new Line(p0, p1, color[0], color[2]);
}
else
{
- Point p0 = new Point((int)Math.round(corner[1].getX()),
- (int)Math.round(corner[1].getY()));
- Point p1 = new Point((int)Math.round(corner[2].getX()),
- (int)Math.round(corner[2].getY()));
+ Point p0 = new Point((int) Math.round(corner[1].getX()),
+ (int) Math.round(corner[1].getY()));
+ Point p1 = new Point((int) Math.round(corner[2].getX()),
+ (int) Math.round(corner[2].getY()));
line = new Line(p0, p1, color[1], color[2]);
}
}
@@ -85,35 +84,38 @@ class ShadedTriangle
{
line = null;
}
-
+
v0 = edgeEquationValue(p[0], p[1], p[2]);
v1 = edgeEquationValue(p[1], p[2], p[0]);
v2 = edgeEquationValue(p[2], p[0], p[1]);
}
-
+
/**
* Calculate the degree value of a triangle.
+ *
* @param p 3 vertices coordinates
- * @return number of unique points in the 3 vertices of a triangle, 3, 2 or 1
+ * @return number of unique points in the 3 vertices of a triangle, 3, 2 or
+ * 1
*/
private int calcDeg(Point2D[] p)
{
HashSet<Point> set = new HashSet<Point>();
for (Point2D itp : p)
{
- Point np = new Point((int)Math.round(itp.getX() * 1000), (int)Math.round(itp.getY() * 1000));
+ Point np = new Point((int) Math.round(itp.getX() * 1000), (int) Math.round(itp.getY() * 1000));
set.add(np);
}
return set.size();
}
-
+
public int getDeg()
{
return degree;
}
-
+
/**
* get the boundary of a triangle.
+ *
* @return {xmin, xmax, ymin, ymax}
*/
public int[] getBoundary()
@@ -125,15 +127,15 @@ class ShadedTriangle
int y0 = (int) Math.round(corner[0].getY());
int y1 = (int) Math.round(corner[1].getY());
int y2 = (int) Math.round(corner[2].getY());
-
+
boundary[0] = Math.min(Math.min(x0, x1), x2);
boundary[1] = Math.max(Math.max(x0, x1), x2);
boundary[2] = Math.min(Math.min(y0, y1), y2);
boundary[3] = Math.max(Math.max(y0, y1), y2);
-
+
return boundary;
}
-
+
/**
* Get the line of a triangle.
*
@@ -143,9 +145,10 @@ class ShadedTriangle
{
return line;
}
-
+
/**
* Whether a point is contained in this ShadedTriangle.
+ *
* @param p the target point
* @return false if p is outside of this triangle, otherwise true
*/
@@ -157,41 +160,41 @@ class ShadedTriangle
}
else if (degree == 2)
{
- Point tp = new Point((int)Math.round(p.getX()), (int)Math.round(p.getY()));
+ Point tp = new Point((int) Math.round(p.getX()), (int) Math.round(p.getY()));
return line.linePoints.contains(tp);
}
-
+
/*
- the following code judges whether a point is contained in a normal triangle,
- taking the on edge case as contained
- */
+ the following code judges whether a point is contained in a normal triangle,
+ taking the on edge case as contained
+ */
double pv0 = edgeEquationValue(p, corner[1], corner[2]);
/*
- if corner[0] and point p are on different sides of line from corner[1] to corner[2],
- p is outside of the triangle
- */
+ if corner[0] and point p are on different sides of line from corner[1] to corner[2],
+ p is outside of the triangle
+ */
if (pv0 * v0 < 0)
{
return false;
}
double pv1 = edgeEquationValue(p, corner[2], corner[0]);
/*
- if vertex corner[1] and point p are on different sides of line from corner[2] to corner[0],
- p is outside of the triangle
- */
+ if vertex corner[1] and point p are on different sides of line from corner[2] to corner[0],
+ p is outside of the triangle
+ */
if (pv1 * v1 < 0)
{
return false;
}
double pv2 = edgeEquationValue(p, corner[0], corner[1]);
/*
- only left one case:
- if corner[1] and point p are on different sides of line from corner[2] to corner[0],
- p is outside of the triangle, otherwise p is contained in the triangle
- */
+ only left one case:
+ if corner[1] and point p are on different sides of line from corner[2] to corner[0],
+ p is outside of the triangle, otherwise p is contained in the triangle
+ */
return pv2 * v2 >= 0; // !(pv2 * v2 < 0)
}
-
+
/*
check whether two points overlaps each other, as points' coordinates are
of type double, the coordinates' accuracy used here is 0.001
@@ -208,19 +211,20 @@ class ShadedTriangle
*/
private double edgeEquationValue(Point2D p, Point2D p1, Point2D p2)
{
- return (p2.getY() - p1.getY()) * (p.getX() - p1.getX()) -
- (p2.getX() - p1.getX()) * (p.getY() - p1.getY());
+ return (p2.getY() - p1.getY()) * (p.getX() - p1.getX())
+ - (p2.getX() - p1.getX()) * (p.getY() - p1.getY());
}
// calcuate the area of a triangle
private double getArea(Point2D a, Point2D b, Point2D c)
{
- return Math.abs((c.getX() - b.getX()) * (c.getY() - a.getY()) -
- (c.getX() - a.getX()) * (c.getY() - b.getY())) / 2.0;
+ return Math.abs((c.getX() - b.getX()) * (c.getY() - a.getY())
+ - (c.getX() - a.getX()) * (c.getY() - b.getY())) / 2.0;
}
/**
* Calculate the color of a point.
+ *
* @param p the target point
* @return an array denotes the point's color
*/
@@ -228,19 +232,19 @@ class ShadedTriangle
{
int numberOfColorComponents = color[0].length;
float[] pCol = new float[numberOfColorComponents];
-
+
if (degree == 1)
{
for (int i = 0; i < numberOfColorComponents; i++)
{
// average
- pCol[i] = (color[0][i] + color[1][i] + color[2][i]) / 3.0f;
+ pCol[i] = (color[0][i] + color[1][i] + color[2][i]) / 3.0f;
}
}
else if (degree == 2)
{
// linear interpolation
- Point tp = new Point((int)Math.round(p.getX()), (int)Math.round(p.getY()));
+ Point tp = new Point((int) Math.round(p.getX()), (int) Math.round(p.getY()));
return line.calcColor(tp);
}
else
@@ -256,10 +260,10 @@ class ShadedTriangle
}
return pCol;
}
-
+
@Override
public String toString()
{
- return corner[0] + " " + corner[1] + " " + corner[2];
+ return corner[0] + " " + corner[1] + " " + corner[2];
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.java Sat Aug 9 15:11:34 2014
@@ -52,12 +52,12 @@ public abstract class ShadingContext
this.shading = shading;
deviceBounds = dBounds;
shadingColorSpace = shading.getColorSpace();
-
+
// create the output color model using RGB+alpha as color space
ColorSpace outputCS = ColorSpace.getInstance(ColorSpace.CS_sRGB);
outputColorModel = new ComponentColorModel(outputCS, true, false, Transparency.TRANSLUCENT,
- DataBuffer.TYPE_BYTE);
-
+ DataBuffer.TYPE_BYTE);
+
bboxRect = shading.getBBox();
if (bboxRect != null)
{
@@ -78,10 +78,10 @@ public abstract class ShadingContext
ctm.createAffineTransform().transform(bboxTab, 0, bboxTab, 0, 2);
}
xform.transform(bboxTab, 0, bboxTab, 0, 2);
- minBBoxX = Math.min(bboxTab[0],bboxTab[2]);
- minBBoxY = Math.min(bboxTab[1],bboxTab[3]);
- maxBBoxX = Math.max(bboxTab[0],bboxTab[2]);
- maxBBoxY = Math.max(bboxTab[1],bboxTab[3]);
+ minBBoxX = Math.min(bboxTab[0], bboxTab[2]);
+ minBBoxY = Math.min(bboxTab[1], bboxTab[3]);
+ maxBBoxX = Math.max(bboxTab[0], bboxTab[2]);
+ maxBBoxY = Math.max(bboxTab[1], bboxTab[3]);
if (minBBoxX >= maxBBoxX || minBBoxY >= maxBBoxY)
{
LOG.warn("empty BBox is ignored");
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TensorPatch.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TensorPatch.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TensorPatch.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TensorPatch.java Sat Aug 9 15:11:34 2014
@@ -13,23 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.pdfbox.pdmodel.graphics.shading;
import java.awt.geom.Point2D;
import java.util.ArrayList;
/**
- * This class is used to describe a patch for type 7 shading.
- * This was done as part of GSoC2014, Tilman Hausherr is the mentor.
+ * This class is used to describe a patch for type 7 shading. This was done as
+ * part of GSoC2014, Tilman Hausherr is the mentor.
+ *
* @author Shaola Ren
*/
class TensorPatch extends Patch
-{
+{
/**
* Constructor of a patch for type 7 shading.
+ *
* @param points 16 control points
- * @param color 4 corner colors
+ * @param color 4 corner colors
*/
protected TensorPatch(Point2D[] tcp, float[][] color)
{
@@ -38,11 +39,11 @@ class TensorPatch extends Patch
level = calcLevel();
listOfTriangles = getTriangles();
}
-
+
/*
- order the 16 1d points to a square matrix which is as the one described
- in p.199 of PDF3200_2008.pdf rotated 90 degrees clockwise
- */
+ order the 16 1d points to a square matrix which is as the one described
+ in p.199 of PDF3200_2008.pdf rotated 90 degrees clockwise
+ */
private Point2D[][] reshapeControlPoints(Point2D[] tcp)
{
Point2D[][] square = new Point2D[4][4];
@@ -61,12 +62,15 @@ class TensorPatch extends Patch
square[2][1] = tcp[15];
return square;
}
-
+
// calculate the dividing level from the control points
private int[] calcLevel()
{
- int[] l = {4, 4};
-
+ int[] l =
+ {
+ 4, 4
+ };
+
Point2D[] ctlC1 = new Point2D[4];
Point2D[] ctlC2 = new Point2D[4];
for (int j = 0; j < 4; j++)
@@ -78,12 +82,12 @@ class TensorPatch extends Patch
if (isEdgeALine(ctlC1) & isEdgeALine(ctlC2))
{
/*
- if any of the 4 inner control points is out of the patch formed by the 4 edges,
- keep the high dividing level,
- otherwise, determine the dividing level by the lengths of edges
- */
- if (isOnSameSideCC(controlPoints[1][1]) | isOnSameSideCC(controlPoints[1][2]) |
- isOnSameSideCC(controlPoints[2][1]) | isOnSameSideCC(controlPoints[2][2]))
+ if any of the 4 inner control points is out of the patch formed by the 4 edges,
+ keep the high dividing level,
+ otherwise, determine the dividing level by the lengths of edges
+ */
+ if (isOnSameSideCC(controlPoints[1][1]) | isOnSameSideCC(controlPoints[1][2])
+ | isOnSameSideCC(controlPoints[2][1]) | isOnSameSideCC(controlPoints[2][2]))
{
// keep the high dividing level
}
@@ -108,12 +112,12 @@ class TensorPatch extends Patch
}
}
}
-
+
// the other two opposite edges
if (isEdgeALine(controlPoints[0]) & isEdgeALine(controlPoints[3]))
{
- if (isOnSameSideDD(controlPoints[1][1]) | isOnSameSideDD(controlPoints[1][2]) |
- isOnSameSideDD(controlPoints[2][1]) | isOnSameSideDD(controlPoints[2][2]))
+ if (isOnSameSideDD(controlPoints[1][1]) | isOnSameSideDD(controlPoints[1][2])
+ | isOnSameSideDD(controlPoints[2][1]) | isOnSameSideDD(controlPoints[2][2]))
{
// keep the high dividing level
}
@@ -140,30 +144,30 @@ class TensorPatch extends Patch
}
return l;
}
-
+
// whether a point is on the same side of edge C1 and edge C2
private boolean isOnSameSideCC(Point2D p)
{
- double cc = edgeEquationValue(p, controlPoints[0][0], controlPoints[3][0]) *
- edgeEquationValue(p, controlPoints[0][3], controlPoints[3][3]);
+ double cc = edgeEquationValue(p, controlPoints[0][0], controlPoints[3][0])
+ * edgeEquationValue(p, controlPoints[0][3], controlPoints[3][3]);
return cc > 0;
}
-
+
// whether a point is on the same side of edge D1 and edge D2
private boolean isOnSameSideDD(Point2D p)
{
- double dd = edgeEquationValue(p, controlPoints[0][0], controlPoints[0][3]) *
- edgeEquationValue(p, controlPoints[3][0], controlPoints[3][3]);
+ double dd = edgeEquationValue(p, controlPoints[0][0], controlPoints[0][3])
+ * edgeEquationValue(p, controlPoints[3][0], controlPoints[3][3]);
return dd > 0;
}
-
+
// get a list of triangles which compose this tensor patch
private ArrayList<ShadedTriangle> getTriangles()
{
CoordinateColorPair[][] patchCC = getPatchCoordinatesColor();
return getShadedTriangles(patchCC);
}
-
+
@Override
protected Point2D[] getFlag1Edge()
{
@@ -174,7 +178,7 @@ class TensorPatch extends Patch
}
return implicitEdge;
}
-
+
@Override
protected Point2D[] getFlag2Edge()
{
@@ -185,7 +189,7 @@ class TensorPatch extends Patch
}
return implicitEdge;
}
-
+
@Override
protected Point2D[] getFlag3Edge()
{
@@ -196,13 +200,13 @@ class TensorPatch extends Patch
}
return implicitEdge;
}
-
+
/*
- dividing a patch into a grid according to level, then calculate the coordinate and color of
- each crossing point in the grid, the rule to calculate the coordinate is tensor-product which
- is defined in page 119 of PDF32000_2008.pdf, the method to calculate the cooresponding color is
- bilinear interpolation
- */
+ dividing a patch into a grid according to level, then calculate the coordinate and color of
+ each crossing point in the grid, the rule to calculate the coordinate is tensor-product which
+ is defined in page 119 of PDF32000_2008.pdf, the method to calculate the cooresponding color is
+ bilinear interpolation
+ */
private CoordinateColorPair[][] getPatchCoordinatesColor()
{
int numberOfColorComponents = cornerColor[0].length;
@@ -211,7 +215,7 @@ class TensorPatch extends Patch
double[][] bernsteinPolyV = getBernsteinPolynomials(level[1]);
int szV = bernsteinPolyV[0].length;
CoordinateColorPair[][] patchCC = new CoordinateColorPair[szV][szU];
-
+
double stepU = 1.0 / (szU - 1);
double stepV = 1.0 / (szV - 1);
double v = -stepV;
@@ -219,7 +223,7 @@ class TensorPatch extends Patch
{
// v and u are the assistant parameters
v += stepV;
- double u = - stepU;
+ double u = -stepU;
for (int l = 0; l < szU; l++)
{
double tmpx = 0.0;
@@ -234,12 +238,12 @@ class TensorPatch extends Patch
}
}
Point2D tmpC = new Point2D.Double(tmpx, tmpy);
-
+
u += stepU;
float[] paramSC = new float[numberOfColorComponents];
- for(int ci = 0; ci < numberOfColorComponents; ci++)
+ for (int ci = 0; ci < numberOfColorComponents; ci++)
{
- paramSC[ci] = (float) ((1 - v) * ((1 - u) * cornerColor[0][ci] + u * cornerColor[3][ci])
+ paramSC[ci] = (float) ((1 - v) * ((1 - u) * cornerColor[0][ci] + u * cornerColor[3][ci])
+ v * ((1 - u) * cornerColor[1][ci] + u * cornerColor[2][ci])); // bilinear interpolation
}
patchCC[k][l] = new CoordinateColorPair(tmpC, paramSC);
@@ -247,14 +251,14 @@ class TensorPatch extends Patch
}
return patchCC;
}
-
+
// Bernstein polynomials which are defined in page 119 of PDF32000_2008.pdf
private double[][] getBernsteinPolynomials(int lvl)
{
int sz = (1 << lvl) + 1;
double[][] poly = new double[4][sz];
double step = 1.0 / (sz - 1);
- double t = - step;
+ double t = -step;
for (int i = 0; i < sz; i++)
{
t += step;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.java Sat Aug 9 15:11:34 2014
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.pdfbox.pdmodel.graphics.shading;
import java.awt.Point;
@@ -32,24 +31,28 @@ import org.apache.pdfbox.util.Matrix;
/**
* Intermediate class extended by the shading types 4,5,6 and 7 that contains
* the common methods used by these classes.
- *
+ *
* @author Shaola Ren
* @author Tilman Hausherr
*/
abstract class TriangleBasedShadingContext extends ShadingContext
{
private static final Log LOG = LogFactory.getLog(TriangleBasedShadingContext.class);
-
- /** bits per coordinate. */
+
+ /**
+ * bits per coordinate.
+ */
protected int bitsPerCoordinate;
-
- /** bits per color component */
- protected int bitsPerColorComponent;
+
+ /**
+ * bits per color component
+ */
+ protected int bitsPerColorComponent;
final protected boolean hasFunction;
-
- public TriangleBasedShadingContext(PDShading shading, ColorModel cm,
- AffineTransform xform, Matrix ctm, int pageHeight, Rectangle dBounds)
+
+ public TriangleBasedShadingContext(PDShading shading, ColorModel cm,
+ AffineTransform xform, Matrix ctm, int pageHeight, Rectangle dBounds)
throws IOException
{
super(shading, cm, xform, ctm, pageHeight, dBounds);
@@ -60,7 +63,7 @@ abstract class TriangleBasedShadingConte
bitsPerColorComponent = triangleBasedShadingType.getBitsPerComponent();
LOG.debug("bitsPerColorComponent: " + bitsPerColorComponent);
}
-
+
// get the points from the triangles, calculate their color and add
// point-color mappings to the map
protected void calcPixelTable(ArrayList<ShadedTriangle> triangleList, HashMap<Point, Integer> map)
@@ -97,7 +100,7 @@ abstract class TriangleBasedShadingConte
}
}
}
-
+
// transform a point from source space to device space
protected void transformPoint(Point2D p, Matrix ctm, AffineTransform xform)
{
@@ -107,7 +110,7 @@ abstract class TriangleBasedShadingConte
}
xform.transform(p, p);
}
-
+
// convert color to RGB color value, using function if required,
// then convert from the shading colorspace to an RGB value,
// which is encoded into an integer.
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=1616964&r1=1616963&r2=1616964&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 Sat Aug 9 15:11:34 2014
@@ -30,6 +30,7 @@ import org.apache.pdfbox.util.Matrix;
/**
* AWT PaintContext for function-based (Type 1) shading.
+ *
* @author Andreas Lehmkühler
* @author Tilman Hausherr
*/
@@ -45,19 +46,20 @@ class Type1ShadingContext extends Shadin
/**
* 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
* @param xform transformation for user to device space
* @param ctm current transformation matrix
* @param pageHeight height of the current page
- * @param dBounds device bounds
+ * @param dBounds device bounds
*/
public Type1ShadingContext(PDShadingType1 shading, ColorModel colorModel, AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
{
super(shading, colorModel, xform, ctm, pageHeight, dBounds);
this.type1ShadingType = shading;
-
+
// spec p.308
// (Optional) An array of four numbers [ xmin xmax ymin ymax ]
// specifying the rectangular domain of coordinates over which the
@@ -91,7 +93,7 @@ class Type1ShadingContext extends Shadin
}
catch (NoninvertibleTransformException ex)
{
- LOG.error(ex,ex);
+ LOG.error(ex, ex);
}
// get background values if available
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java Sat Aug 9 15:11:34 2014
@@ -42,6 +42,7 @@ class Type1ShadingPaint implements Paint
/**
* Constructor.
+ *
* @param shading the shading resources
* @param ctm current transformation matrix
* @param pageHeight the height of the page
@@ -61,7 +62,7 @@ class Type1ShadingPaint implements Paint
@Override
public PaintContext createContext(ColorModel cm, Rectangle deviceBounds, Rectangle2D userBounds,
- AffineTransform xform, RenderingHints hints)
+ AffineTransform xform, RenderingHints hints)
{
try
{
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=1616964&r1=1616963&r2=1616964&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 Sat Aug 9 15:11:34 2014
@@ -34,6 +34,7 @@ import org.apache.pdfbox.util.Matrix;
/**
* AWT PaintContext for Gouraud Triangle Mesh (Type 4) shading.
+ *
* @author Tilman Hausherr
* @author Shaola Ren
*/
@@ -44,6 +45,7 @@ class Type4ShadingContext extends Gourau
/**
* Constructor creates an instance to be used for fill operations.
+ *
* @param shading the shading type to be used
* @param cm the color model to be used
* @param xform transformation for user to device space
@@ -51,18 +53,18 @@ class Type4ShadingContext extends Gourau
* @param pageHeight height of the current page
*/
public Type4ShadingContext(PDShadingType4 shading, ColorModel cm, AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
{
super(shading, cm, xform, ctm, pageHeight, dBounds);
LOG.debug("Type4ShadingContext");
bitsPerFlag = shading.getBitsPerFlag();
LOG.debug("bitsPerFlag: " + bitsPerFlag); //TODO handle cases where bitperflag isn't 8
- triangleList = getTriangleList(xform,ctm);
+ triangleList = getTriangleList(xform, ctm);
pixelTable = calcPixelTable();
}
-
- private ArrayList<ShadedTriangle> getTriangleList(AffineTransform xform,Matrix ctm) throws IOException
+
+ private ArrayList<ShadedTriangle> getTriangleList(AffineTransform xform, Matrix ctm) throws IOException
{
PDShadingType4 freeTriangleShadingType = (PDShadingType4) shading;
COSDictionary cosDictionary = freeTriangleShadingType.getCOSDictionary();
@@ -77,10 +79,10 @@ class Type4ShadingContext extends Gourau
long maxSrcCoord = (long) Math.pow(2, bitsPerCoordinate) - 1;
long maxSrcColor = (long) Math.pow(2, bitsPerColorComponent) - 1;
COSStream cosStream = (COSStream) cosDictionary;
-
+
ImageInputStream mciis = new MemoryCacheImageInputStream(cosStream.getUnfilteredStream());
byte flag = (byte) 0;
-
+
try
{
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
@@ -89,8 +91,8 @@ class Type4ShadingContext extends Gourau
{
LOG.error(ex);
}
-
- while(true)
+
+ while (true)
{
Vertex p0, p1, p2;
Point2D[] ps;
@@ -98,30 +100,30 @@ class Type4ShadingContext extends Gourau
int lastIndex;
try
{
- switch(flag)
+ switch (flag)
{
case 0:
- p0 = readVertex(mciis, maxSrcCoord, maxSrcColor,rangeX, rangeY, colRange, ctm, xform);
+ p0 = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, ctm, xform);
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
if (flag != 0)
{
LOG.error("bad triangle: " + flag);
}
- p1 = readVertex(mciis, maxSrcCoord, maxSrcColor,rangeX, rangeY, colRange, ctm, xform);
+ p1 = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, ctm, xform);
mciis.readBits(bitsPerFlag);
if (flag != 0)
{
LOG.error("bad triangle: " + flag);
}
- p2 = readVertex(mciis, maxSrcCoord, maxSrcColor,rangeX, rangeY, colRange, ctm, xform);
+ p2 = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, ctm, xform);
ps = new Point2D[]
- {
- p0.point, p1.point, p2.point
- };
+ {
+ p0.point, p1.point, p2.point
+ };
cs = new float[][]
- {
- p0.color, p1.color, p2.color
- };
+ {
+ p0.color, p1.color, p2.color
+ };
list.add(new ShadedTriangle(ps, cs));
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
break;
@@ -134,15 +136,15 @@ class Type4ShadingContext extends Gourau
else
{
ShadedTriangle preTri = list.get(lastIndex);
- p2 = readVertex(mciis, maxSrcCoord, maxSrcColor,rangeX, rangeY, colRange, ctm, xform);
+ p2 = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, ctm, xform);
ps = new Point2D[]
- {
- preTri.corner[1], preTri.corner[2], p2.point
- };
+ {
+ preTri.corner[1], preTri.corner[2], p2.point
+ };
cs = new float[][]
- {
- preTri.color[1], preTri.color[2], p2.color
- };
+ {
+ preTri.color[1], preTri.color[2], p2.color
+ };
list.add(new ShadedTriangle(ps, cs));
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
}
@@ -156,22 +158,22 @@ class Type4ShadingContext extends Gourau
else
{
ShadedTriangle preTri = list.get(lastIndex);
- p2 = readVertex(mciis, maxSrcCoord, maxSrcColor,rangeX, rangeY, colRange, ctm, xform);
+ p2 = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, ctm, xform);
ps = new Point2D[]
- {
- preTri.corner[0], preTri.corner[2], p2.point
- };
+ {
+ preTri.corner[0], preTri.corner[2], p2.point
+ };
cs = new float[][]
- {
- preTri.color[0], preTri.color[2], p2.color
- };
+ {
+ preTri.color[0], preTri.color[2], p2.color
+ };
list.add(new ShadedTriangle(ps, cs));
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
}
break;
default:
LOG.warn("bad flag: " + flag);
- break;
+ break;
}
}
catch (EOFException ex)
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java Sat Aug 9 15:11:34 2014
@@ -42,6 +42,7 @@ class Type4ShadingPaint implements Paint
/**
* Constructor.
+ *
* @param shading the shading resources
* @param ctm current transformation matrix
* @param pageHeight the height of the page
@@ -61,7 +62,7 @@ class Type4ShadingPaint implements Paint
@Override
public PaintContext createContext(ColorModel cm, Rectangle deviceBounds, Rectangle2D userBounds,
- AffineTransform xform, RenderingHints hints)
+ AffineTransform xform, RenderingHints hints)
{
try
{
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=1616964&r1=1616963&r2=1616964&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 Sat Aug 9 15:11:34 2014
@@ -34,6 +34,7 @@ import org.apache.pdfbox.util.Matrix;
/**
* AWT PaintContext for Gouraud Triangle Lattice (Type 5) shading.
+ *
* @author Tilman Hausherr
* @author Shaola Ren
*/
@@ -43,6 +44,7 @@ class Type5ShadingContext extends Gourau
/**
* Constructor creates an instance to be used for fill operations.
+ *
* @param shading the shading type to be used
* @param cm the color model to be used
* @param xform transformation for user to device space
@@ -51,16 +53,16 @@ class Type5ShadingContext extends Gourau
* @throws IOException if something went wrong
*/
public Type5ShadingContext(PDShadingType5 shading, ColorModel cm, AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
{
super(shading, cm, xform, ctm, pageHeight, dBounds);
LOG.debug("Type5ShadingContext");
- triangleList = getTriangleList(xform,ctm);
+ triangleList = getTriangleList(xform, ctm);
pixelTable = calcPixelTable();
}
-
+
private ArrayList<ShadedTriangle> getTriangleList(AffineTransform xform, Matrix ctm) throws IOException
{
ArrayList<ShadedTriangle> list = new ArrayList<ShadedTriangle>();
@@ -74,21 +76,21 @@ class Type5ShadingContext extends Gourau
{
colRange[i] = latticeTriangleShadingType.getDecodeForParameter(2 + i);
}
- ArrayList<Vertex> vlist = new ArrayList<Vertex>();
+ ArrayList<Vertex> vlist = new ArrayList<Vertex>();
long maxSrcCoord = (long) Math.pow(2, bitsPerCoordinate) - 1;
long maxSrcColor = (long) Math.pow(2, bitsPerColorComponent) - 1;
COSStream cosStream = (COSStream) cosDictionary;
-
+
ImageInputStream mciis = new MemoryCacheImageInputStream(cosStream.getUnfilteredStream());
- while(true)
+ while (true)
{
Vertex p;
try
{
- p = readVertex(mciis, maxSrcCoord, maxSrcColor,rangeX, rangeY, colRange, ctm, xform);
+ p = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, ctm, xform);
vlist.add(p);
}
- catch(EOFException ex)
+ catch (EOFException ex)
{
break;
}
@@ -106,28 +108,28 @@ class Type5ShadingContext extends Gourau
latticeArray[i][j] = vlist.get(i * numPerRow + j);
}
}
-
+
for (int i = 0; i < rowNum - 1; i++)
{
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
- };
+ {
+ 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
- };
+ {
+ 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
- };
+ {
+ 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
- };
+ {
+ latticeArray[i][j + 1].color, latticeArray[i + 1][j].color, latticeArray[i + 1][j + 1].color
+ };
list.add(new ShadedTriangle(ps, cs));
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java Sat Aug 9 15:11:34 2014
@@ -42,6 +42,7 @@ class Type5ShadingPaint implements Paint
/**
* Constructor.
+ *
* @param shading the shading resources
* @param ctm current transformation matrix
* @param pageHeight the height of the page
@@ -61,7 +62,7 @@ class Type5ShadingPaint implements Paint
@Override
public PaintContext createContext(ColorModel cm, Rectangle deviceBounds, Rectangle2D userBounds,
- AffineTransform xform, RenderingHints hints)
+ AffineTransform xform, RenderingHints hints)
{
try
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java Sat Aug 9 15:11:34 2014
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.pdfbox.pdmodel.graphics.shading;
import java.awt.Rectangle;
@@ -27,15 +26,17 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.util.Matrix;
/**
- * AWT PaintContext for coons patch meshes (type 6) shading.
- * This was done as part of GSoC2014, Tilman Hausherr is the mentor.
+ * AWT PaintContext for coons patch meshes (type 6) shading. This was done as
+ * part of GSoC2014, Tilman Hausherr is the mentor.
+ *
* @author Shaola Ren
*/
class Type6ShadingContext extends PatchMeshesShadingContext
{
-
- /**
+
+ /**
* 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
* @param xform transformation for user to device space
@@ -45,15 +46,15 @@ class Type6ShadingContext extends PatchM
* @throws IOException if something went wrong
*/
public Type6ShadingContext(PDShadingType6 shading, ColorModel colorModel, AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
{
super(shading, colorModel, xform, ctm, pageHeight, dBounds);
patchList = getCoonsPatchList(xform, ctm);
pixelTable = calcPixelTable();
}
-
+
// get the patch list which forms the type 6 shading image from data stream
- private ArrayList<Patch> getCoonsPatchList(AffineTransform xform,Matrix ctm) throws IOException
+ private ArrayList<Patch> getCoonsPatchList(AffineTransform xform, Matrix ctm) throws IOException
{
PDShadingType6 coonsShadingType = (PDShadingType6) patchMeshesShadingType;
COSDictionary cosDictionary = coonsShadingType.getCOSDictionary();
@@ -66,7 +67,7 @@ class Type6ShadingContext extends PatchM
}
return getPatchList(xform, ctm, cosDictionary, rangeX, rangeY, colRange, 12);
}
-
+
@Override
protected Patch generatePatch(Point2D[] points, float[][] color)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java Sat Aug 9 15:11:34 2014
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.pdfbox.pdmodel.graphics.shading;
import java.awt.Paint;
@@ -29,8 +28,9 @@ import org.apache.commons.logging.LogFac
import org.apache.pdfbox.util.Matrix;
/**
- * AWT Paint for coons patch meshes (Type 6) shading.
- * This was done as part of GSoC2014, Tilman Hausherr is the mentor.
+ * AWT Paint for coons patch meshes (Type 6) shading. This was done as part of
+ * GSoC2014, Tilman Hausherr is the mentor.
+ *
* @author Shaola Ren
*/
class Type6ShadingPaint implements Paint
@@ -40,9 +40,10 @@ class Type6ShadingPaint implements Paint
private final PDShadingType6 shading;
private final Matrix ctm;
private final int pageHeight;
-
+
/**
* Constructor.
+ *
* @param shading the shading resources
* @param ctm current transformation matrix
* @param pageHeight the height of the page
@@ -62,7 +63,7 @@ class Type6ShadingPaint implements Paint
@Override
public PaintContext createContext(ColorModel cm, Rectangle deviceBounds, Rectangle2D userBounds,
- AffineTransform xform, RenderingHints hints)
+ AffineTransform xform, RenderingHints hints)
{
try
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java Sat Aug 9 15:11:34 2014
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.pdfbox.pdmodel.graphics.shading;
import java.awt.Rectangle;
@@ -27,15 +26,17 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.util.Matrix;
/**
- * AWT PaintContext for tensor-product patch meshes (type 7) shading.
- * This was done as part of GSoC2014, Tilman Hausherr is the mentor.
+ * AWT PaintContext for tensor-product patch meshes (type 7) shading. This was
+ * done as part of GSoC2014, Tilman Hausherr is the mentor.
+ *
* @author Shaola Ren
*/
class Type7ShadingContext extends PatchMeshesShadingContext
{
-
+
/**
* 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
* @param xform transformation for user to device space
@@ -45,15 +46,15 @@ class Type7ShadingContext extends PatchM
* @throws IOException if something went wrong
*/
public Type7ShadingContext(PDShadingType7 shading, ColorModel colorModel, AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
{
super(shading, colorModel, xform, ctm, pageHeight, dBounds);
patchList = getTensorPatchList(xform, ctm);
pixelTable = calcPixelTable();
}
-
+
// get the patch list which forms the type 7 shading image from data stream
- private ArrayList<Patch> getTensorPatchList(AffineTransform xform,Matrix ctm) throws IOException
+ private ArrayList<Patch> getTensorPatchList(AffineTransform xform, Matrix ctm) throws IOException
{
PDShadingType7 tensorShadingType = (PDShadingType7) patchMeshesShadingType;
COSDictionary cosDictionary = tensorShadingType.getCOSDictionary();
@@ -66,7 +67,7 @@ class Type7ShadingContext extends PatchM
}
return getPatchList(xform, ctm, cosDictionary, rangeX, rangeY, colRange, 16);
}
-
+
@Override
protected Patch generatePatch(Point2D[] points, float[][] color)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java Sat Aug 9 15:11:34 2014
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.pdfbox.pdmodel.graphics.shading;
import java.awt.Paint;
@@ -29,8 +28,9 @@ import org.apache.commons.logging.LogFac
import org.apache.pdfbox.util.Matrix;
/**
- * AWT Paint for tensor-product patch meshes (Type 7) shading.
- * This was done as part of GSoC2014, Tilman Hausherr is the mentor.
+ * AWT Paint for tensor-product patch meshes (Type 7) shading. This was done as
+ * part of GSoC2014, Tilman Hausherr is the mentor.
+ *
* @author Shaola Ren
*/
class Type7ShadingPaint implements Paint
@@ -40,9 +40,10 @@ class Type7ShadingPaint implements Paint
private final PDShadingType7 shading;
private final Matrix ctm;
private final int pageHeight;
-
+
/**
* Constructor.
+ *
* @param shading the shading resources
* @param ctm current transformation matrix
* @param pageHeight the height of the page
@@ -62,7 +63,7 @@ class Type7ShadingPaint implements Paint
@Override
public PaintContext createContext(ColorModel cm, Rectangle deviceBounds, Rectangle2D userBounds,
- AffineTransform xform, RenderingHints hints)
+ AffineTransform xform, RenderingHints hints)
{
try
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Vertex.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Vertex.java?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Vertex.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Vertex.java Sat Aug 9 15:11:34 2014
@@ -14,20 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.pdfbox.pdmodel.graphics.shading;
import java.awt.geom.Point2D;
/**
* Vertex for Type 4 and Type 5 shadings.
+ *
* @author Tilman Hausherr
*/
class Vertex
{
public Point2D point;
public float[] color;
-
+
public Vertex(Point2D p, float[] c)
{
point = p;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/package.html
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/package.html?rev=1616964&r1=1616963&r2=1616964&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/package.html (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/package.html Sat Aug 9 15:11:34 2014
@@ -16,10 +16,10 @@
!-->
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html>
-<head>
+ <head>
-</head>
-<body>
-This package deals with shadings which are used for filling instead of a color.
-</body>
+ </head>
+ <body>
+ This package deals with shadings which are used for filling instead of a color.
+ </body>
</html>