You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/07/25 11:26:17 UTC
svn commit: r1880294 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java
Author: lehmi
Date: Sat Jul 25 11:26:17 2020
New Revision: 1880294
URL: http://svn.apache.org/viewvc?rev=1880294&view=rev
Log:
PDFBOX-4892: simplify condition
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java?rev=1880294&r1=1880293&r2=1880294&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java Sat Jul 25 11:26:17 2020
@@ -575,8 +575,6 @@ public final class Matrix implements Clo
*/
public float getScalingFactorX()
{
- float xScale = single[0];
-
/**
* BM: if the trm is rotated, the calculation is a little more complicated
*
@@ -594,12 +592,12 @@ public final class Matrix implements Clo
* sqrt(x2) =
* abs(x)
*/
- if( !(single[1]==0.0f && single[3]==0.0f) )
+ if (single[1] != 0.0f)
{
- xScale = (float)Math.sqrt(Math.pow(single[0], 2)+
+ return (float) Math.sqrt(Math.pow(single[0], 2) +
Math.pow(single[1], 2));
}
- return xScale;
+ return single[0];
}
/**
@@ -609,13 +607,12 @@ public final class Matrix implements Clo
*/
public float getScalingFactorY()
{
- float yScale = single[4];
- if( !(single[1]==0.0f && single[3]==0.0f) )
+ if (single[3] != 0.0f)
{
- yScale = (float)Math.sqrt(Math.pow(single[3], 2)+
+ return (float) Math.sqrt(Math.pow(single[3], 2) +
Math.pow(single[4], 2));
}
- return yScale;
+ return single[4];
}
/**