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 2017/01/24 16:59:27 UTC
svn commit: r1780091 - in
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox:
pdmodel/graphics/pattern/PDTilingPattern.java rendering/TilingPaint.java
Author: tilman
Date: Tue Jan 24 16:59:27 2017
New Revision: 1780091
URL: http://svn.apache.org/viewvc?rev=1780091&view=rev
Log:
PDFBOX-3653: clip large patterns; return actual pattern xy step values
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java?rev=1780091&r1=1780090&r2=1780091&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java Tue Jan 24 16:59:27 2017
@@ -129,9 +129,7 @@ public class PDTilingPattern extends PDA
*/
public float getXStep()
{
- // ignores invalid values, see PDFBOX-1094-065514-XStep32767.pdf
- float xStep = getCOSObject().getFloat( COSName.X_STEP, 0 );
- return xStep >= Short.MAX_VALUE ? 0 : xStep;
+ return getCOSObject().getFloat(COSName.X_STEP, 0);
}
/**
@@ -149,9 +147,7 @@ public class PDTilingPattern extends PDA
*/
public float getYStep()
{
- // ignores invalid values, see PDFBOX-1094-065514-XStep32767.pdf
- float yStep = getCOSObject().getFloat( COSName.Y_STEP, 0 );
- return yStep >= Short.MAX_VALUE ? 0 : yStep;
+ return getCOSObject().getFloat(COSName.Y_STEP, 0);
}
public PDStream getContentStream()
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java?rev=1780091&r1=1780090&r2=1780091&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java Tue Jan 24 16:59:27 2017
@@ -212,11 +212,28 @@ class TilingPaint implements Paint
float xScale = patternMatrix.getScalingFactorX();
float yScale = patternMatrix.getScalingFactorY();
+ float width = xStep * xScale;
+ float height = yStep * yScale;
+
+ int MAX = 5000;
+ if (Math.abs(width * height) > MAX * MAX)
+ {
+ // PDFBOX-3653: prevent huge sizes
+ LOG.info("Pattern surface is too large, will be clipped");
+ LOG.info("width: " + width + ", height: " + height);
+ LOG.info("XStep: " + xStep + ", YStep: " + yStep);
+ LOG.info("bbox: " + pattern.getBBox());
+ LOG.info("pattern matrix: " + pattern.getMatrix());
+ LOG.info("concatenated matrix: " + patternMatrix);
+ width = Math.min(MAX, Math.abs(width)) * Math.signum(width);
+ height = Math.min(MAX, Math.abs(height)) * Math.signum(height);
+ //TODO better solution needed
+ }
// returns the anchor rect with scaling applied
PDRectangle anchor = pattern.getBBox();
return new Rectangle2D.Float(anchor.getLowerLeftX() * xScale,
anchor.getLowerLeftY() * yScale,
- xStep * xScale, yStep * yScale);
+ width, height);
}
}