Author: jeremias
Date: Sun Jan 11 03:27:03 2009
New Revision: 733455
URL: http://svn.apache.org/viewvc?rev=733455&view=rev
Log:
Added general support for the fox:conversion-mode inside the new IF.
Cleaned up usage of fox:conversion-mode foreign attribute.
Plus additional cleanup.
Added:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerUtil.java
(with props)
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/RendererContext.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLConstants.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLImageHandlerGraphics2D.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLPainter.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRenderer.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRendererContext.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSSVGHandler.java
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
Sun Jan 11 03:27:03 2009
@@ -33,11 +33,9 @@
import org.apache.batik.gvt.GraphicsNode;
import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
-import org.apache.xmlgraphics.util.QName;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.events.EventBroadcaster;
-import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.image.loader.batik.BatikUtil;
import org.apache.fop.image.loader.batik.Graphics2DImagePainterImpl;
import org.apache.fop.render.RendererContext.RendererContextWrapper;
@@ -52,13 +50,6 @@
*/
public abstract class AbstractGenericSVGHandler implements XMLHandler,
RendererContextConstants {
- /** Qualified name for the "conversion-mode" extension attribute. */
- protected static final QName CONVERSION_MODE = new QName(
- ExtensionElementMapping.URI, null, "conversion-mode");
-
- /** "bitmap" value for the "conversion-mode" extension attribute. */
- protected static final String BITMAP = "bitmap";
-
/** {...@inheritdoc} */
public void handleXML(RendererContext context,
Document doc, String ns) throws Exception {
@@ -82,9 +73,9 @@
}
/**
- * Builds the GVT root
+ * Builds the GVT root.
*
- * @param rendererContext the renderer context
+ * @param userAgent the user agent
* @param ctx the batik bridge context
* @param doc the document
* @return a built GVT root tree
Added:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerUtil.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerUtil.java?rev=733455&view=auto
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerUtil.java
(added)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerUtil.java
Sun Jan 11 03:27:03 2009
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.render;
+
+import java.util.Map;
+
+import org.apache.xmlgraphics.util.QName;
+
+import org.apache.fop.fo.extensions.ExtensionElementMapping;
+
+/**
+ * Utility methods for image handling.
+ */
+public class ImageHandlerUtil {
+
+ /** conversion-mode extension attribute */
+ public static final QName CONVERSION_MODE = new QName(
+ ExtensionElementMapping.URI, null, "conversion-mode");
+
+ /** Conversion mode: indicates that the image shall be converted to a
bitmap. */
+ public static final String CONVERSION_MODE_BITMAP = "bitmap";
+
+ /**
+ * Indicates whether the image conversion mode is set to bitmap mode, i.e.
the image shall
+ * be converted to a bitmap.
+ * @param mode the conversion mode
+ * @return true if conversion mode is "bitmap"
+ */
+ public static boolean isConversionModeBitmap(String mode) {
+ return CONVERSION_MODE_BITMAP.equalsIgnoreCase(mode);
+ }
+
+ /**
+ * Indicates whether the image conversion mode is set to bitmap mode, i.e.
the image shall
+ * be converted to a bitmap.
+ * @param foreignAttributes a map of foreign attributes (Map<QName,
Object>)
+ * @return true if conversion mode is "bitmap"
+ */
+ public static boolean isConversionModeBitmap(Map foreignAttributes) {
+ if (foreignAttributes == null) {
+ return false;
+ }
+ String conversionMode = (String)foreignAttributes.get(CONVERSION_MODE);
+ return isConversionModeBitmap(conversionMode);
+ }
+
+}
Propchange:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ImageHandlerUtil.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/RendererContext.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/RendererContext.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/RendererContext.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/RendererContext.java
Sun Jan 11 03:27:03 2009
@@ -24,8 +24,6 @@
import java.util.Map;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.fo.extensions.ExtensionElementMapping;
-import org.apache.xmlgraphics.util.QName;
/**
* The Render Context for external handlers. This provides a rendering context
@@ -33,12 +31,6 @@
* render target.
*/
public class RendererContext {
- /** conversion-mode extension attribute */
- protected static final QName CONVERSION_MODE = new QName(
- ExtensionElementMapping.URI, null, "conversion-mode");
-
- /** "bitmap" value for the "conversion-mode" extension attribute. */
- protected static final String BITMAP = "bitmap";
private final String mime;
private final AbstractRenderer renderer;
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/intermediate/AbstractIFPainter.java
Sun Jan 11 03:27:03 2009
@@ -37,6 +37,7 @@
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;
@@ -47,6 +48,7 @@
import org.apache.fop.events.ResourceEventProducer;
import org.apache.fop.render.ImageHandler;
import org.apache.fop.render.ImageHandlerRegistry;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.traits.BorderProps;
import org.apache.fop.traits.RuleStyle;
@@ -136,8 +138,10 @@
RenderingContext context = createRenderingContext();
Map hints = createDefaultImageProcessingHints(sessionContext);
context.putHints(hints);
+
+ ImageFlavor[] flavors =
imageHandlerRegistry.getSupportedFlavors(context);
org.apache.xmlgraphics.image.loader.Image img = manager.getImage(
- info, imageHandlerRegistry.getSupportedFlavors(context),
+ info, flavors,
hints, sessionContext);
try {
@@ -155,7 +159,15 @@
* @return the default processing hints
*/
protected Map createDefaultImageProcessingHints(ImageSessionContext
sessionContext) {
- return ImageUtil.getDefaultHints(sessionContext);
+ Map hints = ImageUtil.getDefaultHints(sessionContext);
+
+ //Transfer common foreign attributes to hints
+ Object conversionMode =
getContext().getForeignAttribute(ImageHandlerUtil.CONVERSION_MODE);
+ if (conversionMode != null) {
+ hints.put(ImageHandlerUtil.CONVERSION_MODE, conversionMode);
+ }
+
+ return hints;
}
/**
@@ -212,7 +224,6 @@
log.trace("Using ImageHandler: " + handler.getClass().getName());
}
- //TODO foreign attributes
handler.handleImage(context, effImage, rect);
}
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java
Sun Jan 11 03:27:03 2009
@@ -33,6 +33,7 @@
import org.apache.fop.image.loader.batik.BatikUtil;
import org.apache.fop.render.AbstractGenericSVGHandler;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.Renderer;
import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RendererContextConstants;
@@ -71,10 +72,7 @@
pdfi.currentXPosition =
((Integer)context.getProperty(XPOS)).intValue();
pdfi.currentYPosition =
((Integer)context.getProperty(YPOS)).intValue();
Map foreign =
(Map)context.getProperty(RendererContextConstants.FOREIGN_ATTRIBUTES);
- if (foreign != null
- &&
BITMAP.equalsIgnoreCase((String)foreign.get(CONVERSION_MODE))) {
- pdfi.paintAsBitmap = true;
- }
+ pdfi.paintAsBitmap = ImageHandlerUtil.isConversionModeBitmap(foreign);
return pdfi;
}
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLConstants.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLConstants.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLConstants.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLConstants.java
Sun Jan 11 03:27:03 2009
@@ -26,12 +26,15 @@
/**
* Constants used for PCL output.
*/
-public interface PCLConstants {
-
- /** Image conversion mode */
- QName CONV_MODE = new QName(ExtensionElementMapping.URI, null,
"conversion-mode");
+interface PCLConstants {
/** Source transparency mode */
QName SRC_TRANSPARENCY = new QName(ExtensionElementMapping.URI, null,
"source-transparency");
+ /** Disable clipping */
+ Object DISABLE_CLIPPING = new QName(ExtensionElementMapping.URI, null,
"disable-clipping");
+
+ /** Enables/Disables a color canvas for bitmap production (required for
SVG, for example) */
+ Object COLOR_CANVAS = new QName(ExtensionElementMapping.URI, null,
"color-canvas");
+
}
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLImageHandlerGraphics2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLImageHandlerGraphics2D.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLImageHandlerGraphics2D.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLImageHandlerGraphics2D.java
Sun Jan 11 03:27:03 2009
@@ -41,6 +41,7 @@
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.render.ImageHandler;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RenderingContext;
/**
@@ -146,8 +147,9 @@
boolean supported = (image == null || image instanceof ImageGraphics2D)
&& targetContext instanceof PCLRenderingContext;
if (supported) {
- Object hint = targetContext.getHint(PCLConstants.CONV_MODE);
- if ("bitmap".equals(hint)) {
+ String mode =
(String)targetContext.getHint(ImageHandlerUtil.CONVERSION_MODE);
+ if (ImageHandlerUtil.isConversionModeBitmap(mode)) {
+ //Disabling this image handler automatically causes a bitmap
to be generated
return false;
}
}
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLPainter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLPainter.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLPainter.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLPainter.java
Sun Jan 11 03:27:03 2009
@@ -47,6 +47,7 @@
import org.apache.fop.fonts.Font;
import org.apache.fop.fonts.FontTriplet;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.render.intermediate.AbstractIFPainter;
import org.apache.fop.render.intermediate.IFContext;
@@ -296,7 +297,7 @@
hints.put(ImageProcessingHints.BITMAP_TYPE_INTENT,
ImageProcessingHints.BITMAP_TYPE_INTENT_GRAY);
}
- hints.put(PCLConstants.CONV_MODE, "bitmap");
+ hints.put(ImageHandlerUtil.CONVERSION_MODE,
ImageHandlerUtil.CONVERSION_MODE_BITMAP);
PCLRenderingContext context =
(PCLRenderingContext)createRenderingContext();
context.setSourceTransparencyEnabled(true);
try {
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRenderer.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRenderer.java
Sun Jan 11 03:27:03 2009
@@ -85,6 +85,7 @@
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.fonts.FontMetrics;
import org.apache.fop.render.Graphics2DAdapter;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.PrintRenderer;
import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RendererContextConstants;
@@ -513,7 +514,7 @@
RendererContext rc = createRendererContext(paintRect.x,
paintRect.y,
paintRect.width, paintRect.height, null);
Map atts = new java.util.HashMap();
- atts.put(CONV_MODE, "bitmap");
+ atts.put(ImageHandlerUtil.CONVERSION_MODE,
ImageHandlerUtil.CONVERSION_MODE_BITMAP);
atts.put(SRC_TRANSPARENCY, "true");
rc.setProperty(RendererContextConstants.FOREIGN_ATTRIBUTES,
atts);
@@ -1264,7 +1265,7 @@
RendererContext rc = createRendererContext(paintRect.x, paintRect.y,
paintRect.width, paintRect.height, null);
Map atts = new java.util.HashMap();
- atts.put(CONV_MODE, "bitmap");
+ atts.put(ImageHandlerUtil.CONVERSION_MODE,
ImageHandlerUtil.CONVERSION_MODE_BITMAP);
atts.put(SRC_TRANSPARENCY, "true");
rc.setProperty(RendererContextConstants.FOREIGN_ATTRIBUTES, atts);
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRendererContext.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRendererContext.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRendererContext.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pcl/PCLRendererContext.java
Sun Jan 11 03:27:03 2009
@@ -22,6 +22,7 @@
import org.apache.xmlgraphics.util.QName;
import org.apache.fop.fo.extensions.ExtensionElementMapping;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RendererContext;
/**
@@ -51,16 +52,14 @@
/** @return true if the SVG image should be rendered as a bitmap */
public boolean paintAsBitmap() {
- QName qName = new QName(ExtensionElementMapping.URI, null,
"conversion-mode");
- return getForeignAttributes() != null
- &&
"bitmap".equalsIgnoreCase((String)getForeignAttributes().get(qName));
+ return ImageHandlerUtil.isConversionModeBitmap(getForeignAttributes());
}
/** @return true if clipping is disabled inside the PCLGraphics2D. */
public boolean isClippingDisabled() {
- QName qName = new QName(ExtensionElementMapping.URI, null,
"disable-clipping");
return getForeignAttributes() != null
- &&
"true".equalsIgnoreCase((String)getForeignAttributes().get(qName));
+ && "true".equalsIgnoreCase((String)getForeignAttributes().get(
+ PCLConstants.DISABLE_CLIPPING));
}
/**
@@ -68,9 +67,9 @@
* @return true if the background shouldn't be erased
*/
public boolean isSourceTransparency() {
- QName qName = new QName(ExtensionElementMapping.URI, null,
"source-transparency");
return getForeignAttributes() != null
- &&
"true".equalsIgnoreCase((String)getForeignAttributes().get(qName));
+ && "true".equalsIgnoreCase((String)getForeignAttributes().get(
+ PCLConstants.SRC_TRANSPARENCY));
}
/**
@@ -80,11 +79,11 @@
* @return true if an EGB canvas should be used
*/
public boolean isColorCanvas() {
- QName qName = new QName(ExtensionElementMapping.URI, null,
"color-canvas");
Boolean prop =
(Boolean)context.getProperty(PCLRendererContextConstants.PCL_COLOR_CANVAS);
return Boolean.TRUE.equals(prop)
|| (getForeignAttributes() != null
- &&
"true".equalsIgnoreCase((String)getForeignAttributes().get(qName)));
+ &&
"true".equalsIgnoreCase((String)getForeignAttributes().get(
+ PCLConstants.COLOR_CANVAS)));
}
}
\ No newline at end of file
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
Sun Jan 11 03:27:03 2009
@@ -43,6 +43,7 @@
import org.apache.fop.pdf.PDFPage;
import org.apache.fop.pdf.PDFResourceContext;
import org.apache.fop.render.AbstractGenericSVGHandler;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.Renderer;
import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RendererContextConstants;
@@ -87,11 +88,7 @@
pdfi.currentYPosition =
((Integer)context.getProperty(YPOS)).intValue();
pdfi.cfg = (Configuration)context.getProperty(HANDLER_CONFIGURATION);
Map foreign =
(Map)context.getProperty(RendererContextConstants.FOREIGN_ATTRIBUTES);
-
- if (foreign != null
- &&
BITMAP.equalsIgnoreCase((String)foreign.get(CONVERSION_MODE))) {
- pdfi.paintAsBitmap = true;
- }
+ pdfi.paintAsBitmap = ImageHandlerUtil.isConversionModeBitmap(foreign);
return pdfi;
}
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java
Sun Jan 11 03:27:03 2009
@@ -29,11 +29,9 @@
import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
import org.apache.xmlgraphics.java2d.ps.PSGraphics2D;
import org.apache.xmlgraphics.ps.PSGenerator;
-import org.apache.xmlgraphics.util.QName;
-import org.apache.fop.fo.extensions.ExtensionElementMapping;
import org.apache.fop.render.AbstractGraphics2DAdapter;
-import org.apache.fop.render.Graphics2DAdapter;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RendererContextConstants;
import org.apache.fop.render.RendererContext.RendererContextWrapper;
@@ -44,10 +42,6 @@
*/
public class PSGraphics2DAdapter extends AbstractGraphics2DAdapter {
- /** Qualified name for the "conversion-mode" extension attribute. */
- protected static final QName CONVERSION_MODE = new QName(
- ExtensionElementMapping.URI, null, "conversion-mode");
-
private PSGenerator gen;
private boolean clip = true;
@@ -87,7 +81,7 @@
if (context != null) {
Map foreign =
(Map)context.getProperty(RendererContextConstants.FOREIGN_ATTRIBUTES);
paintAsBitmap = (foreign != null
- &&
"bitmap".equalsIgnoreCase((String)foreign.get(CONVERSION_MODE)));
+ && ImageHandlerUtil.isConversionModeBitmap(foreign));
}
float sx = paintAsBitmap ? 1.0f : (fwidth / (float)imw);
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSImageHandlerSVG.java
Sun Jan 11 03:27:03 2009
@@ -65,7 +65,6 @@
PSGraphics2D graphics = new PSGraphics2D(strokeText, gen);
graphics.setGraphicContext(new
org.apache.xmlgraphics.java2d.GraphicContext());
- GVTBuilder builder = new GVTBuilder();
NativeTextHandler nativeTextHandler = null;
BridgeContext ctx = new BridgeContext(ua);
if (!strokeText) {
@@ -79,6 +78,7 @@
GraphicsNode root;
try {
+ GVTBuilder builder = new GVTBuilder();
root = builder.build(ctx, imageSVG.getDocument());
} catch (Exception e) {
SVGEventProducer eventProducer = SVGEventProducer.Provider.get(
@@ -94,7 +94,6 @@
float sy = pos.height / h;
ctx = null;
- builder = null;
gen.commentln("%FOPBeginSVG");
gen.saveGraphicsState();
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSSVGHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSSVGHandler.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSSVGHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/java/org/apache/fop/render/ps/PSSVGHandler.java
Sun Jan 11 03:27:03 2009
@@ -39,6 +39,7 @@
import org.apache.fop.fonts.FontInfo;
import org.apache.fop.image.loader.batik.BatikUtil;
import org.apache.fop.render.AbstractGenericSVGHandler;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.Renderer;
import org.apache.fop.render.RendererContext;
import org.apache.fop.render.RendererContextConstants;
@@ -232,8 +233,7 @@
boolean paintAsBitmap = false;
if (context != null) {
Map foreign =
(Map)context.getProperty(RendererContextConstants.FOREIGN_ATTRIBUTES);
- paintAsBitmap = (foreign != null
- &&
"bitmap".equalsIgnoreCase((String)foreign.get(CONVERSION_MODE)));
+ paintAsBitmap = ImageHandlerUtil.isConversionModeBitmap(foreign);
}
if (paintAsBitmap) {
try {
Modified:
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGPainter.java?rev=733455&r1=733454&r2=733455&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
(original)
+++
xmlgraphics/fop/branches/Temp_AreaTreeNewDesign/src/sandbox/org/apache/fop/render/svg/SVGPainter.java
Sun Jan 11 03:27:03 2009
@@ -41,12 +41,11 @@
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.util.QName;
import org.apache.xmlgraphics.xmp.Metadata;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.events.ResourceEventProducer;
-import org.apache.fop.fo.extensions.ExtensionElementMapping;
+import org.apache.fop.render.ImageHandlerUtil;
import org.apache.fop.render.RenderingContext;
import org.apache.fop.render.intermediate.AbstractIFPainter;
import org.apache.fop.render.intermediate.IFConstants;
@@ -193,9 +192,6 @@
}
}
- private static final QName CONVERSION_MODE
- = new QName(ExtensionElementMapping.URI, null, "conversion-mode");
-
/** {...@inheritdoc} */
public void drawImage(String uri, Rectangle rect) throws IFException {
try {
@@ -209,7 +205,8 @@
String mime = info.getMimeType();
Map foreignAttributes = getContext().getForeignAttributes();
- String conversionMode =
(String)foreignAttributes.get(CONVERSION_MODE);
+ String conversionMode = (String)foreignAttributes.get(
+ ImageHandlerUtil.CONVERSION_MODE);
if ("reference".equals(conversionMode)
&& (MimeConstants.MIME_GIF.equals(mime)
|| MimeConstants.MIME_JPEG.equals(mime)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
