You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/09/01 20:42:04 UTC
svn commit: r1621866 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox:
pdmodel/graphics/color/PDColorSpace.java
pdmodel/graphics/color/PDPattern.java rendering/PageDrawer.java
Author: jahewson
Date: Mon Sep 1 18:42:04 2014
New Revision: 1621866
URL: http://svn.apache.org/r1621866
Log:
PDFBOX-1991: Removed unused pageHeight from PageDrawer
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.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/PDColorSpace.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java?rev=1621866&r1=1621865&r2=1621866&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java Mon Sep 1 18:42:04 2014
@@ -239,18 +239,15 @@ public abstract class PDColorSpace imple
/**
* Returns the AWT paint which corresponds to the given color value in this color space
- * and the height of the current page.
- * This is for use with pattern color spaces
+ * and the height of the current page. This is for use with pattern color spaces.
* @param color the color value
* @param subStreamMatrix the substream matrix
* @param xform the graphics transform
- * @param pageHeight the height of the current page, used by pattern color spaces
* @return an AWT paint
* @throws IOException if the color conversion fails
*/
- public Paint toPaint(PDFRenderer renderer, PDColor color,
- Matrix subStreamMatrix, AffineTransform xform,
- int pageHeight) throws IOException
+ public Paint toPaint(PDFRenderer renderer, PDColor color, Matrix subStreamMatrix,
+ AffineTransform xform) throws IOException
{
float[] rgb = toRGB(color.getComponents());
return new Color(rgb[0], rgb[1], rgb[2]);
@@ -261,5 +258,4 @@ public abstract class PDColorSpace imple
{
return array;
}
-
}
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=1621866&r1=1621865&r2=1621866&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 Mon Sep 1 18:42:04 2014
@@ -105,9 +105,8 @@ public final class PDPattern extends PDS
}
@Override
- public Paint toPaint(PDFRenderer renderer, PDColor color,
- Matrix substreamMatrix, AffineTransform xform,
- int pageHeight) throws IOException
+ public Paint toPaint(PDFRenderer renderer, PDColor color, Matrix substreamMatrix,
+ AffineTransform xform) throws IOException
{
PDAbstractPattern pattern = getPattern(color);
if (pattern instanceof PDTilingPattern)
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=1621866&r1=1621865&r2=1621866&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 Mon Sep 1 18:42:04 2014
@@ -103,8 +103,6 @@ public class PageDrawer extends PDFGraph
private Area textClippingArea;
private final Map<PDFont, Glyph2D> fontGlyph2D = new HashMap<PDFont, Glyph2D>();
-
- private PDRectangle pageSize;
/**
* Default constructor, loads properties from file.
@@ -169,8 +167,6 @@ public class PageDrawer extends PDFGraph
// TODO use getStroke() to set the initial stroke
graphics.setStroke(new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
- this.pageSize = pageSize;
-
// Only if there is some content, we have to process it.
// Otherwise we are done here and we will produce an empty page
PDPage page = getPage();
@@ -292,7 +288,6 @@ public class PageDrawer extends PDFGraph
Matrix matrix, PDColorSpace colorSpace, PDColor color)
throws IOException
{
- pageSize = pageDimension;
graphics = g;
setRenderingHints();
@@ -576,8 +571,7 @@ public class PageDrawer extends PDFGraph
PDGraphicsState graphicsState = getGraphicsState();
return applySoftMaskToPaint(graphicsState.getStrokingColorSpace()
.toPaint(renderer, graphicsState.getStrokingColor(),
- getSubStreamMatrix(), xform,
- (int) pageSize.getHeight()),
+ getSubStreamMatrix(), xform),
graphicsState.getSoftMask());
}
@@ -586,8 +580,7 @@ public class PageDrawer extends PDFGraph
{
return getGraphicsState().getNonStrokingColorSpace()
.toPaint(renderer, getGraphicsState().getNonStrokingColor(),
- getSubStreamMatrix(), xform,
- (int) pageSize.getHeight());
+ getSubStreamMatrix(), xform);
}
// create a new stroke based on the current CTM and the current stroke
@@ -740,9 +733,7 @@ public class PageDrawer extends PDFGraph
PDColorSpace colorSpace = getGraphicsState().getNonStrokingColorSpace();
PDColor color = getGraphicsState().getNonStrokingColor();
BufferedImage image = pdImage.getStencilImage(
- colorSpace.toPaint(renderer, color,
- getSubStreamMatrix(), xform,
- (int) pageSize.getHeight()));
+ colorSpace.toPaint(renderer, color, getSubStreamMatrix(), xform));
// draw the image
drawBufferedImage(image, at);