Adds Mark Lillywhite's performance and memory patch in all it's glory.

Unfortunately breaks marker support.
(AreaTree getNextPage and getPreviousPage return the current page)
XSL-FO with markers is not a good idea until it is fixed.


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

1 files changed, 5 insertions, 4 deletions

diff --git a/src/org/apache/fop/tools/TestConverter.java b/src/org/apache/fop/tools/TestConverter.java
index 3f4538d32..0e91530c3 100644
--- a/src/org/apache/fop/tools/TestConverter.java
+++ b/src/org/apache/fop/tools/TestConverter.java
@@ -30,6 +30,9 @@ import org.xml.sax.SAXParseException;
  * The area tree can be used for automatic comparisons between different
  * versions of FOP or the pdf can be view for manual checking and
  * pdf rendering.
+ *
+ * Modified by Mark Lillywhite mark-fop@inomial.com to use the new Driver
+ * interface.
  */
 public class TestConverter {
     boolean failOnly = false;
@@ -221,9 +224,7 @@ public class TestConverter {
             rendererOptions.put("fineDetail", new Boolean(false));
             driver.getRenderer().setOptions(rendererOptions);
             driver.getRenderer().setProducer("Testsuite Converter");
-
-            driver.buildFOTree(parser, inputHandler.getInputSource());
-            driver.format();
+            
             String outname = xmlFile.getName();
             if (outname.endsWith(".xml")) {
                 outname = outname.substring(0, outname.length() - 4);
@@ -231,7 +232,7 @@ public class TestConverter {
             driver.setOutputStream(new FileOutputStream(new File(destdir,
                     outname + (outputPDF ? ".pdf" : ".at.xml"))));
             // System.out.println("ddir:" + destdir + " on:" + outname + ".pdf");
-            driver.render();
+            driver.render(parser, inputHandler.getInputSource());
 
             // check difference
             if (compare != null) {