Index: src/java/org/apache/fop/render/rtf/FoUnitsConverter.java =================================================================== --- src/java/org/apache/fop/render/rtf/FoUnitsConverter.java (revision 982045) +++ src/java/org/apache/fop/render/rtf/FoUnitsConverter.java (working copy) @@ -24,6 +24,7 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.fo.properties.FixedLength; +import org.apache.xmlgraphics.util.UnitConv; /** Converts XSL-FO units to RTF units @@ -43,8 +44,8 @@ public static final float POINT_TO_TWIPS = 20f; /** millimeters and centimeters to twips: , one point is 1/72 of an inch, one inch is 25.4 mm */ - public static final float IN_TO_TWIPS = 72f * POINT_TO_TWIPS; - public static final float MM_TO_TWIPS = IN_TO_TWIPS / 25.4f; + public static final float IN_TO_TWIPS = UnitConv.IN2PT * POINT_TO_TWIPS; + public static final float MM_TO_TWIPS = IN_TO_TWIPS / UnitConv.IN2MM; public static final float CM_TO_TWIPS = 10 * MM_TO_TWIPS; Index: src/java/org/apache/fop/render/awt/AWTRenderer.java =================================================================== --- src/java/org/apache/fop/render/awt/AWTRenderer.java (revision 982045) +++ src/java/org/apache/fop/render/awt/AWTRenderer.java (working copy) @@ -29,8 +29,8 @@ // Java import java.awt.Color; import java.awt.Dimension; +import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; -import java.awt.geom.Point2D; import java.awt.print.PageFormat; import java.awt.print.Pageable; import java.awt.print.Paper; @@ -46,8 +46,9 @@ import org.apache.fop.render.awt.viewer.PreviewDialog; import org.apache.fop.render.awt.viewer.Renderable; import org.apache.fop.render.awt.viewer.StatusListener; +import org.apache.fop.render.extensions.prepress.PageScale; import org.apache.fop.render.java2d.Java2DRenderer; -import org.apache.fop.render.extensions.prepress.PageScale; +import org.apache.xmlgraphics.util.UnitConv; /** * The AWTRender outputs the pages generated by the layout engine to a Swing @@ -152,10 +153,10 @@ pageWidth = (int) Math.round(bounds.getWidth() / 1000f); pageHeight = (int) Math.round(bounds.getHeight() / 1000f); double scaleX = scaleFactor - * (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) + * (UnitConv.IN2MM / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) / userAgent.getTargetPixelUnitToMillimeter(); double scaleY = scaleFactor - * (25.4 / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) + * (UnitConv.IN2MM / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) / userAgent.getTargetPixelUnitToMillimeter(); if (getPageViewport(pageNum).getForeignAttributes() != null) { String scale = (String) getPageViewport(pageNum).getForeignAttributes().get( Index: src/java/org/apache/fop/render/AbstractImageHandlerGraphics2D.java =================================================================== --- src/java/org/apache/fop/render/AbstractImageHandlerGraphics2D.java (revision 982045) +++ src/java/org/apache/fop/render/AbstractImageHandlerGraphics2D.java (working copy) @@ -34,8 +34,9 @@ import java.awt.image.Raster; import java.awt.image.WritableRaster; -import org.apache.fop.util.UnitConv; +import org.apache.xmlgraphics.util.UnitConv; + /** * Abstract base class for ImageHandler implementations that process Java2D images through * the Graphics2DImagePainter interface. Index: src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java =================================================================== --- src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java (revision 982045) +++ src/java/org/apache/fop/render/java2d/Java2DImageHandlerRenderedImage.java (working copy) @@ -27,14 +27,14 @@ import java.awt.image.WritableRaster; import java.io.IOException; +import org.apache.fop.render.ImageHandler; +import org.apache.fop.render.RenderingContext; +import org.apache.xmlgraphics.image.GraphicsConstants; 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.impl.ImageRendered; -import org.apache.fop.render.ImageHandler; -import org.apache.fop.render.RenderingContext; - /** * Image handler implementation that paints {@link RenderedImage} instances on a {@link Graphics2D} * object. @@ -76,7 +76,7 @@ //scaling because of image resolution //float sourceResolution = java2dContext.getUserAgent().getSourceResolution(); //source resolution seems to be a bad idea, not sure why - float sourceResolution = 72; + float sourceResolution = GraphicsConstants.DEFAULT_DPI; sourceResolution *= 1000; //we're working in the millipoint area sx *= sourceResolution / info.getSize().getDpiHorizontal(); sy *= sourceResolution / info.getSize().getDpiVertical(); Index: src/java/org/apache/fop/render/java2d/Java2DRenderer.java =================================================================== --- src/java/org/apache/fop/render/java2d/Java2DRenderer.java (revision 982045) +++ src/java/org/apache/fop/render/java2d/Java2DRenderer.java (working copy) @@ -44,16 +44,6 @@ import java.util.Map; import java.util.Stack; -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.ImageRendered; -import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM; -import org.apache.xmlgraphics.image.loader.util.ImageUtil; - import org.apache.fop.ResourceEventProducer; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; @@ -81,6 +71,16 @@ import org.apache.fop.render.pdf.CTMHelper; import org.apache.fop.util.CharUtilities; import org.apache.fop.util.ColorUtil; +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.ImageRendered; +import org.apache.xmlgraphics.image.loader.impl.ImageXMLDOM; +import org.apache.xmlgraphics.image.loader.util.ImageUtil; +import org.apache.xmlgraphics.util.UnitConv; /** * The Java2DRenderer class provides the abstract technical @@ -317,10 +317,10 @@ } scaleX = scaleX - * (25.4f / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) + * (UnitConv.IN2MM / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) / userAgent.getTargetPixelUnitToMillimeter(); scaleY = scaleY - * (25.4f / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) + * (UnitConv.IN2MM / FopFactoryConfigurator.DEFAULT_TARGET_RESOLUTION) / userAgent.getTargetPixelUnitToMillimeter(); int bitmapWidth = (int) ((pageWidth * scaleX) + 0.5); int bitmapHeight = (int) ((pageHeight * scaleY) + 0.5); Index: src/java/org/apache/fop/render/pdf/PDFRenderer.java =================================================================== --- src/java/org/apache/fop/render/pdf/PDFRenderer.java (revision 982045) +++ src/java/org/apache/fop/render/pdf/PDFRenderer.java (working copy) @@ -34,16 +34,6 @@ import java.util.Locale; import java.util.Map; -import org.w3c.dom.Document; -import org.w3c.dom.NodeList; - -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.util.ImageUtil; - import org.apache.fop.ResourceEventProducer; import org.apache.fop.apps.FOPException; import org.apache.fop.apps.FOUserAgent; @@ -100,9 +90,18 @@ import org.apache.fop.render.pdf.extensions.PDFEmbeddedFileExtensionAttachment; import org.apache.fop.traits.RuleStyle; import org.apache.fop.util.AbstractPaintingState; +import org.apache.fop.util.AbstractPaintingState.AbstractData; import org.apache.fop.util.CharUtilities; import org.apache.fop.util.XMLUtil; -import org.apache.fop.util.AbstractPaintingState.AbstractData; +import org.apache.xmlgraphics.image.GraphicsConstants; +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.util.ImageUtil; +import org.w3c.dom.Document; +import org.w3c.dom.NodeList; /** * Renderer that renders areas to PDF. @@ -113,7 +112,7 @@ public static final String MIME_TYPE = MimeConstants.MIME_PDF; /** Normal PDF resolution (72dpi) */ - public static final int NORMAL_PDF_RESOLUTION = 72; + public static final int NORMAL_PDF_RESOLUTION = GraphicsConstants.DEFAULT_DPI; /** Controls whether comments are written to the PDF stream. */ Index: src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java =================================================================== --- src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java (revision 982045) +++ src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java (working copy) @@ -72,7 +72,7 @@ } //Prepare - float pxToMillimeter = UnitConv.IN2MM / 72; //default: 72dpi + float pxToMillimeter = UnitConv.IN2MM / UnitConv.IN2PT; //default: 72dpi Number ptm = (Number)hints.get(ImageProcessingHints.SOURCE_RESOLUTION); if (ptm != null) { pxToMillimeter = (float)(UnitConv.IN2MM / ptm.doubleValue()); Index: src/java/org/apache/fop/svg/PDFGraphics2D.java =================================================================== --- src/java/org/apache/fop/svg/PDFGraphics2D.java (revision 982045) +++ src/java/org/apache/fop/svg/PDFGraphics2D.java (working copy) @@ -59,15 +59,6 @@ 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.ImageInfo; -import org.apache.xmlgraphics.image.loader.ImageSize; -import org.apache.xmlgraphics.image.loader.impl.ImageRawCCITTFax; -import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG; -import org.apache.xmlgraphics.image.loader.impl.ImageRendered; -import org.apache.xmlgraphics.java2d.AbstractGraphics2D; -import org.apache.xmlgraphics.java2d.GraphicContext; - import org.apache.fop.fonts.Font; import org.apache.fop.fonts.FontInfo; import org.apache.fop.fonts.FontSetup; @@ -92,6 +83,14 @@ import org.apache.fop.render.pdf.ImageRawJPEGAdapter; import org.apache.fop.render.pdf.ImageRenderedAdapter; import org.apache.fop.util.ColorExt; +import org.apache.xmlgraphics.image.GraphicsConstants; +import org.apache.xmlgraphics.image.loader.ImageInfo; +import org.apache.xmlgraphics.image.loader.ImageSize; +import org.apache.xmlgraphics.image.loader.impl.ImageRawCCITTFax; +import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG; +import org.apache.xmlgraphics.image.loader.impl.ImageRendered; +import org.apache.xmlgraphics.java2d.AbstractGraphics2D; +import org.apache.xmlgraphics.java2d.GraphicContext; /** * PDF Graphics 2D. @@ -1257,7 +1256,7 @@ private PDFXObject addRenderedImage(String key, RenderedImage img) { ImageInfo info = new ImageInfo(null, "image/unknown"); - ImageSize size = new ImageSize(img.getWidth(), img.getHeight(), 72); + ImageSize size = new ImageSize(img.getWidth(), img.getHeight(), GraphicsConstants.DEFAULT_DPI); info.setSize(size); ImageRendered imgRend = new ImageRendered(info, img, null); ImageRenderedAdapter adapter = new ImageRenderedAdapter(imgRend, key); Index: src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java =================================================================== --- src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java (revision 982045) +++ src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java (working copy) @@ -42,6 +42,7 @@ import org.apache.fop.pdf.PDFPaintingState; import org.apache.fop.pdf.PDFResources; import org.apache.fop.pdf.PDFStream; +import org.apache.xmlgraphics.image.GraphicsConstants; /** * This class is a wrapper for the {@link PDFGraphics2D} that @@ -62,9 +63,9 @@ private float svgHeight; /** Normal PDF resolution (72dpi) */ - public static final int NORMAL_PDF_RESOLUTION = 72; + public static final int NORMAL_PDF_RESOLUTION = GraphicsConstants.DEFAULT_DPI; /** Default device resolution (300dpi is a resonable quality for most purposes) */ - public static final int DEFAULT_NATIVE_DPI = 300; + public static final int DEFAULT_NATIVE_DPI = GraphicsConstants.DEFAULT_SAMPLE_DPI; /** * The device resolution may be different from the normal target resolution. See Index: src/java/org/apache/fop/svg/AbstractFOPTranscoder.java =================================================================== --- src/java/org/apache/fop/svg/AbstractFOPTranscoder.java (revision 982045) +++ src/java/org/apache/fop/svg/AbstractFOPTranscoder.java (working copy) @@ -25,10 +25,6 @@ import javax.xml.transform.Source; import javax.xml.transform.stream.StreamSource; -import org.w3c.dom.DOMImplementation; - -import org.xml.sax.EntityResolver; - import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; @@ -46,11 +42,14 @@ import org.apache.batik.util.SVGConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.impl.SimpleLog; - +import org.apache.xmlgraphics.image.GraphicsConstants; 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.xmlgraphics.util.UnitConv; +import org.w3c.dom.DOMImplementation; +import org.xml.sax.EntityResolver; /** * This is the common base class of all of FOP's transcoders. @@ -222,7 +221,7 @@ if (hints.containsKey(KEY_DEVICE_RESOLUTION)) { return ((Float)hints.get(KEY_DEVICE_RESOLUTION)).floatValue(); } else { - return 72; + return GraphicsConstants.DEFAULT_DPI; } } @@ -249,7 +248,7 @@ protected void setupImageInfrastructure(final String baseURI) { final ImageContext imageContext = new ImageContext() { public float getSourceResolution() { - return 25.4f / userAgent.getPixelUnitToMillimeter(); + return UnitConv.IN2MM / userAgent.getPixelUnitToMillimeter(); } }; this.imageManager = new ImageManager(imageContext); @@ -368,7 +367,7 @@ return ((Float)getTranscodingHints().get(key)).floatValue(); } else { // return 0.3528f; // 72 dpi - return 25.4f / 96; //96dpi = 0.2645833333333333333f; + return UnitConv.IN2MM / 96; //96dpi = 0.2645833333333333333f; } } Index: src/java/org/apache/fop/apps/FopFactoryConfigurator.java =================================================================== --- src/java/org/apache/fop/apps/FopFactoryConfigurator.java (revision 982045) +++ src/java/org/apache/fop/apps/FopFactoryConfigurator.java (working copy) @@ -23,20 +23,18 @@ import java.io.IOException; import java.net.MalformedURLException; -import org.xml.sax.SAXException; - import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry; -import org.apache.xmlgraphics.image.loader.util.Penalty; - import org.apache.fop.fonts.FontManager; import org.apache.fop.fonts.FontManagerConfigurator; import org.apache.fop.util.LogUtil; +import org.apache.xmlgraphics.image.GraphicsConstants; +import org.apache.xmlgraphics.image.loader.spi.ImageImplRegistry; +import org.apache.xmlgraphics.image.loader.util.Penalty; +import org.xml.sax.SAXException; /** * FopFactory configurator @@ -59,10 +57,10 @@ public static final String DEFAULT_PAGE_HEIGHT = "11in"; /** Defines the default source resolution (72dpi) for FOP */ - public static final float DEFAULT_SOURCE_RESOLUTION = 72.0f; //dpi + public static final float DEFAULT_SOURCE_RESOLUTION = GraphicsConstants.DEFAULT_DPI; //dpi /** Defines the default target resolution (72dpi) for FOP */ - public static final float DEFAULT_TARGET_RESOLUTION = 72.0f; //dpi + public static final float DEFAULT_TARGET_RESOLUTION = GraphicsConstants.DEFAULT_DPI; //dpi private static final String PREFER_RENDERER = "prefer-renderer"; Index: src/java/org/apache/fop/apps/FOUserAgent.java =================================================================== --- src/java/org/apache/fop/apps/FOUserAgent.java (revision 982045) +++ src/java/org/apache/fop/apps/FOUserAgent.java (working copy) @@ -31,11 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.apache.xmlgraphics.image.loader.ImageContext; -import org.apache.xmlgraphics.image.loader.ImageSessionContext; -import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext; - import org.apache.fop.Version; import org.apache.fop.accessibility.Accessibility; import org.apache.fop.accessibility.StructureTree; @@ -51,6 +46,10 @@ import org.apache.fop.render.RendererFactory; import org.apache.fop.render.XMLHandlerRegistry; import org.apache.fop.render.intermediate.IFDocumentHandler; +import org.apache.xmlgraphics.image.loader.ImageContext; +import org.apache.xmlgraphics.image.loader.ImageSessionContext; +import org.apache.xmlgraphics.image.loader.impl.AbstractImageSessionContext; +import org.apache.xmlgraphics.util.UnitConv; /** * This is the user agent for FOP. @@ -450,7 +449,7 @@ * @see #getTargetResolution() */ public float getTargetPixelUnitToMillimeter() { - return 25.4f / this.targetResolution; + return UnitConv.IN2MM / this.targetResolution; } /** @return the resolution for resolution-dependant output */ Index: src/java/org/apache/fop/apps/FopFactory.java =================================================================== --- src/java/org/apache/fop/apps/FopFactory.java (revision 982045) +++ src/java/org/apache/fop/apps/FopFactory.java (working copy) @@ -40,6 +40,7 @@ import org.apache.xmlgraphics.image.loader.ImageContext; import org.apache.xmlgraphics.image.loader.ImageManager; +import org.apache.xmlgraphics.util.UnitConv; import org.apache.fop.fo.ElementMapping; import org.apache.fop.fo.ElementMappingRegistry; @@ -515,7 +516,7 @@ * @see #getSourceResolution() */ public float getSourcePixelUnitToMillimeter() { - return 25.4f / getSourceResolution(); + return UnitConv.IN2MM / getSourceResolution(); } /** @@ -543,7 +544,7 @@ * @see #getTargetResolution() */ public float getTargetPixelUnitToMillimeter() { - return 25.4f / this.targetResolution; + return UnitConv.IN2MM / this.targetResolution; } /** Index: src/java/org/apache/fop/afp/AFPConstants.java =================================================================== --- src/java/org/apache/fop/afp/AFPConstants.java (revision 982045) +++ src/java/org/apache/fop/afp/AFPConstants.java (working copy) @@ -19,6 +19,8 @@ package org.apache.fop.afp; +import org.apache.xmlgraphics.image.GraphicsConstants; + /** * Constants used by the AFP renderer. * @@ -44,7 +46,7 @@ * The scaling of the default transform is set to * approximately 72 user space coordinates per square inch */ - int DPI_72 = 72; + int DPI_72 = GraphicsConstants.DEFAULT_DPI; /** * 72dpi in millipoints