Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFPainter.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 3 16:28:21 2009 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFPainter.java:680381-735028 +/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFPainter.java:680381-740275
Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/IFRenderer.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 3 16:28:21 2009 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java:680381-735028 +/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java:680381-740275 Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 3 16:28:21 2009 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java:685127-735028 +/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationExtensionConstants.java:685127-740275 Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 3 16:28:21 2009 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java:699793-735028 +/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandler.java:699793-740275 Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 3 16:28:21 2009 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java:699793-735028 +/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLDocumentHandlerMaker.java:699793-740275 Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLGenerator.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLGenerator.java?rev=740340&r1=740339&r2=740340&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLGenerator.java (original) +++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLGenerator.java Tue Feb 3 16:28:21 2009 @@ -47,7 +47,8 @@ import org.apache.xmlgraphics.image.GraphicsUtil; import org.apache.xmlgraphics.util.UnitConv; -import org.apache.fop.util.BitmapImageUtil; +import org.apache.fop.util.bitmap.BitmapImageUtil; +import org.apache.fop.util.bitmap.MonochromeBitmapConverter; /** * This class provides methods for generating PCL print files. @@ -610,7 +611,7 @@ public static boolean isJAIAvailable() { if (jaiAvailable < 0) { try { - String clName = "org.apache.fop.render.pcl.JAIMonochromeBitmapConverter"; + String clName = "javax.media.jai.JAI"; Class.forName(clName); jaiAvailable = 1; } catch (ClassNotFoundException cnfe) { @@ -620,31 +621,6 @@ return (jaiAvailable > 0); } - private MonochromeBitmapConverter createMonochromeBitmapConverter() { - MonochromeBitmapConverter converter = null; - try { - String clName = "org.apache.fop.render.pcl.JAIMonochromeBitmapConverter"; - Class clazz = Class.forName(clName); - converter = (MonochromeBitmapConverter)clazz.newInstance(); - } catch (ClassNotFoundException cnfe) { - // Class was not compiled so is not available. Simply ignore. - } catch (LinkageError le) { - // This can happen if fop was build with support for a - // particular provider (e.g. a binary fop distribution) - // but the required support files (i.e. JAI) are not - // available in the current runtime environment. - // Simply continue with the backup implementation. - } catch (InstantiationException e) { - // Problem instantiating the class, simply continue with the backup implementation - } catch (IllegalAccessException e) { - // Problem instantiating the class, simply continue with the backup implementation - } - if (converter == null) { - converter = new DefaultMonochromeBitmapConverter(); - } - return converter; - } - private int calculatePCLResolution(int resolution) { return calculatePCLResolution(resolution, false); } @@ -814,12 +790,11 @@ if (src == null) { src = BitmapImageUtil.convertToGrayscale(img, effDim); } - MonochromeBitmapConverter converter = createMonochromeBitmapConverter(); + MonochromeBitmapConverter converter + = BitmapImageUtil.createDefaultMonochromeBitmapConverter(); converter.setHint("quality", "false"); - BufferedImage buf = (BufferedImage)converter.convertToMonochrome(src); - - RenderedImage red = buf; + RenderedImage red = converter.convertToMonochrome(src); selectCurrentPattern(0, 0); //Solid black setTransparencyMode(sourceTransparency || mask != null, true); paintMonochromeBitmap(red, effResolution); Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 3 16:28:21 2009 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java:699793-735028 +/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFDocumentHandler.java:699793-740275 Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 3 16:28:21 2009 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:699793-735028 +/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/AbstractSVGDocumentHandler.java:699793-740275 Propchange: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 3 16:28:21 2009 @@ -1 +1 @@ -/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java:699793-735028 +/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGDocumentHandler.java:699793-740275 Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml?rev=740340&r1=740339&r2=740340&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml (original) +++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/status.xml Tue Feb 3 16:28:21 2009 @@ -58,6 +58,19 @@ documents. Example: the fix of marks layering will be such a case when it's done. --> <release version="FOP Trunk" date="TBD"> + <action context="Code" dev="VH" type="fix" fixes-bug="46638"> + MinOptMaxUtil.toMinOptMax was converting LengthRangeProperty objects into illegal MinOptMax + objects (in some cases opt could be inferior to min). + </action> + <action context="Layout" dev="VH" type="add" fixes-bug="46315" due-to="Georg Datterl"> + Added extension to disable column balancing before blocks spanning the whole page, in + multiple-column documents. + </action> + <action context="Renderers" dev="JM" type="add"> + AFP Output: Bilevel images in resource groups as generated as hard page segments + (instead of image objects) for better interoperability with older IPDS environments + and for better printing performance. + </action> <action context="Fonts" dev="JM" type="add"> FOP now creates ToUnicode CMaps for single-byte fonts that don't use built-in encodings to help PDF text extractors interpreting characters. Modified: xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseUserConfigTestCase.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseUserConfigTestCase.java?rev=740340&r1=740339&r2=740340&view=diff ============================================================================== --- xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseUserConfigTestCase.java (original) +++ xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/test/java/org/apache/fop/config/BaseUserConfigTestCase.java Tue Feb 3 16:28:21 2009 @@ -23,14 +23,16 @@ import java.io.File; import java.io.IOException; +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.fop.apps.FOUserAgent; import org.apache.fop.render.pdf.BasePDFTestCase; -import org.xml.sax.SAXException; /** * Basic runtime test for FOP's font configuration. It is used to verify that @@ -66,7 +68,7 @@ final File baseDir = getBaseDir(); final String fontFOFilePath = getFontFOFilePath(); File foFile = new File(baseDir, fontFOFilePath); - final boolean dumpOutput = true; + final boolean dumpOutput = false; FOUserAgent foUserAgent = fopFactory.newFOUserAgent(); convertFO(foFile, foUserAgent, dumpOutput); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
