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/08/02 16:55:35 UTC
svn commit: r1803866 - in
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox:
pdmodel/graphics/PDLineDashPattern.java rendering/PageDrawer.java
Author: tilman
Date: Wed Aug 2 16:55:35 2017
New Revision: 1803866
URL: http://svn.apache.org/viewvc?rev=1803866&view=rev
Log:
PDFBOX-2852: remove unneeded nullcheck; improve javadoc
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPattern.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPattern.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPattern.java?rev=1803866&r1=1803865&r2=1803866&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPattern.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/PDLineDashPattern.java Wed Aug 2 16:55:35 2017
@@ -77,7 +77,7 @@ public final class PDLineDashPattern imp
/**
* Returns the dash array.
- * @return the dash array
+ * @return the dash array, never null.
*/
public float[] getDashArray()
{
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1803866&r1=1803865&r2=1803866&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Wed Aug 2 16:55:35 2017
@@ -648,34 +648,31 @@ public class PageDrawer extends PDFGraph
PDLineDashPattern dashPattern = state.getLineDashPattern();
int phaseStart = dashPattern.getPhase();
float[] dashArray = dashPattern.getDashArray();
- if (dashArray != null)
+ // apply the CTM
+ for (int i = 0; i < dashArray.length; ++i)
{
- // apply the CTM
- for (int i = 0; i < dashArray.length; ++i)
- {
- // minimum line dash width avoids JVM crash,
- // see PDFBOX-2373, PDFBOX-2929, PDFBOX-3204, PDFBOX-3813
- // also avoid 0 in array like "[ 0 1000 ] 0 d", see PDFBOX-3724
- float w = transformWidth(dashArray[i]);
- dashArray[i] = Math.max(w, 0.062f);
- }
- phaseStart = (int)transformWidth(phaseStart);
+ // minimum line dash width avoids JVM crash,
+ // see PDFBOX-2373, PDFBOX-2929, PDFBOX-3204, PDFBOX-3813
+ // also avoid 0 in array like "[ 0 1000 ] 0 d", see PDFBOX-3724
+ float w = transformWidth(dashArray[i]);
+ dashArray[i] = Math.max(w, 0.062f);
+ }
+ phaseStart = (int) transformWidth(phaseStart);
- // empty dash array is illegal
- // avoid also infinite and NaN values (PDFBOX-3360)
- if (dashArray.length == 0 || Float.isInfinite(phaseStart) || Float.isNaN(phaseStart))
- {
- dashArray = null;
- }
- else
+ // empty dash array is illegal
+ // avoid also infinite and NaN values (PDFBOX-3360)
+ if (dashArray.length == 0 || Float.isInfinite(phaseStart) || Float.isNaN(phaseStart))
+ {
+ dashArray = null;
+ }
+ else
+ {
+ for (int i = 0; i < dashArray.length; ++i)
{
- for (int i = 0; i < dashArray.length; ++i)
+ if (Float.isInfinite(dashArray[i]) || Float.isNaN(dashArray[i]))
{
- if (Float.isInfinite(dashArray[i]) || Float.isNaN(dashArray[i]))
- {
- dashArray = null;
- break;
- }
+ dashArray = null;
+ break;
}
}
}