--- /home/john/xml-fop/src/java/org/apache/fop/image/ImageFactory.java	2003-10-10 13:45:09.000000000 -0230
+++ /home/john/xml-fop-test/src/java/org/apache/fop/image/ImageFactory.java	2003-12-10 10:11:47.000000000 -0330
@@ -67,6 +67,7 @@
 // FOP
 import org.apache.fop.image.analyser.ImageReaderFactory;
 import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.CurrentSourceManager;
 
 
 /**
@@ -264,13 +265,14 @@
                 // a problem with relative uri's if there is an
                 // image relative to where fop is run and relative
                 // to the base dir of the document
-                try {
-                    absoluteURL = new URL(href);
-                } catch (MalformedURLException mue) {
-                    // if the href contains only a path then file is assumed
-                    absoluteURL = new URL("file:" + href);
+                if( href.substring(0,5).equals( "file:") ) {
+                    absoluteURL = CurrentSourceManager.resolveSource( new URL( href ) );
+                } else {
+                    absoluteURL = CurrentSourceManager.resolveSource( new URL( "file:"+href) );
                 }
+
                 in = absoluteURL.openStream();
+
             } catch (MalformedURLException mfue) {
                 log.error("Error with image URL: " + mfue.getMessage(), mfue);
                 return null;