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/02/25 20:50:52 UTC
svn commit: r1571803 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox:
pdfviewer/PageDrawer.java util/Matrix.java
Author: jahewson
Date: Tue Feb 25 19:50:51 2014
New Revision: 1571803
URL: http://svn.apache.org/r1571803
Log:
PDFBOX-1940: New stroke width calcluation
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java?rev=1571803&r1=1571802&r2=1571803&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java Tue Feb 25 19:50:51 2014
@@ -615,31 +615,6 @@ public class PageDrawer extends PDFStrea
}
}
- /**
- * Fill the path.
- *
- * @param windingRule The winding rule this path will use.
- *
- * @throws IOException If there is an IO error while filling the path.
- */
- public void fillPath(int windingRule) throws IOException
- {
- graphics.setComposite(getGraphicsState().getNonStrokeJavaComposite());
- Paint nonStrokingPaint = getNonStrokingPaint();
- if (nonStrokingPaint == null)
- {
- LOG.info("ColorSpace " + getGraphicsState().getNonStrokingColorSpace().getName() +
- " doesn't provide a non-stroking color, using white instead!");
- nonStrokingPaint = Color.WHITE;
- }
- graphics.setPaint(nonStrokingPaint);
- getLinePath().setWindingRule(windingRule);
- graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
- graphics.setClip(getGraphicsState().getCurrentClippingPath());
- graphics.fill(getLinePath());
- getLinePath().reset();
- }
-
// returns the stroking AWT Paint
private Paint getStrokingPaint() throws IOException
{
@@ -658,14 +633,9 @@ public class PageDrawer extends PDFStrea
private BasicStroke getStroke()
{
PDGraphicsState state = getGraphicsState();
- float lineWidth = state.getLineWidth();
// apply the CTM
- Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
- if (ctm != null && ctm.getXScale() > 0)
- {
- lineWidth = lineWidth * ctm.getXScale();
- }
+ float lineWidth = transformWidth(state.getLineWidth());
// minimum line width as used by Adobe Reader
if (lineWidth < 0.25)
@@ -678,19 +648,17 @@ public class PageDrawer extends PDFStrea
float[] dashArray = dashPattern.getDashArray();
if (dashArray != null)
{
- if (ctm != null && ctm.getXScale() > 0)
+ // apply the CTM
+ for (int i = 0; i < dashArray.length; ++i)
{
- for (int i = 0; i < dashArray.length; ++i)
- {
- dashArray[i] *= ctm.getXScale();
- }
- phaseStart *= ctm.getXScale();
-
- // empty dash array is illegal
- if (dashArray.length == 0)
- {
- dashArray = null;
- }
+ dashArray[i] = transformWidth(dashArray[i]);
+ }
+ phaseStart = (int)transformWidth(phaseStart);
+
+ // empty dash array is illegal
+ if (dashArray.length == 0)
+ {
+ dashArray = null;
}
}
return new BasicStroke(lineWidth, state.getLineCap(), state.getLineJoin(),
@@ -716,9 +684,33 @@ public class PageDrawer extends PDFStrea
graphics.setStroke(getStroke());
graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
graphics.setClip(getGraphicsState().getCurrentClippingPath());
- GeneralPath path = getLinePath();
- graphics.draw(path);
- path.reset();
+ graphics.draw(linePath);
+ linePath.reset();
+ }
+
+ /**
+ * Fill the path.
+ *
+ * @param windingRule The winding rule this path will use.
+ *
+ * @throws IOException If there is an IO error while filling the path.
+ */
+ public void fillPath(int windingRule) throws IOException
+ {
+ graphics.setComposite(getGraphicsState().getNonStrokeJavaComposite());
+ Paint nonStrokingPaint = getNonStrokingPaint();
+ if (nonStrokingPaint == null)
+ {
+ LOG.info("ColorSpace " + getGraphicsState().getNonStrokingColorSpace().getName() +
+ " doesn't provide a non-stroking color, using white instead!");
+ nonStrokingPaint = Color.WHITE;
+ }
+ graphics.setPaint(nonStrokingPaint);
+ linePath.setWindingRule(windingRule);
+ graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+ graphics.setClip(getGraphicsState().getCurrentClippingPath());
+ graphics.fill(linePath);
+ linePath.reset();
}
// This code generalizes the code Jim Lynch wrote for AppendRectangleToPath
@@ -729,7 +721,7 @@ public class PageDrawer extends PDFStrea
* @param y y-coordinate of the point to be transform
* @return the transformed coordinates as Point2D.Double
*/
- public java.awt.geom.Point2D.Double transformedPoint(double x, double y)
+ public Point2D.Double transformedPoint(double x, double y)
{
double[] position = { x, y };
getGraphicsState().getCurrentTransformationMatrix().createAffineTransform()
@@ -737,6 +729,22 @@ public class PageDrawer extends PDFStrea
return new Point2D.Double(position[0], position[1]);
}
+ // transforms a width using the CTM
+ private float transformWidth(float width)
+ {
+ Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
+
+ if (ctm == null)
+ {
+ // TODO does the CTM really need to use null?
+ return width;
+ }
+
+ float x = ctm.getValue(0, 0) + ctm.getValue(1, 0);
+ float y = ctm.getValue(0, 1) + ctm.getValue(1, 1);
+ return width * (float)Math.sqrt((x * x + y * y) * 0.5);
+ }
+
/**
* Set the clipping Path.
*
@@ -770,7 +778,7 @@ public class PageDrawer extends PDFStrea
if (clippingWindingRule > -1)
{
PDGraphicsState graphicsState = getGraphicsState();
- GeneralPath clippingPath = (GeneralPath) getLinePath().clone();
+ GeneralPath clippingPath = (GeneralPath) linePath.clone(); // TODO do we really need to clone this? isn't the line path reset anyway?
clippingPath.setWindingRule(clippingWindingRule);
// If there is already set a clipping path, we have to intersect the new with the existing one
if (graphicsState.getCurrentClippingPath() != null)
@@ -786,7 +794,7 @@ public class PageDrawer extends PDFStrea
}
clippingWindingRule = -1;
}
- getLinePath().reset();
+ linePath.reset();
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java?rev=1571803&r1=1571802&r2=1571803&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java Tue Feb 25 19:50:51 2014
@@ -28,9 +28,9 @@ public class Matrix implements Cloneable
{
static final float[] DEFAULT_SINGLE =
{
- 1,0,0,
- 0,1,0,
- 0,0,1
+ 1,0,0, // a b 0
+ 0,1,0, // c d 0
+ 0,0,1 // tx ty 1
};
private float[] single;