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:03:32 UTC
svn commit: r1616963 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/
Author: tilman
Date: Sat Aug 9 15:03:31 2014
New Revision: 1616963
URL: http://svn.apache.org/r1616963
Log:
PDFBOX-1915: renamed "CoonsTriangle" (now used in types 4,5,6,7) to "ShadedTriangle"
Added:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java
- copied, changed from r1616918, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/CoonsTriangle.java
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/CoonsTriangle.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/CoonsPatch.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Patch.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/TensorPatch.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/TriangleBasedShadingContext.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/CoonsPatch.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/CoonsPatch.java?rev=1616963&r1=1616962&r2=1616963&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/CoonsPatch.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/CoonsPatch.java Sat Aug 9 15:03:31 2014
@@ -36,7 +36,7 @@ class CoonsPatch extends Patch
super(points, color);
controlPoints = reshapeControlPoints(points);
level = calcLevel();
- listOfCoonsTriangles = getCoonsTriangle();
+ listOfTriangles = getTriangles();
}
// adjust the 12 control points to 4 groups, each group defines one edge of a patch
@@ -113,8 +113,8 @@ class CoonsPatch extends Patch
return l;
}
- // get a list of CoonsTriangles which compose this coons patch
- private ArrayList<CoonsTriangle> getCoonsTriangle()
+ // get a list of triangles which compose this coons patch
+ private ArrayList<ShadedTriangle> getTriangles()
{
// 4 edges are 4 cubic Bezier curves
CubicBezierCurve eC1 = new CubicBezierCurve(controlPoints[0], level[0]);
@@ -122,7 +122,7 @@ class CoonsPatch extends Patch
CubicBezierCurve eD1 = new CubicBezierCurve(controlPoints[2], level[1]);
CubicBezierCurve eD2 = new CubicBezierCurve(controlPoints[3], level[1]);
CoordinateColorPair[][] patchCC = getPatchCoordinatesColor(eC1, eC2, eD1, eD2);
- return getCoonsTriangle(patchCC);
+ return getShadedTriangles(patchCC);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java?rev=1616963&r1=1616962&r2=1616963&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java Sat Aug 9 15:03:31 2014
@@ -49,7 +49,7 @@ abstract class GouraudShadingContext ext
protected int numberOfColorComponents;
/** triangle list. */
- protected ArrayList<CoonsTriangle> triangleList;
+ protected ArrayList<ShadedTriangle> triangleList;
/** background values.*/
protected float[] background;
@@ -70,7 +70,7 @@ abstract class GouraudShadingContext ext
Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
{
super(shading, colorModel, xform, ctm, pageHeight, dBounds);
- triangleList = new ArrayList<CoonsTriangle>();
+ triangleList = new ArrayList<ShadedTriangle>();
numberOfColorComponents = hasFunction ? 1 : shadingColorSpace.getNumberOfComponents();
LOG.debug("Background: " + shading.getBackground());
COSArray bg = shading.getBackground();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Patch.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Patch.java?rev=1616963&r1=1616962&r2=1616963&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Patch.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Patch.java Sat Aug 9 15:03:31 2014
@@ -35,7 +35,7 @@ abstract class Patch
be divided into 2^levelV parts
*/
protected int[] level;
- protected ArrayList<CoonsTriangle> listOfCoonsTriangles;
+ protected ArrayList<ShadedTriangle> listOfTriangles;
/**
* Constructor of Patch.
@@ -157,11 +157,11 @@ abstract class Patch
/**
* An assistant method to accomplish type 6 and type 7 shading.
* @param patchCC all the crossing point coordinates and color of a grid
- * @return a CoonsTriangle list which can compose the grid patch
+ * @return a ShadedTriangle list which can compose the grid patch
*/
- protected ArrayList<CoonsTriangle> getCoonsTriangle(CoordinateColorPair[][] patchCC)
+ protected ArrayList<ShadedTriangle> getShadedTriangles(CoordinateColorPair[][] patchCC)
{
- ArrayList<CoonsTriangle> list = new ArrayList<CoonsTriangle>();
+ ArrayList<ShadedTriangle> list = new ArrayList<ShadedTriangle>();
int szV = patchCC.length;
int szU = patchCC[0].length;
for (int i = 1; i < szV; i++)
@@ -179,7 +179,7 @@ abstract class Patch
// p0, p1 and p3 are in counter clock wise order, p1 has priority over p0, p3 has priority over p1
Point2D[] llCorner = {p0, p1, p3};
float[][] llColor = {patchCC[i-1][j-1].color, patchCC[i-1][j].color, patchCC[i][j-1].color};
- CoonsTriangle tmpll = new CoonsTriangle(llCorner, llColor); // lower left triangle
+ ShadedTriangle tmpll = new ShadedTriangle(llCorner, llColor); // lower left triangle
list.add(tmpll);
}
if (ll && (overlaps(p2, p1) || overlaps(p2, p3)))
@@ -190,7 +190,7 @@ abstract class Patch
// p3, p1 and p2 are in counter clock wise order, p1 has priority over p3, p2 has priority over p1
Point2D[] urCorner = {p3, p1, p2};
float[][] urColor = {patchCC[i][j-1].color, patchCC[i-1][j].color, patchCC[i][j].color};
- CoonsTriangle tmpur = new CoonsTriangle(urCorner, urColor); // upper right triangle
+ ShadedTriangle tmpur = new ShadedTriangle(urCorner, urColor); // upper right triangle
list.add(tmpur);
}
}
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=1616963&r1=1616962&r2=1616963&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 Sat Aug 9 15:03:31 2014
@@ -262,7 +262,7 @@ abstract class PatchMeshesShadingContext
HashMap<Point, Integer> map = new HashMap<Point, Integer>();
for (Patch it : patchList)
{
- super.calcPixelTable(it.listOfCoonsTriangles, map);
+ super.calcPixelTable(it.listOfTriangles, map);
}
return map;
}
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java (from r1616918, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/CoonsTriangle.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/CoonsTriangle.java&r1=1616918&r2=1616963&rev=1616963&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/CoonsTriangle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java Sat Aug 9 15:03:31 2014
@@ -28,7 +28,7 @@ import java.util.HashSet;
*
* @author Shaola Ren
*/
-class CoonsTriangle
+class ShadedTriangle
{
protected final Point2D[] corner; // vertices coordinates of a triangle
protected final float[][] color;
@@ -55,7 +55,7 @@ class CoonsTriangle
* @param p an array of the 3 vertices of a triangle
* @param c an array of color corresponding the vertex array p
*/
- public CoonsTriangle(Point2D[] p, float[][] c)
+ public ShadedTriangle(Point2D[] p, float[][] c)
{
corner = p.clone();
color = c.clone();
@@ -145,7 +145,7 @@ class CoonsTriangle
}
/**
- * Whether a point is contained in this CoonsTriangle.
+ * Whether a point is contained in this ShadedTriangle.
* @param p the target point
* @return false if p is outside of this triangle, otherwise true
*/
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=1616963&r1=1616962&r2=1616963&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:03:31 2014
@@ -36,7 +36,7 @@ class TensorPatch extends Patch
super(tcp, color);
controlPoints = reshapeControlPoints(tcp);
level = calcLevel();
- listOfCoonsTriangles = getCoonsTriangle();
+ listOfTriangles = getTriangles();
}
/*
@@ -157,11 +157,11 @@ class TensorPatch extends Patch
return dd > 0;
}
- // get a list of CoonsTriangles which compose this tensor patch
- private ArrayList<CoonsTriangle> getCoonsTriangle()
+ // get a list of triangles which compose this tensor patch
+ private ArrayList<ShadedTriangle> getTriangles()
{
CoordinateColorPair[][] patchCC = getPatchCoordinatesColor();
- return getCoonsTriangle(patchCC);
+ return getShadedTriangles(patchCC);
}
@Override
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=1616963&r1=1616962&r2=1616963&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:03:31 2014
@@ -63,16 +63,15 @@ abstract class TriangleBasedShadingConte
// get the points from the triangles, calculate their color and add
// point-color mappings to the map
- protected void calcPixelTable(ArrayList<CoonsTriangle> triangleList, HashMap<Point, Integer> map)
+ protected void calcPixelTable(ArrayList<ShadedTriangle> triangleList, HashMap<Point, Integer> map)
{
- for (CoonsTriangle tri : triangleList)
+ for (ShadedTriangle tri : triangleList)
{
int degree = tri.getDeg();
if (degree == 2)
{
Line line = tri.getLine();
- HashSet<Point> linePoints = line.linePoints;
- for (Point p : linePoints)
+ for (Point p : line.linePoints)
{
map.put(p, convertToRGB(line.calcColor(p)));
}
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=1616963&r1=1616962&r2=1616963&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:03:31 2014
@@ -62,7 +62,7 @@ class Type4ShadingContext extends Gourau
pixelTable = calcPixelTable();
}
- private ArrayList<CoonsTriangle> 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();
@@ -73,7 +73,7 @@ class Type4ShadingContext extends Gourau
{
colRange[i] = freeTriangleShadingType.getDecodeForParameter(2 + i);
}
- ArrayList<CoonsTriangle> list = new ArrayList<CoonsTriangle>();
+ ArrayList<ShadedTriangle> list = new ArrayList<ShadedTriangle>();
long maxSrcCoord = (long) Math.pow(2, bitsPerCoordinate) - 1;
long maxSrcColor = (long) Math.pow(2, bitsPerColorComponent) - 1;
COSStream cosStream = (COSStream) cosDictionary;
@@ -122,7 +122,7 @@ class Type4ShadingContext extends Gourau
{
p0.color, p1.color, p2.color
};
- list.add(new CoonsTriangle(ps, cs));
+ list.add(new ShadedTriangle(ps, cs));
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
break;
case 1:
@@ -133,7 +133,7 @@ class Type4ShadingContext extends Gourau
}
else
{
- CoonsTriangle preTri = list.get(lastIndex);
+ ShadedTriangle preTri = list.get(lastIndex);
p2 = readVertex(mciis, maxSrcCoord, maxSrcColor,rangeX, rangeY, colRange, ctm, xform);
ps = new Point2D[]
{
@@ -143,7 +143,7 @@ class Type4ShadingContext extends Gourau
{
preTri.color[1], preTri.color[2], p2.color
};
- list.add(new CoonsTriangle(ps, cs));
+ list.add(new ShadedTriangle(ps, cs));
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
}
break;
@@ -155,7 +155,7 @@ class Type4ShadingContext extends Gourau
}
else
{
- CoonsTriangle preTri = list.get(lastIndex);
+ ShadedTriangle preTri = list.get(lastIndex);
p2 = readVertex(mciis, maxSrcCoord, maxSrcColor,rangeX, rangeY, colRange, ctm, xform);
ps = new Point2D[]
{
@@ -165,7 +165,7 @@ class Type4ShadingContext extends Gourau
{
preTri.color[0], preTri.color[2], p2.color
};
- list.add(new CoonsTriangle(ps, cs));
+ list.add(new ShadedTriangle(ps, cs));
flag = (byte) (mciis.readBits(bitsPerFlag) & 3);
}
break;
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=1616963&r1=1616962&r2=1616963&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:03:31 2014
@@ -61,9 +61,9 @@ class Type5ShadingContext extends Gourau
pixelTable = calcPixelTable();
}
- private ArrayList<CoonsTriangle> getTriangleList(AffineTransform xform, Matrix ctm) throws IOException
+ private ArrayList<ShadedTriangle> getTriangleList(AffineTransform xform, Matrix ctm) throws IOException
{
- ArrayList<CoonsTriangle> list = new ArrayList<CoonsTriangle>();
+ ArrayList<ShadedTriangle> list = new ArrayList<ShadedTriangle>();
PDShadingType5 latticeTriangleShadingType = (PDShadingType5) shading;
COSDictionary cosDictionary = latticeTriangleShadingType.getCOSDictionary();
PDRange rangeX = latticeTriangleShadingType.getDecodeForParameter(0);
@@ -119,7 +119,7 @@ class Type5ShadingContext extends Gourau
{
latticeArray[i][j].color, latticeArray[i][j + 1].color, latticeArray[i + 1][j].color
};
- list.add(new CoonsTriangle(ps, cs));
+ 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
@@ -128,7 +128,7 @@ class Type5ShadingContext extends Gourau
{
latticeArray[i][j + 1].color, latticeArray[i + 1][j].color, latticeArray[i + 1][j + 1].color
};
- list.add(new CoonsTriangle(ps, cs));
+ list.add(new ShadedTriangle(ps, cs));
}
}
return list;