aboutsummaryrefslogtreecommitdiffstats
path: root/src/java/org/apache/fop/render/java2d
diff options
context:
space:
mode:
authorGlenn Adams <gadams@apache.org>2014-11-11 08:20:24 +0000
committerGlenn Adams <gadams@apache.org>2014-11-11 08:20:24 +0000
commit13376a2c395a787288a98cc76d957ea49e38e518 (patch)
tree4195130e72de7033bba82cf12ab32da3ef2c5e64 /src/java/org/apache/fop/render/java2d
parentc446a6368fa7f88ef4efcdc1f17b195ece9b3836 (diff)
downloadxmlgraphics-fop-13376a2c395a787288a98cc76d957ea49e38e518.tar.gz
xmlgraphics-fop-13376a2c395a787288a98cc76d957ea49e38e518.zip
Revert to r1637810 to fix broken build.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1638047 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/render/java2d')
-rw-r--r--src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java b/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java
index b9b7539fc..0b410873b 100644
--- a/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java
+++ b/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java
@@ -33,7 +33,6 @@ import org.apache.fop.fonts.FontCollection;
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontLoader;
import org.apache.fop.fonts.FontTriplet;
-import org.apache.fop.fonts.FontUris;
import org.apache.fop.fonts.LazyFont;
/**
@@ -82,10 +81,10 @@ public class ConfiguredFontCollection implements FontCollection {
InputStream fontSource = resourceResolver.getResource(fontURI);
font = new CustomFontMetricsMapper(fontMetrics, fontSource);
} else {
- FontUris fontUris = new FontUris(fontURI, null);
- CustomFont fontMetrics = FontLoader.loadFont(fontUris, null, true,
+ CustomFont fontMetrics = FontLoader.loadFont(fontURI, null, true,
configFontInfo.getEmbeddingMode(), configFontInfo.getEncodingMode(),
- configFontInfo.getKerning(), configFontInfo.getAdvanced(), resourceResolver);
+ configFontInfo.getKerning(), configFontInfo.getAdvanced(),
+ resourceResolver);
font = new CustomFontMetricsMapper(fontMetrics);
}