a simple impl of getting ipd and line height

some adjustments to user agent


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

3 files changed, 3 insertions, 4 deletions

diff --git a/src/org/apache/fop/image/ImageLoader.java b/src/org/apache/fop/image/ImageLoader.java
index 679cf2325..5c836368b 100644
--- a/src/org/apache/fop/image/ImageLoader.java
+++ b/src/org/apache/fop/image/ImageLoader.java
@@ -30,7 +30,7 @@ class ImageLoader {
         if (!valid || image != null) {
             return image;
         }
-        String base = userAgent.getBaseDirectory();
+        String base = userAgent.getBaseURL();
         image = ImageFactory.loadImage(url, base, userAgent);
         if (image == null) {
             cache.invalidateImage(url, userAgent);
diff --git a/src/org/apache/fop/image/analyser/SVGReader.java b/src/org/apache/fop/image/analyser/SVGReader.java
index 8791b3420..e4416d33e 100644
--- a/src/org/apache/fop/image/analyser/SVGReader.java
+++ b/src/org/apache/fop/image/analyser/SVGReader.java
@@ -164,8 +164,7 @@ public class SVGReader implements ImageReader {
                 Element e = ((SVGDocument) doc).getRootElement();
                 String s;
                 SVGUserAgent userAg =
-                  new SVGUserAgent(new AffineTransform());
-                userAg.setLogger(ua.getLogger());
+                  new SVGUserAgent(ua, new AffineTransform());
                 BridgeContext ctx = new BridgeContext(userAg);
                 UnitProcessor.Context uctx =
                   UnitProcessor.createContext(ctx, e);
diff --git a/src/org/apache/fop/image/analyser/XMLReader.java b/src/org/apache/fop/image/analyser/XMLReader.java
index ab66be981..5bce255f7 100644
--- a/src/org/apache/fop/image/analyser/XMLReader.java
+++ b/src/org/apache/fop/image/analyser/XMLReader.java
@@ -82,7 +82,7 @@ public class XMLReader implements ImageReader {
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            //e.printStackTrace();
             try {
                 is.reset();
             } catch (IOException ioe) { }