FOP-2424: Allow for type1 afm/pfm files to be in a different path than the pfb file

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1637817 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java b/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java
index 0b410873b..b9b7539fc 100644
--- a/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java
+++ b/src/java/org/apache/fop/render/java2d/ConfiguredFontCollection.java
@@ -33,6 +33,7 @@ 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;
 
 /**
@@ -81,10 +82,10 @@ public class ConfiguredFontCollection implements FontCollection {
                     InputStream fontSource = resourceResolver.getResource(fontURI);
                     font = new CustomFontMetricsMapper(fontMetrics, fontSource);
                 } else {
-                    CustomFont fontMetrics = FontLoader.loadFont(fontURI, null, true,
+                    FontUris fontUris = new FontUris(fontURI, null);
+                    CustomFont fontMetrics = FontLoader.loadFont(fontUris, null, true,
                             configFontInfo.getEmbeddingMode(), configFontInfo.getEncodingMode(),
-                            configFontInfo.getKerning(), configFontInfo.getAdvanced(),
-                            resourceResolver);
+                            configFontInfo.getKerning(), configFontInfo.getAdvanced(), resourceResolver);
                     font = new CustomFontMetricsMapper(fontMetrics);
                 }