xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r989216 [19/19] - in /xmlgraphics/fop/branches/Temp_TrueTypeInPostScript: ./ examples/plan/src/org/apache/fop/plan/ lib/ src/codegen/java/org/apache/fop/tools/ src/codegen/unicode/data/ src/codegen/unicode/java/org/apache/fop/hyphenation/ s...
Date Wed, 25 Aug 2010 16:49:40 GMT
Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
Wed Aug 25 16:49:26 2010
@@ -27,38 +27,38 @@ import org.apache.fop.pdf.CMapBuilder;
 
 /** Simple sanity test of the PDFCmap class */
 public class PDFCMapTestCase extends TestCase {
+    private static final String EOL = "\n";
 
     public void testPDFCMapFillInPDF() throws Exception {
-        final String EOL = "\n";
-        final String expected =
-            "%!PS-Adobe-3.0 Resource-CMap" + EOL
-            +"%%DocumentNeededResources: ProcSet (CIDInit)" + EOL
-            +"%%IncludeResource: ProcSet (CIDInit)" + EOL
-            +"%%BeginResource: CMap (test)" + EOL
-            +"%%EndComments" + EOL
-            +"/CIDInit /ProcSet findresource begin" + EOL
-            +"12 dict begin" + EOL
-            +"begincmap" + EOL
-            +"/CIDSystemInfo 3 dict dup begin" + EOL
-            +"  /Registry (Adobe) def" + EOL
-            +"  /Ordering (Identity) def" + EOL
-            +"  /Supplement 0 def" + EOL
-            +"end def" + EOL
-            +"/CMapVersion 1 def" + EOL
-            +"/CMapType 1 def" + EOL
-            +"/CMapName /test def" + EOL
-            +"1 begincodespacerange" + EOL
-            +"<0000> <FFFF>" + EOL
-            +"endcodespacerange" + EOL
-            +"1 begincidrange" + EOL
-            +"<0000> <FFFF> 0" + EOL
-            +"endcidrange" + EOL
-            +"endcmap" + EOL
-            +"CMapName currentdict /CMap defineresource pop" + EOL
-            +"end" + EOL
-            +"end" + EOL
-            +"%%EndResource" + EOL
-            +"%%EOF" + EOL
+        final String expected
+            = "%!PS-Adobe-3.0 Resource-CMap" + EOL
+            + "%%DocumentNeededResources: ProcSet (CIDInit)" + EOL
+            + "%%IncludeResource: ProcSet (CIDInit)" + EOL
+            + "%%BeginResource: CMap (test)" + EOL
+            + "%%EndComments" + EOL
+            + "/CIDInit /ProcSet findresource begin" + EOL
+            + "12 dict begin" + EOL
+            + "begincmap" + EOL
+            + "/CIDSystemInfo 3 dict dup begin" + EOL
+            + "  /Registry (Adobe) def" + EOL
+            + "  /Ordering (Identity) def" + EOL
+            + "  /Supplement 0 def" + EOL
+            + "end def" + EOL
+            + "/CMapVersion 1 def" + EOL
+            + "/CMapType 1 def" + EOL
+            + "/CMapName /test def" + EOL
+            + "1 begincodespacerange" + EOL
+            + "<0000> <FFFF>" + EOL
+            + "endcodespacerange" + EOL
+            + "1 begincidrange" + EOL
+            + "<0000> <FFFF> 0" + EOL
+            + "endcidrange" + EOL
+            + "endcmap" + EOL
+            + "CMapName currentdict /CMap defineresource pop" + EOL
+            + "end" + EOL
+            + "end" + EOL
+            + "%%EndResource" + EOL
+            + "%%EOF" + EOL
         ;
 
         final StringWriter w = new StringWriter();

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
Wed Aug 25 16:49:26 2010
@@ -43,52 +43,22 @@ import org.apache.fop.render.intermediat
 public class ImageHandlingTestCase extends AbstractPostScriptTestCase {
 
     /**
-     * Tests JPEG handling with the {@link PSRenderer}.
+     * Tests JPEG handling.
      * @throws Exception if an error occurs
      */
-    public void testJPEGImageWithRendererLevel3() throws Exception {
-        innerTestJPEGImageWithRenderer(3);
+    public void testJPEGImageLevel3() throws Exception {
+        innerTestJPEGImage(3);
     }
 
     /**
-     * Tests JPEG handling with the {@link PSRenderer}.
+     * Tests JPEG handling.
      * @throws Exception if an error occurs
      */
-    public void testJPEGImageWithRendererLevel2() throws Exception {
-        innerTestJPEGImageWithRenderer(2);
+    public void testJPEGImageLevel2() throws Exception {
+        innerTestJPEGImage(2);
     }
 
-    /**
-     * Tests JPEG handling with the {@link PSDocumentHandler}.
-     * @throws Exception if an error occurs
-     */
-    public void testJPEGImageWithIFLevel3() throws Exception {
-        innerTestJPEGImageWithIF(3);
-    }
-
-    /**
-     * Tests JPEG handling with the {@link PSDocumentHandler}.
-     * @throws Exception if an error occurs
-     */
-    public void testJPEGImageWithIFLevel2() throws Exception {
-        innerTestJPEGImageWithIF(2);
-    }
-
-    private void innerTestJPEGImageWithRenderer(int level) throws Exception {
-        FOUserAgent ua = fopFactory.newFOUserAgent();
-        PSRenderer renderer = new PSRenderer();
-        renderer.setUserAgent(ua);
-        PSRenderingUtil psUtil = renderer.getPSUtil();
-        psUtil.setLanguageLevel(level);
-        psUtil.setOptimizeResources(true);
-        ua.setRendererOverride(renderer);
-
-        // Prepare output file
-        File outputFile = renderFile(ua, "ps-jpeg-image.fo", "-rend-l" + psUtil.getLanguageLevel());
-        verifyPostScriptFile(outputFile, psUtil.getLanguageLevel());
-    }
-
-    private void innerTestJPEGImageWithIF(int level) throws Exception {
+    private void innerTestJPEGImage(int level) throws Exception {
         FOUserAgent ua = fopFactory.newFOUserAgent();
         PSDocumentHandler handler = new PSDocumentHandler();
         handler.setContext(new IFContext(ua));
@@ -159,10 +129,6 @@ public class ImageHandlingTestCase exten
         }
     }
 
-    private void assertMatches(String text, String regex) {
-        assertTrue("Text didn't match '" + regex + "'", text.matches(regex));
-    }
-
     private void assertContains(String text, String searchString) {
         assertTrue("Text doesn't contain '" + searchString + "'", text.indexOf(searchString)
>= 0);
     }

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
Wed Aug 25 16:49:26 2010
@@ -54,28 +54,10 @@ import org.apache.fop.render.intermediat
 public class ResourceOptimizationTestCase extends AbstractPostScriptTestCase {
 
     /**
-     * Tests resource optimization with the {@link PSRenderer}.
+     * Tests resource optimization.
      * @throws Exception if an error occurs
      */
-    public void testResourceOptimizationWithRenderer() throws Exception {
-        FOUserAgent ua = fopFactory.newFOUserAgent();
-        PSRenderer renderer = new PSRenderer();
-        renderer.setUserAgent(ua);
-        // This is the important part: we're enabling resource optimization
-        renderer.getPSUtil().setOptimizeResources(true);
-        ua.setRendererOverride(renderer);
-
-        // Prepare output file
-        File outputFile = renderFile(ua, "ps-resources.fo",
-                "-rend-l" + renderer.getPSUtil().getLanguageLevel());
-        verifyPostScriptFile(outputFile);
-    }
-
-    /**
-     * Tests resource optimization with the {@link PSDocumentHandler}.
-     * @throws Exception if an error occurs
-     */
-    public void testResourceOptimizationWithIF() throws Exception {
+    public void testResourceOptimization() throws Exception {
         FOUserAgent ua = fopFactory.newFOUserAgent();
         PSDocumentHandler handler = new PSDocumentHandler();
         handler.setContext(new IFContext(ua));

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/FOPTestbed.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/FOPTestbed.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/FOPTestbed.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/FOPTestbed.java
Wed Aug 25 16:49:26 2010
@@ -56,7 +56,7 @@ public class FOPTestbed extends Abstract
     private int threads;
     private File outputDir;
     private Configuration fopCfg;
-    private FOProcessor foprocessor;
+    private Processor foprocessor;
     private boolean writeToDevNull;
 
     private int counter = 0;
@@ -74,7 +74,7 @@ public class FOPTestbed extends Abstract
         for (int i = 0; i < entries.length; i++) {
             this.taskList.add(new TaskDef(entries[i]));
         }
-        this.fopCfg = configuration.getChild("foprocessor");
+        this.fopCfg = configuration.getChild("processor");
     }
 
     /** {@inheritDoc} */
@@ -177,11 +177,11 @@ public class FOPTestbed extends Abstract
      * Creates a new FOProcessor.
      * @return the newly created instance
      */
-    public FOProcessor createFOProcessor() {
+    public Processor createFOProcessor() {
         try {
             Class clazz = Class.forName(this.fopCfg.getAttribute("class",
                     "org.apache.fop.threading.FOProcessorImpl"));
-            FOProcessor fop = (FOProcessor)clazz.newInstance();
+            Processor fop = (Processor)clazz.newInstance();
             ContainerUtil.enableLogging(fop, getLogger());
             ContainerUtil.configure(fop, this.fopCfg);
             ContainerUtil.initialize(fop);
@@ -206,13 +206,15 @@ public class FOPTestbed extends Abstract
             this.fo = cfg.getAttribute("fo", null);
             if (this.fo == null) {
                 this.xml = cfg.getAttribute("xml");
-                this.xslt = cfg.getAttribute("xslt");
-                TransformerFactory factory = TransformerFactory.newInstance();
-                Source xsltSource = new StreamSource(new File(xslt));
-                try {
-                    this.templates = factory.newTemplates(xsltSource);
-                } catch (TransformerConfigurationException tce) {
-                    throw new ConfigurationException("Invalid XSLT", tce);
+                this.xslt = cfg.getAttribute("xslt", null);
+                if (this.xslt != null) {
+                    TransformerFactory factory = TransformerFactory.newInstance();
+                    Source xsltSource = new StreamSource(new File(xslt));
+                    try {
+                        this.templates = factory.newTemplates(xsltSource);
+                    } catch (TransformerConfigurationException tce) {
+                        throw new ConfigurationException("Invalid XSLT", tce);
+                    }
                 }
             }
         }
@@ -249,9 +251,9 @@ public class FOPTestbed extends Abstract
 
         private TaskDef def;
         private int num;
-        private FOProcessor fop;
+        private Processor fop;
 
-        public Task(TaskDef def, int num, FOProcessor fop) {
+        public Task(TaskDef def, int num, Processor fop) {
             this.def = def;
             this.num = num;
             this.fop = fop;

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/FOProcessorImpl.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/FOProcessorImpl.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/FOProcessorImpl.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/FOProcessorImpl.java
Wed Aug 25 16:49:26 2010
@@ -43,16 +43,12 @@ import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.events.Event;
-import org.apache.fop.events.EventFormatter;
-import org.apache.fop.events.EventListener;
-import org.apache.fop.events.model.EventSeverity;
 
 /**
- * Default implementation of the FOProcessor interface using FOP.
+ * Default implementation of the {@link Processor} interface using FOP.
  */
 public class FOProcessorImpl extends AbstractLogEnabled
-            implements FOProcessor, Configurable, Initializable {
+            implements Processor, Configurable, Initializable {
 
     private FopFactory fopFactory = FopFactory.newInstance();
     private TransformerFactory factory = TransformerFactory.newInstance();
@@ -83,7 +79,8 @@ public class FOProcessorImpl extends Abs
         try {
             URL url = new URL(src.getSystemId());
             String filename = FilenameUtils.getName(url.getPath());
-            foUserAgent.getEventBroadcaster().addEventListener(new AvalonAdapter(filename));
+            foUserAgent.getEventBroadcaster().addEventListener(
+                    new AvalonAdapter(getLogger(), filename));
         } catch (MalformedURLException mfue) {
             throw new RuntimeException(mfue);
         }
@@ -107,30 +104,4 @@ public class FOProcessorImpl extends Abs
     public String getTargetFileExtension() {
         return this.fileExtension;
     }
-
-    private class AvalonAdapter implements EventListener {
-
-        private String filename;
-
-        public AvalonAdapter(String filename) {
-            this.filename = filename;
-        }
-
-        public void processEvent(Event event) {
-            String msg = EventFormatter.format(event);
-            EventSeverity severity = event.getSeverity();
-            if (severity == EventSeverity.INFO) {
-                //getLogger().info(filename + ": " + msg);
-            } else if (severity == EventSeverity.WARN) {
-                //getLogger().warn(filename + ": "  + msg);
-            } else if (severity == EventSeverity.ERROR) {
-                getLogger().error(filename + ": "  + msg);
-            } else if (severity == EventSeverity.FATAL) {
-                getLogger().fatalError(filename + ": "  + msg);
-            } else {
-                assert false;
-            }
-        }
-
-    }
 }
\ No newline at end of file

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/sample.cfg.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/sample.cfg.xml?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/sample.cfg.xml
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/threading/sample.cfg.xml
Wed Aug 25 16:49:26 2010
@@ -2,13 +2,13 @@
 <config prompt="false">
   <threads>2</threads>
   <output-dir>C:/Dev/FOP/temp/out</output-dir>
-  <foprocessor class="org.apache.fop.threading.FOProcessorImpl">
+  <processor class="org.apache.fop.threading.FOProcessorImpl">
     <!--
     <userconfig>C:/Dev/FOP/temp/userconfig.xml</userconfig>
     -->
     <mime>application/pdf</mime>
     <extension>.pdf</extension>
-  </foprocessor>
+  </processor>
   <tasks repeat="2">
     <task fo="C:/Dev/FOP/temp/helloworld.fo"/>
     <task xml="C:/Dev/FOP/temp/page-x-of-y.xml" xslt="C:/Dev/FOP/temp/page-x-of-y.xsl"/>

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/traits/BorderPropsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/traits/BorderPropsTestCase.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/traits/BorderPropsTestCase.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/traits/BorderPropsTestCase.java
Wed Aug 25 16:49:26 2010
@@ -23,10 +23,10 @@ import java.awt.Color;
 
 import junit.framework.TestCase;
 
-import org.apache.xmlgraphics.java2d.color.CMYKColorSpace;
-import org.apache.xmlgraphics.java2d.color.ColorExt;
+import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
 
 import org.apache.fop.fo.Constants;
+import org.apache.fop.util.ColorExt;
 import org.apache.fop.util.ColorUtil;
 
 /**
@@ -50,7 +50,7 @@ public class BorderPropsTestCase extends
         assertEquals(b1, b2);
 
         float[] cmyk = new float[] {1.0f, 1.0f, 0.5f, 1.0f};
-        CMYKColorSpace cmykCs = CMYKColorSpace.getInstance();
+        DeviceCMYKColorSpace cmykCs = DeviceCMYKColorSpace.getInstance();
         float[] rgb = cmykCs.toRGB(cmyk);
         col = ColorExt.createFromFoRgbIcc(rgb[0], rgb[1], rgb[2],
                 "#CMYK", null, cmykCs, cmyk);

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/util/ColorUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/util/ColorUtilTestCase.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/util/ColorUtilTestCase.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/util/ColorUtilTestCase.java
Wed Aug 25 16:49:26 2010
@@ -24,8 +24,7 @@ import java.awt.color.ColorSpace;
 
 import junit.framework.TestCase;
 
-import org.apache.xmlgraphics.java2d.color.CMYKColorSpace;
-import org.apache.xmlgraphics.java2d.color.ColorExt;
+import org.apache.xmlgraphics.java2d.color.DeviceCMYKColorSpace;
 
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.FopFactory;
@@ -157,7 +156,7 @@ public class ColorUtilTestCase extends T
         assertEquals(255, colActual.getRed());
         assertEquals(255, colActual.getGreen());
         assertEquals(0, colActual.getBlue());
-        assertEquals(CMYKColorSpace.getInstance(), colActual.getColorSpace());
+        assertEquals(DeviceCMYKColorSpace.getInstance(), colActual.getColorSpace());
         float[] comps = colActual.getColorComponents(null);
         assertEquals(4, comps.length);
         assertEquals(0f, comps[0], 0);
@@ -172,7 +171,7 @@ public class ColorUtilTestCase extends T
         assertEquals(248, colActual.getRed());
         assertEquals(199, colActual.getGreen());
         assertEquals(172, colActual.getBlue());
-        assertEquals(CMYKColorSpace.getInstance(), colActual.getColorSpace());
+        assertEquals(DeviceCMYKColorSpace.getInstance(), colActual.getColorSpace());
         comps = colActual.getColorComponents(null);
         assertEquals(0.0274f, comps[0], 0.001);
         assertEquals(0.2196f, comps[1], 0.001);
@@ -186,7 +185,7 @@ public class ColorUtilTestCase extends T
         assertEquals(255, colActual.getRed());
         assertEquals(255, colActual.getGreen());
         assertEquals(0, colActual.getBlue());
-        assertEquals(CMYKColorSpace.getInstance(), colActual.getColorSpace());
+        assertEquals(DeviceCMYKColorSpace.getInstance(), colActual.getColorSpace());
         comps = colActual.getColorComponents(null);
         assertEquals(4, comps.length);
         assertEquals(0f, comps[0], 0);
@@ -201,7 +200,7 @@ public class ColorUtilTestCase extends T
         assertEquals(127, colActual.getRed());
         assertEquals(127, colActual.getGreen());
         assertEquals(127, colActual.getBlue());
-        assertEquals(CMYKColorSpace.getInstance(), colActual.getColorSpace());
+        assertEquals(DeviceCMYKColorSpace.getInstance(), colActual.getColorSpace());
         comps = colActual.getColorComponents(null);
         assertEquals(4, comps.length);
         assertEquals(0f, comps[0], 0);

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/util/DigestFilter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/util/DigestFilter.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/util/DigestFilter.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/util/DigestFilter.java
Wed Aug 25 16:49:26 2010
@@ -43,7 +43,7 @@ import org.xml.sax.helpers.XMLFilterImpl
 public class DigestFilter extends XMLFilterImpl {
 
     private MessageDigest digest;
-    private byte value[];
+    private byte[] value;
     private boolean isNamespaceAware;
 
     public DigestFilter(String algorithm) throws NoSuchAlgorithmException {
@@ -133,7 +133,7 @@ public class DigestFilter extends XMLFil
      */
     public void setFeature(String feature, boolean value)
         throws SAXNotRecognizedException, SAXNotSupportedException {
-        if(feature.equals("http://xml.org/sax/features/namespaces")) {
+        if (feature.equals("http://xml.org/sax/features/namespaces")) {
             isNamespaceAware = value;
         }
         super.setFeature(feature, value);

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
Wed Aug 25 16:49:26 2010
@@ -122,7 +122,7 @@ public abstract class AbstractPSPDFBitma
         try {
             FOUserAgent userAgent = fopFactory.newFOUserAgent();
             userAgent.setTargetResolution(context.getTargetResolution());
-            userAgent.setBaseURL(src.getParentFile().toURL().toString());
+            userAgent.setBaseURL(src.getParentFile().toURI().toURL().toString());
 
             File tempOut = new File(context.getTargetDir(),
                     src.getName() + "." + index + "." + getTargetExtension());

Modified: xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/visual/BitmapProducerJava2D.java?rev=989216&r1=989215&r2=989216&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
(original)
+++ xmlgraphics/fop/branches/Temp_TrueTypeInPostScript/test/java/org/apache/fop/visual/BitmapProducerJava2D.java
Wed Aug 25 16:49:26 2010
@@ -70,7 +70,7 @@ public class BitmapProducerJava2D extend
         try {
             FOUserAgent userAgent = fopFactory.newFOUserAgent();
             userAgent.setTargetResolution(context.getTargetResolution());
-            userAgent.setBaseURL(src.getParentFile().toURL().toString());
+            userAgent.setBaseURL(src.getParentFile().toURI().toURL().toString());
 
             File outputFile = new File(context.getTargetDir(),
                     src.getName() + "." + index + ".java2d.png");



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message