diff options
| author | Mehdi Houshmand <mehdi@apache.org> | 2012-07-03 09:46:41 +0000 |
|---|---|---|
| committer | Mehdi Houshmand <mehdi@apache.org> | 2012-07-03 09:46:41 +0000 |
| commit | 4e47dc20363d4ee9afbde17db4f7d20c5d480158 (patch) | |
| tree | 6f5c714e59c93795a4f4b7ceecd12e06008d7835 /src/java/org/apache/fop/afp/fonts/RasterFont.java | |
| parent | 2a7e60cb3390a91d428fb607c0e19eaa911ec5b9 (diff) | |
| parent | ddf23aef5465ec7b939fb304b30d877bd5ec43be (diff) | |
| download | xmlgraphics-fop-4e47dc20363d4ee9afbde17db4f7d20c5d480158.tar.gz xmlgraphics-fop-4e47dc20363d4ee9afbde17db4f7d20c5d480158.zip | |
Merged Temp_URI_Unification branch back into trunk
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1356646 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/afp/fonts/RasterFont.java')
| -rw-r--r-- | src/java/org/apache/fop/afp/fonts/RasterFont.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/java/org/apache/fop/afp/fonts/RasterFont.java b/src/java/org/apache/fop/afp/fonts/RasterFont.java index 30704b2b0..5c4c38dc5 100644 --- a/src/java/org/apache/fop/afp/fonts/RasterFont.java +++ b/src/java/org/apache/fop/afp/fonts/RasterFont.java @@ -52,8 +52,8 @@ public class RasterFont extends AFPFont { * @param name * the name of the font */ - public RasterFont(String name) { - super(name); + public RasterFont(String name, boolean embeddable) { + super(name, embeddable); } /** @@ -76,7 +76,7 @@ public class RasterFont extends AFPFont { public CharacterSet getCharacterSet(int sizeInMpt) { Integer requestedSize = Integer.valueOf(sizeInMpt); - CharacterSet csm = (CharacterSet) charSets.get(requestedSize); + CharacterSet csm = charSets.get(requestedSize); double sizeInPt = sizeInMpt / 1000.0; if (csm != null) { @@ -85,7 +85,7 @@ public class RasterFont extends AFPFont { if (substitutionCharSets != null) { //Check first if a substitution has already been added - csm = (CharacterSet) substitutionCharSets.get(requestedSize); + csm = substitutionCharSets.get(requestedSize); } if (csm == null && !charSets.isEmpty()) { @@ -95,9 +95,9 @@ public class RasterFont extends AFPFont { SortedMap<Integer, CharacterSet> smallerSizes = charSets.headMap(requestedSize); SortedMap<Integer, CharacterSet> largerSizes = charSets.tailMap(requestedSize); int smallerSize = smallerSizes.isEmpty() ? 0 - : ((Integer)smallerSizes.lastKey()).intValue(); + : smallerSizes.lastKey().intValue(); int largerSize = largerSizes.isEmpty() ? Integer.MAX_VALUE - : ((Integer)largerSizes.firstKey()).intValue(); + : largerSizes.firstKey().intValue(); Integer fontSize; if (!smallerSizes.isEmpty() @@ -106,7 +106,7 @@ public class RasterFont extends AFPFont { } else { fontSize = Integer.valueOf(largerSize); } - csm = (CharacterSet) charSets.get(fontSize); + csm = charSets.get(fontSize); if (csm != null) { // Add the substitute mapping, so subsequent calls will |