Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFBridgeContext.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFBridgeContext.java?rev=605479&r1=605478&r2=605479&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFBridgeContext.java (original) +++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFBridgeContext.java Wed Dec 19 01:18:33 2007 @@ -27,9 +27,10 @@ import org.apache.batik.bridge.DocumentLoader; import org.apache.batik.bridge.UserAgent; +import org.apache.xmlgraphics.image.loader.ImageManager; +import org.apache.xmlgraphics.image.loader.ImageSessionContext; + import org.apache.fop.fonts.FontInfo; -import org.apache.fop.image2.ImageManager; -import org.apache.fop.image2.ImageSessionContext; /** * BridgeContext which registers the custom bridges for PDF output.
Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFGraphics2D.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFGraphics2D.java?rev=605479&r1=605478&r2=605479&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFGraphics2D.java (original) +++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFGraphics2D.java Wed Dec 19 01:18:33 2007 @@ -62,6 +62,8 @@ import org.apache.batik.ext.awt.RenderingHintsKeyExt; import org.apache.batik.gvt.GraphicsNode; import org.apache.batik.gvt.PatternPaint; + +import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG; import org.apache.xmlgraphics.java2d.AbstractGraphics2D; import org.apache.xmlgraphics.java2d.GraphicContext; @@ -71,7 +73,6 @@ import org.apache.fop.fonts.FontSetup; import org.apache.fop.fonts.FontTriplet; import org.apache.fop.fonts.LazyFont; -import org.apache.fop.image2.impl.ImageRawJPEG; import org.apache.fop.pdf.BitmapImage; import org.apache.fop.pdf.PDFAnnotList; import org.apache.fop.pdf.PDFColor; Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFImageElementBridge.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFImageElementBridge.java?rev=605479&r1=605478&r2=605479&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFImageElementBridge.java (original) +++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFImageElementBridge.java Wed Dec 19 01:18:33 2007 @@ -32,15 +32,15 @@ import org.apache.batik.gvt.GraphicsNode; import org.apache.batik.util.ParsedURL; -import org.apache.fop.image2.Image; -import org.apache.fop.image2.ImageException; -import org.apache.fop.image2.ImageFlavor; -import org.apache.fop.image2.ImageInfo; -import org.apache.fop.image2.ImageManager; -import org.apache.fop.image2.ImageSessionContext; -import org.apache.fop.image2.impl.ImageGraphics2D; -import org.apache.fop.image2.impl.ImageRawJPEG; -import org.apache.fop.image2.impl.ImageXMLDOM; +import org.apache.xmlgraphics.image.loader.Image; +import org.apache.xmlgraphics.image.loader.ImageException; +import org.apache.xmlgraphics.image.loader.ImageFlavor; +import org.apache.xmlgraphics.image.loader.ImageInfo; +import org.apache.xmlgraphics.image.loader.ImageManager; +import org.apache.xmlgraphics.image.loader.ImageSessionContext; +import org.apache.xmlgraphics.image.loader.impl.ImageGraphics2D; +import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG; +import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM; /** * Bridge class for the <image> element when jpeg images. Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFTranscoder.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFTranscoder.java?rev=605479&r1=605478&r2=605479&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFTranscoder.java (original) +++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/src/java/org/apache/fop/svg/PDFTranscoder.java Wed Dec 19 01:18:33 2007 @@ -45,12 +45,13 @@ import org.apache.batik.transcoder.keys.FloatKey; import org.apache.batik.util.ParsedURL; +import org.apache.xmlgraphics.image.loader.ImageContext; +import org.apache.xmlgraphics.image.loader.ImageManager; +import org.apache.xmlgraphics.image.loader.ImageSessionContext; +import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext; + import org.apache.fop.Version; import org.apache.fop.fonts.FontInfo; -import org.apache.fop.image2.ImageContext; -import org.apache.fop.image2.ImageManager; -import org.apache.fop.image2.ImageSessionContext; -import org.apache.fop.image2.impl.AbstractImageSessionContext; /** * This class enables to transcode an input to a pdf document. Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImageLoaderTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImageLoaderTestCase.java?rev=605479&r1=605478&r2=605479&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImageLoaderTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImageLoaderTestCase.java Wed Dec 19 01:18:33 2007 @@ -20,20 +20,19 @@ package org.apache.fop.image2; import java.io.File; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; import junit.framework.TestCase; -import org.apache.commons.io.IOUtils; +import org.apache.xmlgraphics.image.loader.Image; +import org.apache.xmlgraphics.image.loader.ImageFlavor; +import org.apache.xmlgraphics.image.loader.ImageInfo; +import org.apache.xmlgraphics.image.loader.ImageManager; +import org.apache.xmlgraphics.image.loader.impl.ImageRendered; +import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM; import org.apache.xmlgraphics.image.writer.ImageWriterUtil; import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.FopFactory; -import org.apache.fop.image2.impl.ImageRawStream; -import org.apache.fop.image2.impl.ImageRendered; -import org.apache.fop.image2.impl.ImageXMLDOM; /** * Tests for bundled ImageLoader implementations. @@ -51,50 +50,6 @@ fopFactory.setTargetResolution(300); } - public void testPNG() throws Exception { - String uri = "examples/fo/graphics/asf-logo.png"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - - Image img = manager.getImage(info, ImageFlavor.RENDERED_IMAGE, - userAgent.getImageSessionContext()); - assertNotNull("Image must not be null", img); - assertEquals(ImageFlavor.RENDERED_IMAGE, img.getFlavor()); - ImageRendered imgRed = (ImageRendered)img; - assertNotNull(imgRed.getRenderedImage()); - assertEquals(169, imgRed.getRenderedImage().getWidth()); - assertEquals(51, imgRed.getRenderedImage().getHeight()); - info = imgRed.getInfo(); //Switch to the ImageInfo returned by the image - assertEquals(126734, info.getSize().getWidthMpt()); - assertEquals(38245, info.getSize().getHeightMpt()); - } - - public void testGIF() throws Exception { - String uri = "test/resources/images/bgimg72dpi.gif"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - - Image img = manager.getImage(info, ImageFlavor.RENDERED_IMAGE, - userAgent.getImageSessionContext()); - assertNotNull("Image must not be null", img); - assertEquals(ImageFlavor.RENDERED_IMAGE, img.getFlavor()); - ImageRendered imgRed = (ImageRendered)img; - assertNotNull(imgRed.getRenderedImage()); - assertEquals(192, imgRed.getRenderedImage().getWidth()); - assertEquals(192, imgRed.getRenderedImage().getHeight()); - info = imgRed.getInfo(); //Switch to the ImageInfo returned by the image - assertEquals(192000, info.getSize().getWidthMpt()); - assertEquals(192000, info.getSize().getHeightMpt()); - } - public void testSVG() throws Exception { String uri = "test/resources/images/img-w-size.svg"; @@ -158,62 +113,6 @@ info = imgRed.getInfo(); //Switch to the ImageInfo returned by the image assertEquals(792000, info.getSize().getWidthMpt()); assertEquals(612000, info.getSize().getHeightMpt()); - } - - public void testEPSASCII() throws Exception { - String uri = "test/resources/images/barcode.eps"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - - Image img = manager.getImage(info, ImageFlavor.RAW_EPS, - userAgent.getImageSessionContext()); - assertNotNull("Image must not be null", img); - assertEquals(ImageFlavor.RAW_EPS, img.getFlavor()); - ImageRawStream imgEPS = (ImageRawStream)img; - InputStream in = imgEPS.createInputStream(); - try { - assertNotNull(in); - Reader reader = new InputStreamReader(in, "US-ASCII"); - char[] c = new char[4]; - reader.read(c); - if (!("%!PS".equals(new String(c)))) { - fail("EPS header expected"); - } - } finally { - IOUtils.closeQuietly(in); - } - } - - public void testEPSBinary() throws Exception { - String uri = "test/resources/images/img-with-tiff-preview.eps"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - - Image img = manager.getImage(info, ImageFlavor.RAW_EPS, - userAgent.getImageSessionContext()); - assertNotNull("Image must not be null", img); - assertEquals(ImageFlavor.RAW_EPS, img.getFlavor()); - ImageRawStream imgEPS = (ImageRawStream)img; - InputStream in = imgEPS.createInputStream(); - try { - assertNotNull(in); - Reader reader = new InputStreamReader(in, "US-ASCII"); - char[] c = new char[4]; - reader.read(c); - if (!("%!PS".equals(new String(c)))) { - fail("EPS header expected"); - } - } finally { - IOUtils.closeQuietly(in); - } } } Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImagePreloaderTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImagePreloaderTestCase.java?rev=605479&r1=605478&r2=605479&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImagePreloaderTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/image2/ImagePreloaderTestCase.java Wed Dec 19 01:18:33 2007 @@ -19,19 +19,21 @@ package org.apache.fop.image2; -import java.io.FileNotFoundException; import java.io.IOException; import junit.framework.TestCase; +import org.apache.xmlgraphics.image.loader.ImageException; +import org.apache.xmlgraphics.image.loader.ImageInfo; +import org.apache.xmlgraphics.image.loader.ImageManager; + import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.FopFactory; import org.apache.fop.apps.MimeConstants; import org.apache.fop.image2.impl.batik.ImageWMF; -import org.apache.fop.image2.spi.ImageLoaderFactory; /** - * Tests for bundled Imagepreloader implementations. + * Tests for bundled image preloader implementations. */ public class ImagePreloaderTestCase extends TestCase { @@ -44,95 +46,6 @@ fopFactory.setTargetResolution(300); } - public void testImageLoaderFactory() throws Exception { - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = new ImageInfo(null, MimeConstants.MIME_PNG); - ImageLoaderFactory ilf = manager.getRegistry().getImageLoaderFactory( - info, ImageFlavor.BUFFERED_IMAGE); - assertNotNull(ilf); - } - - public void testFileNotFound() throws Exception { - String uri = "doesnotexistanywhere.png"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - ImageManager manager = fopFactory.getImageManager(); - try { - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - fail("Expected a FileNotFoundException!"); - } catch (FileNotFoundException e) { - //expected! - } - } - - public void testPNG() throws Exception { - String uri = "examples/fo/graphics/asf-logo.png"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals(MimeConstants.MIME_PNG, info.getMimeType()); - assertEquals("examples/fo/graphics/asf-logo.png", info.getOriginalURI()); - assertEquals(169, info.getSize().getWidthPx()); - assertEquals(51, info.getSize().getHeightPx()); - assertEquals(96, info.getSize().getDpiHorizontal(), 0.1); - assertEquals(126734, info.getSize().getWidthMpt()); - assertEquals(38245, info.getSize().getHeightMpt()); - } - - public void testTIFF() throws Exception { - String uri = "test/resources/images/tiff_group4.tif"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals(MimeConstants.MIME_TIFF, info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(1560, info.getSize().getWidthPx()); - assertEquals(189, info.getSize().getHeightPx()); - assertEquals(204, info.getSize().getDpiHorizontal(), 0.1); - assertEquals(550588, info.getSize().getWidthMpt()); - assertEquals(66706, info.getSize().getHeightMpt()); - } - - public void testTIFFNoResolution() throws Exception { - String uri = "test/resources/images/no-resolution.tif"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals(MimeConstants.MIME_TIFF, info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(51, info.getSize().getWidthPx()); - assertEquals(24, info.getSize().getHeightPx()); - assertEquals(userAgent.getSourceResolution(), info.getSize().getDpiHorizontal(), 0.1); - assertEquals(51000, info.getSize().getWidthMpt()); - assertEquals(24000, info.getSize().getHeightMpt()); - } - - public void testGIF() throws Exception { - String uri = "test/resources/images/bgimg72dpi.gif"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals(MimeConstants.MIME_GIF, info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(192, info.getSize().getWidthPx()); - assertEquals(192, info.getSize().getHeightPx()); - assertEquals(userAgent.getSourceResolution(), info.getSize().getDpiHorizontal(), 0.1); - assertEquals(192000, info.getSize().getWidthMpt()); - assertEquals(192000, info.getSize().getHeightMpt()); - } - public void testSVG() throws Exception { String uri = "test/resources/images/img-w-size.svg"; @@ -191,125 +104,6 @@ assertEquals(2540, info.getSize().getDpiHorizontal(), 0.1); assertEquals(792000, info.getSize().getWidthMpt()); assertEquals(612000, info.getSize().getHeightMpt()); - } - - public void testEMF() throws Exception { - String uri = "test/resources/images/img.emf"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals("image/emf", info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(76, info.getSize().getWidthPx()); - assertEquals(76, info.getSize().getHeightPx()); - assertEquals(96, info.getSize().getDpiHorizontal(), 1.0); - assertEquals(56665, info.getSize().getWidthMpt()); - assertEquals(56665, info.getSize().getHeightMpt()); - } - - public void testJPEG1() throws Exception { - String uri = "test/resources/images/bgimg300dpi.jpg"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals(MimeConstants.MIME_JPEG, info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(192, info.getSize().getWidthPx()); - assertEquals(192, info.getSize().getHeightPx()); - assertEquals(300, info.getSize().getDpiHorizontal(), 0.1); - assertEquals(46080, info.getSize().getWidthMpt()); - assertEquals(46080, info.getSize().getHeightMpt()); - } - - public void testJPEG2() throws Exception { - String uri = "test/resources/images/cmyk.jpg"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals(MimeConstants.MIME_JPEG, info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(160, info.getSize().getWidthPx()); - assertEquals(35, info.getSize().getHeightPx()); - assertEquals(72, info.getSize().getDpiHorizontal(), 0.1); - assertEquals(160000, info.getSize().getWidthMpt()); - assertEquals(35000, info.getSize().getHeightMpt()); - } - - public void testBMP() throws Exception { - String uri = "test/resources/images/bgimg300dpi.bmp"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals("image/bmp", info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(192, info.getSize().getWidthPx()); - assertEquals(192, info.getSize().getHeightPx()); - assertEquals(300, info.getSize().getDpiHorizontal(), 0.1); - assertEquals(46092, info.getSize().getWidthMpt()); - assertEquals(46092, info.getSize().getHeightMpt()); - } - - public void testBMPNoResolution() throws Exception { - String uri = "test/resources/images/no-resolution.bmp"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals("image/bmp", info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(50, info.getSize().getWidthPx()); - assertEquals(50, info.getSize().getHeightPx()); - assertEquals(userAgent.getSourceResolution(), info.getSize().getDpiHorizontal(), 0.1); - assertEquals(50000, info.getSize().getWidthMpt()); - assertEquals(50000, info.getSize().getHeightMpt()); - } - - public void testEPSAscii() throws Exception { - String uri = "test/resources/images/barcode.eps"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals(MimeConstants.MIME_EPS, info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(136, info.getSize().getWidthPx()); - assertEquals(43, info.getSize().getHeightPx()); - assertEquals(userAgent.getSourceResolution(), info.getSize().getDpiHorizontal(), 0.1); - assertEquals(135655, info.getSize().getWidthMpt()); - assertEquals(42525, info.getSize().getHeightMpt()); - } - - public void testEPSBinary() throws Exception { - String uri = "test/resources/images/img-with-tiff-preview.eps"; - - FOUserAgent userAgent = fopFactory.newFOUserAgent(); - - ImageManager manager = fopFactory.getImageManager(); - ImageInfo info = manager.preloadImage(uri, userAgent.getImageSessionContext()); - assertNotNull("ImageInfo must not be null", info); - assertEquals(MimeConstants.MIME_EPS, info.getMimeType()); - assertEquals(uri, info.getOriginalURI()); - assertEquals(17, info.getSize().getWidthPx()); - assertEquals(17, info.getSize().getHeightPx()); - assertEquals(userAgent.getSourceResolution(), info.getSize().getDpiHorizontal(), 0.1); - assertEquals(17000, info.getSize().getWidthMpt()); - assertEquals(17000, info.getSize().getHeightMpt()); } } Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/memory/MemoryEater.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/memory/MemoryEater.java?rev=605479&r1=605478&r2=605479&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/memory/MemoryEater.java (original) +++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/memory/MemoryEater.java Wed Dec 19 01:18:33 2007 @@ -36,6 +36,7 @@ import org.apache.commons.io.output.NullOutputStream; +import org.apache.fop.apps.FOUserAgent; import org.apache.fop.apps.Fop; import org.apache.fop.apps.FopFactory; import org.apache.fop.apps.MimeConstants; @@ -54,6 +55,8 @@ File xsltFile = new File("test/xsl/fo-replicator.xsl"); Source xslt = new StreamSource(xsltFile); replicatorTemplates = tFactory.newTemplates(xslt); + + //fopFactory.setBaseURL("C:/Dev/FOP/testing/xslt-1.0-book"); } private void eatMemory(File foFile, int replicatorRepeats) throws Exception { @@ -63,7 +66,9 @@ transformer.setParameter("repeats", new Integer(replicatorRepeats)); OutputStream out = new NullOutputStream(); //write to /dev/nul - Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out); + FOUserAgent userAgent = fopFactory.newFOUserAgent(); + userAgent.setBaseURL(foFile.getParentFile().toURL().toExternalForm()); + Fop fop = fopFactory.newFop(MimeConstants.MIME_POSTSCRIPT, out); Result res = new SAXResult(fop.getDefaultHandler()); transformer.transform(src, res); @@ -94,6 +99,7 @@ runRepeats = Integer.parseInt(args[1]); } File testFile = new File("examples/fo/basic/readme.fo"); + testFile = new File("C:/Dev/FOP/temp/image-cache-test.fo"); System.out.println("MemoryEater! About to replicate the test file " + replicatorRepeats + " times and run it " + runRepeats + " times..."); Modified: xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/threading/FOProcessorImpl.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/threading/FOProcessorImpl.java?rev=605479&r1=605478&r2=605479&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/threading/FOProcessorImpl.java (original) +++ xmlgraphics/fop/branches/Temp_ImagePackageRedesign/test/java/org/apache/fop/threading/FOProcessorImpl.java Wed Dec 19 01:18:33 2007 @@ -42,8 +42,6 @@ import org.apache.fop.apps.Fop; import org.apache.fop.apps.FopFactory; import org.apache.fop.apps.MimeConstants; -import org.apache.fop.image2.cache.ImageCacheLoggingStatistics; -import org.apache.fop.image2.cache.ImageCacheStatistics; /** * Default implementation of the FOProcessor interface using FOP. @@ -70,8 +68,6 @@ getLogger().debug("Setting user config: " + userconfig); fopFactory.setUserConfig(this.userconfig); } - ImageCacheStatistics stats = new ImageCacheLoggingStatistics(true); - fopFactory.getImageManager().getCache().setCacheListener(stats); } /** [EMAIL PROTECTED] */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
