Author: tilman
Date: Sun Aug 17 13:20:52 2014
New Revision: 1618474
URL: http://svn.apache.org/r1618474
Log:
PDFBOX-1915: removed the height parameter which isn't used anymore
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
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/AxialShadingPaint.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/PDShading.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.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/RadialShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadingContext.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/Type1ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.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/Type4ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
Sun Aug 17 13:20:52 2014
@@ -135,7 +135,7 @@ public final class PDPattern extends PDS
LOG.error("shadingPattern ist null, will be filled with
transparency");
return new Color(0,0,0,0);
}
- return shading.toPaint(shadingPattern.getMatrix(), pageHeight);
+ return shading.toPaint(shadingPattern.getMatrix());
}
}
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -67,13 +67,12 @@ public class AxialShadingContext extends
* @param colorModel the color model to be used
* @param xform transformation for user to device space
* @param ctm the transformation matrix
- * @param pageHeight height of the current page
* @param dBounds device bounds
*/
public AxialShadingContext(PDShadingType2 shading, ColorModel colorModel,
AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
- super(shading, colorModel, xform, ctm, pageHeight, dBounds);
+ super(shading, colorModel, xform, ctm, dBounds);
this.axialShadingType = shading;
coords = shading.getCoords().toFloatArray();
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java
Sun Aug 17 13:20:52 2014
@@ -40,20 +40,17 @@ public class AxialShadingPaint implement
private PDShadingType2 shading;
private Matrix ctm;
- private int pageHeight;
/**
* Constructor.
*
* @param shadingType2 the shading resources
* @param ctm current transformation matrix
- * @param pageHeight size of the current page
*/
- AxialShadingPaint(PDShadingType2 shadingType2, Matrix ctm, int pageHeight)
+ AxialShadingPaint(PDShadingType2 shadingType2, Matrix ctm)
{
shading = shadingType2;
this.ctm = ctm;
- this.pageHeight = pageHeight;
}
@Override
@@ -69,7 +66,7 @@ public class AxialShadingPaint implement
{
try
{
- return new AxialShadingContext(shading, cm, xform, ctm,
pageHeight, deviceBounds);
+ return new AxialShadingContext(shading, cm, xform, ctm,
deviceBounds);
}
catch (IOException ex)
{
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -65,13 +65,12 @@ abstract class GouraudShadingContext ext
* @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
* @throws IOException if something went wrong
*/
protected GouraudShadingContext(PDShading shading, ColorModel colorModel,
AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
- super(shading, colorModel, xform, ctm, pageHeight, dBounds);
+ super(shading, colorModel, xform, ctm, dBounds);
triangleList = new ArrayList<ShadedTriangle>();
LOG.debug("Background: " + shading.getBackground());
COSArray bg = shading.getBackground();
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java
Sun Aug 17 13:20:52 2014
@@ -448,8 +448,7 @@ public abstract class PDShading implemen
* Returns an AWT paint which corresponds to this shading
*
* @param matrix the pattern matrix
- * @param pageHeight the height of the current page
* @return an AWT Paint instance
*/
- public abstract Paint toPaint(Matrix matrix, int pageHeight);
+ public abstract Paint toPaint(Matrix matrix);
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java
Sun Aug 17 13:20:52 2014
@@ -114,8 +114,8 @@ public class PDShadingType1 extends PDSh
}
@Override
- public Paint toPaint(Matrix matrix, int pageHeight)
+ public Paint toPaint(Matrix matrix)
{
- return new Type1ShadingPaint(this, matrix, pageHeight);
+ return new Type1ShadingPaint(this, matrix);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java
Sun Aug 17 13:20:52 2014
@@ -145,8 +145,8 @@ public class PDShadingType2 extends PDSh
}
@Override
- public Paint toPaint(Matrix matrix, int pageHeight)
+ public Paint toPaint(Matrix matrix)
{
- return new AxialShadingPaint(this, matrix, pageHeight);
+ return new AxialShadingPaint(this, matrix);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java
Sun Aug 17 13:20:52 2014
@@ -43,8 +43,8 @@ public class PDShadingType3 extends PDSh
}
@Override
- public Paint toPaint(Matrix matrix, int pageHeight)
+ public Paint toPaint(Matrix matrix)
{
- return new RadialShadingPaint(this, matrix, pageHeight);
+ return new RadialShadingPaint(this, matrix);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java
Sun Aug 17 13:20:52 2014
@@ -65,8 +65,8 @@ public class PDShadingType4 extends PDTr
}
@Override
- public Paint toPaint(Matrix matrix, int pageHeight)
+ public Paint toPaint(Matrix matrix)
{
- return new Type4ShadingPaint(this, matrix, pageHeight);
+ return new Type4ShadingPaint(this, matrix);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java
Sun Aug 17 13:20:52 2014
@@ -65,8 +65,8 @@ public class PDShadingType5 extends PDTr
}
@Override
- public Paint toPaint(Matrix matrix, int pageHeight)
+ public Paint toPaint(Matrix matrix)
{
- return new Type5ShadingPaint(this, matrix, pageHeight);
+ return new Type5ShadingPaint(this, matrix);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java
Sun Aug 17 13:20:52 2014
@@ -44,8 +44,8 @@ public class PDShadingType6 extends PDSh
}
@Override
- public Paint toPaint(Matrix matrix, int pageHeight)
+ public Paint toPaint(Matrix matrix)
{
- return new Type6ShadingPaint(this, matrix, pageHeight);
+ return new Type6ShadingPaint(this, matrix);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.java
Sun Aug 17 13:20:52 2014
@@ -44,8 +44,8 @@ public class PDShadingType7 extends PDSh
}
@Override
- public Paint toPaint(Matrix matrix, int pageHeight)
+ public Paint toPaint(Matrix matrix)
{
- return new Type7ShadingPaint(this, matrix, pageHeight);
+ return new Type7ShadingPaint(this, matrix);
}
}
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -63,14 +63,13 @@ abstract class PatchMeshesShadingContext
* @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
* @throws IOException if something went wrong
*/
protected PatchMeshesShadingContext(PDShading shading, ColorModel
colorModel, AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
- super(shading, colorModel, xform, ctm, pageHeight, dBounds);
+ super(shading, colorModel, xform, ctm, dBounds);
patchMeshesShadingType = shading;
bitsPerFlag = ((PDShadingType6) shading).getBitsPerFlag();
patchList = new ArrayList<Patch>();
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -71,12 +71,11 @@ public class RadialShadingContext extend
* @param xform transformation for user to device space
* @param ctm the transformation matrix
* @param dBounds device bounds
- * @param pageHeight height of the current page
*/
public RadialShadingContext(PDShadingType3 shading, ColorModel colorModel,
AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
- super(shading, colorModel, xform, ctm, pageHeight, dBounds);
+ super(shading, colorModel, xform, ctm, dBounds);
this.radialShadingType = shading;
coords = shading.getCoords().toFloatArray();
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java
Sun Aug 17 13:20:52 2014
@@ -40,20 +40,17 @@ public class RadialShadingPaint implemen
private PDShadingType3 shading;
private Matrix ctm;
- private int pageHeight;
/**
* Constructor.
*
* @param shading the shading resources
* @param ctm current transformation matrix
- * @param pageHeight size of the current page
*/
- RadialShadingPaint(PDShadingType3 shading, Matrix ctm, int pageHeight)
+ RadialShadingPaint(PDShadingType3 shading, Matrix ctm)
{
this.shading = shading;
this.ctm = ctm;
- this.pageHeight = pageHeight;
}
@Override
@@ -68,7 +65,7 @@ public class RadialShadingPaint implemen
{
try
{
- return new RadialShadingContext(shading, cm, xform, ctm,
pageHeight, deviceBounds);
+ return new RadialShadingContext(shading, cm, xform, ctm,
deviceBounds);
}
catch (IOException ex)
{
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -47,7 +47,7 @@ public abstract class ShadingContext
protected ColorModel outputColorModel;
public ShadingContext(PDShading shading, ColorModel cm, AffineTransform
xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
this.shading = shading;
deviceBounds = dBounds;
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -56,10 +56,10 @@ abstract class TriangleBasedShadingConte
final protected boolean hasFunction;
public TriangleBasedShadingContext(PDShading shading, ColorModel cm,
- AffineTransform xform, Matrix ctm, int pageHeight, Rectangle
dBounds)
+ AffineTransform xform, Matrix ctm, Rectangle dBounds)
throws IOException
{
- super(shading, cm, xform, ctm, pageHeight, dBounds);
+ super(shading, cm, xform, ctm, dBounds);
PDTriangleBasedShadingType triangleBasedShadingType =
(PDTriangleBasedShadingType) shading;
hasFunction = shading.getFunction() != null;
bitsPerCoordinate = triangleBasedShadingType.getBitsPerCoordinate();
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -51,13 +51,12 @@ class Type1ShadingContext extends Shadin
* @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
*/
public Type1ShadingContext(PDShadingType1 shading, ColorModel colorModel,
AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
- super(shading, colorModel, xform, ctm, pageHeight, dBounds);
+ super(shading, colorModel, xform, ctm, dBounds);
this.type1ShadingType = shading;
// spec p.308
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -38,20 +38,17 @@ class Type1ShadingPaint implements Paint
private PDShadingType1 shading;
private Matrix ctm;
- private int pageHeight;
/**
* Constructor.
*
* @param shading the shading resources
* @param ctm current transformation matrix
- * @param pageHeight the height of the page
*/
- Type1ShadingPaint(PDShadingType1 shading, Matrix ctm, int pageHeight)
+ Type1ShadingPaint(PDShadingType1 shading, Matrix ctm)
{
this.shading = shading;
this.ctm = ctm;
- this.pageHeight = pageHeight;
}
@Override
@@ -66,7 +63,7 @@ class Type1ShadingPaint implements Paint
{
try
{
- return new Type1ShadingContext(shading, cm, xform, ctm,
pageHeight, deviceBounds);
+ return new Type1ShadingContext(shading, cm, xform, ctm,
deviceBounds);
}
catch (IOException ex)
{
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -50,12 +50,11 @@ class Type4ShadingContext extends Gourau
* @param cm 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
*/
public Type4ShadingContext(PDShadingType4 shading, ColorModel cm,
AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
- super(shading, cm, xform, ctm, pageHeight, dBounds);
+ super(shading, cm, xform, ctm, dBounds);
LOG.debug("Type4ShadingContext");
bitsPerFlag = shading.getBitsPerFlag();
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -38,20 +38,17 @@ class Type4ShadingPaint implements Paint
private PDShadingType4 shading;
private Matrix ctm;
- private int pageHeight;
/**
* Constructor.
*
* @param shading the shading resources
* @param ctm current transformation matrix
- * @param pageHeight the height of the page
*/
- Type4ShadingPaint(PDShadingType4 shading, Matrix ctm, int pageHeight)
+ Type4ShadingPaint(PDShadingType4 shading, Matrix ctm)
{
this.shading = shading;
this.ctm = ctm;
- this.pageHeight = pageHeight;
}
@Override
@@ -66,7 +63,7 @@ class Type4ShadingPaint implements Paint
{
try
{
- return new Type4ShadingContext(shading, cm, xform, ctm,
pageHeight, deviceBounds);
+ return new Type4ShadingContext(shading, cm, xform, ctm,
deviceBounds);
}
catch (IOException ex)
{
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -49,13 +49,12 @@ class Type5ShadingContext extends Gourau
* @param cm 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
* @throws IOException if something went wrong
*/
public Type5ShadingContext(PDShadingType5 shading, ColorModel cm,
AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
- super(shading, cm, xform, ctm, pageHeight, dBounds);
+ super(shading, cm, xform, ctm, dBounds);
LOG.debug("Type5ShadingContext");
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -38,20 +38,17 @@ class Type5ShadingPaint implements Paint
private PDShadingType5 shading;
private Matrix ctm;
- private int pageHeight;
/**
* Constructor.
*
* @param shading the shading resources
* @param ctm current transformation matrix
- * @param pageHeight the height of the page
*/
- Type5ShadingPaint(PDShadingType5 shading, Matrix ctm, int pageHeight)
+ Type5ShadingPaint(PDShadingType5 shading, Matrix ctm)
{
this.shading = shading;
this.ctm = ctm;
- this.pageHeight = pageHeight;
}
@Override
@@ -66,7 +63,7 @@ class Type5ShadingPaint implements Paint
{
try
{
- return new Type5ShadingContext(shading, cm, xform, ctm,
pageHeight, deviceBounds);
+ return new Type5ShadingContext(shading, cm, xform, ctm,
deviceBounds);
}
catch (IOException ex)
{
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -41,14 +41,13 @@ class Type6ShadingContext extends PatchM
* @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
* @throws IOException if something went wrong
*/
public Type6ShadingContext(PDShadingType6 shading, ColorModel colorModel,
AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
- super(shading, colorModel, xform, ctm, pageHeight, dBounds);
+ super(shading, colorModel, xform, ctm, dBounds);
patchList = getCoonsPatchList(xform, ctm);
pixelTable = calcPixelTable();
}
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -39,20 +39,17 @@ 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
*/
- public Type6ShadingPaint(PDShadingType6 shading, Matrix ctm, int
pageHeight)
+ public Type6ShadingPaint(PDShadingType6 shading, Matrix ctm)
{
this.shading = shading;
this.ctm = ctm;
- this.pageHeight = pageHeight;
}
@Override
@@ -67,7 +64,7 @@ class Type6ShadingPaint implements Paint
{
try
{
- return new Type6ShadingContext(shading, cm, xform, ctm,
pageHeight, deviceBounds);
+ return new Type6ShadingContext(shading, cm, xform, ctm,
deviceBounds);
}
catch (IOException ex)
{
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -41,14 +41,13 @@ class Type7ShadingContext extends PatchM
* @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
* @throws IOException if something went wrong
*/
public Type7ShadingContext(PDShadingType7 shading, ColorModel colorModel,
AffineTransform xform,
- Matrix ctm, int pageHeight, Rectangle dBounds) throws IOException
+ Matrix ctm, Rectangle dBounds) throws IOException
{
- super(shading, colorModel, xform, ctm, pageHeight, dBounds);
+ super(shading, colorModel, xform, ctm, dBounds);
patchList = getTensorPatchList(xform, ctm);
pixelTable = calcPixelTable();
}
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=1618474&r1=1618473&r2=1618474&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
Sun Aug 17 13:20:52 2014
@@ -39,20 +39,17 @@ 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
*/
- public Type7ShadingPaint(PDShadingType7 shading, Matrix ctm, int
pageHeight)
+ public Type7ShadingPaint(PDShadingType7 shading, Matrix ctm)
{
this.shading = shading;
this.ctm = ctm;
- this.pageHeight = pageHeight;
}
@Override
@@ -67,7 +64,7 @@ class Type7ShadingPaint implements Paint
{
try
{
- return new Type7ShadingContext(shading, cm, xform, ctm,
pageHeight, deviceBounds);
+ return new Type7ShadingContext(shading, cm, xform, ctm,
deviceBounds);
}
catch (IOException ex)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1618474&r1=1618473&r2=1618474&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Sun Aug 17 13:20:52 2014
@@ -910,7 +910,7 @@ public class PageDrawer extends PDFGraph
{
PDShading shading =
getResources().getShadings().get(shadingName.getName());
Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
- Paint paint = shading.toPaint(ctm, (int)pageSize.getHeight());
+ Paint paint = shading.toPaint(ctm);
graphics.setComposite(getGraphicsState().getNonStrokingJavaComposite());
graphics.setPaint(paint);
