diff options
| author | Adrian Cumiskey <acumiskey@apache.org> | 2008-08-20 15:22:03 +0000 |
|---|---|---|
| committer | Adrian Cumiskey <acumiskey@apache.org> | 2008-08-20 15:22:03 +0000 |
| commit | 0f20fb70bc3c4e6f7f3c58f3a9afc1e884769cea (patch) | |
| tree | 748cb9e5665f0fa7fdfbefda70427119524855ed /src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java | |
| parent | 887b2f5c3c425b4eeed4094dae38f0c4d53ac121 (diff) | |
| download | xmlgraphics-fop-0f20fb70bc3c4e6f7f3c58f3a9afc1e884769cea.tar.gz xmlgraphics-fop-0f20fb70bc3c4e6f7f3c58f3a9afc1e884769cea.zip | |
Merged revisions 687323,687327,687365,687369 via svnmerge from
https://svn.eu.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r687323 | maxberger | 2008-08-20 14:24:18 +0100 (Wed, 20 Aug 2008) | 1 line
valueOf is Java 1.5+ only
........
r687327 | maxberger | 2008-08-20 14:32:19 +0100 (Wed, 20 Aug 2008) | 1 line
Use retroweaver for 1.4 verification
........
r687365 | maxberger | 2008-08-20 16:00:03 +0100 (Wed, 20 Aug 2008) | 1 line
Boolean.valueOf() is available in 1.4, but retroweaver still tried to weave it
........
r687369 | acumiskey | 2008-08-20 16:13:56 +0100 (Wed, 20 Aug 2008) | 3 lines
* Updated xmlgraphics-commons-14svn.jar to reflect UnitConv additions.
* Removed UnitConv and its unit test case (now resides in commons).
* Updated all fop util package references fpr UnitConv to xmlgraphics commons util package.
........
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@687372 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java')
| -rw-r--r-- | src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java index f1ba11937..e402e8a9b 100644 --- a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java +++ b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java @@ -48,7 +48,7 @@ import org.apache.fop.fo.Constants; import org.apache.fop.fo.extensions.ExtensionElementMapping; import org.apache.fop.fonts.FontMetrics; import org.apache.fop.traits.BorderProps; -import org.apache.fop.util.UnitConv; +import org.apache.xmlgraphics.util.UnitConv; /** * Abstract base class for renderers like PDF and PostScript where many painting operations @@ -490,8 +490,8 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer { int borderPaddingStart = bv.getBorderAndPaddingWidthStart(); int borderPaddingBefore = bv.getBorderAndPaddingWidthBefore(); //This is the content-rect - float width = (float)bv.getIPD() / 1000f; - float height = (float)bv.getBPD() / 1000f; + float width = bv.getIPD() / 1000f; + float height = bv.getBPD() / 1000f; if (bv.getPositioning() == Block.ABSOLUTE || bv.getPositioning() == Block.FIXED) { @@ -586,7 +586,7 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer { currentIPPosition = saveIP; currentBPPosition = saveBP; - currentBPPosition += (int)(bv.getAllocBPD()); + currentBPPosition += (bv.getAllocBPD()); } } |