You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ac...@apache.org on 2008/06/03 13:12:52 UTC
svn commit: r662738 - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources:
lib/ src/java/org/apache/fop/image/loader/batik/
src/java/org/apache/fop/render/ src/java/org/apache/fop/render/afp/
src/java/org/apache/fop/render/pcl/
Author: acumiskey
Date: Tue Jun 3 04:12:52 2008
New Revision: 662738
URL: http://svn.apache.org/viewvc?rev=662738&view=rev
Log:
Moved image uri storing from AbstractGenericSVGHandler to AFPState as requested/suggested :).
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/lib/xmlgraphics-commons-1.4svn.jar
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPState.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/lib/xmlgraphics-commons-1.4svn.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/lib/xmlgraphics-commons-1.4svn.jar?rev=662738&r1=662737&r2=662738&view=diff
==============================================================================
Binary files - no diff available.
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java?rev=662738&r1=662737&r2=662738&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java Tue Jun 3 04:12:52 2008
@@ -105,9 +105,6 @@
return new Dimension(svg.getSize().getWidthMpt(), svg.getSize().getHeightMpt());
}
- public String getImageUri() {
- return src.getInfo().getOriginalURI();
- }
};
ImageGraphics2D g2dImage = new ImageGraphics2D(src.getInfo(), painter);
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java?rev=662738&r1=662737&r2=662738&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java Tue Jun 3 04:12:52 2008
@@ -101,10 +101,6 @@
log.debug("Painting WMF took " + duration + " ms.");
}
}
-
- public String getImageUri() {
- return wmf.getInfo().getOriginalURI();
- }
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java?rev=662738&r1=662737&r2=662738&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java Tue Jun 3 04:12:52 2008
@@ -113,10 +113,6 @@
return new Dimension(wrappedContext.getWidth(), wrappedContext.getHeight());
}
- public String getImageUri() {
- return uri;
- }
-
};
//Let the painter paint the SVG on the Graphics2D instance
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java?rev=662738&r1=662737&r2=662738&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java Tue Jun 3 04:12:52 2008
@@ -32,11 +32,9 @@
import java.awt.image.DataBuffer;
import java.awt.image.Raster;
import java.awt.image.WritableRaster;
-import java.io.IOException;
import org.apache.fop.render.RendererContext.RendererContextWrapper;
import org.apache.fop.util.UnitConv;
-import org.apache.xmlgraphics.java2d.Graphics2DImagePainter;
/**
* Graphics2DAdapter implementation for PCL and HP GL/2.
@@ -136,11 +134,4 @@
g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
}
-
-// /** {@inheritDoc} */
-// public void paintImage(Graphics2DImagePainter painter,
-// RendererContext context,
-// int x, int y, int width, int height) throws IOException {
-// paintImage(painter, context, null, x, y, width, height);
-// }
}
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.java?rev=662738&r1=662737&r2=662738&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.java Tue Jun 3 04:12:52 2008
@@ -65,11 +65,10 @@
BufferedImage bi
= paintToBufferedImage(painter, wrappedContext, resolution, gray, false);
ImageManager manager = userAgent.getFactory().getImageManager();
- ImageSessionContext sessionContext = userAgent.getImageSessionContext();
-
+ ImageSessionContext sessionContext = userAgent.getImageSessionContext();
+ AFPState state = (AFPState)context.getProperty(AFPRendererContextConstants.AFP_STATE);
try {
- String uri = painter.getImageUri();
- ImageInfo info = manager.getImageInfo(uri, sessionContext);
+ ImageInfo info = manager.getImageInfo(state.getImageUri(), sessionContext);
java.util.Map foreignAttributes = null;
afp.drawBufferedImage(info, bi, resolution, x, y, width, height, foreignAttributes);
} catch (ImageException e) {
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java?rev=662738&r1=662737&r2=662738&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRenderer.java Tue Jun 3 04:12:52 2008
@@ -52,7 +52,6 @@
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.area.BlockViewport;
import org.apache.fop.area.BodyRegion;
@@ -912,6 +911,7 @@
/** {@inheritDoc} */
public void drawImage(String uri, Rectangle2D pos, Map foreignAttributes) {
uri = URISpecification.getURL(uri);
+ getState().setImageUri(uri);
Rectangle posInt = new Rectangle((int) pos.getX(), (int) pos.getY(),
(int) pos.getWidth(), (int) pos.getHeight());
Point origin = new Point(currentIPPosition, currentBPPosition);
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPState.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPState.java?rev=662738&r1=662737&r2=662738&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPState.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPState.java Tue Jun 3 04:12:52 2008
@@ -20,7 +20,6 @@
package org.apache.fop.render.afp;
import java.awt.Color;
-import java.awt.geom.AffineTransform;
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
@@ -188,6 +187,27 @@
}
/**
+ * Sets the image uri of the current image being processed
+ * @param uri the image uri of the current image being processed
+ * @return true if the image uri has changed
+ */
+ public boolean setImageUri(String uri) {
+ if (!uri.equals(getData().imageUri)) {
+ getData().imageUri = uri;
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Returns the image uri of the current image being processed
+ * @return the image uri of the current image being processed
+ */
+ protected String getImageUri() {
+ return getData().imageUri;
+ }
+
+ /**
* Push the current state onto the stack.
* This call should be used when the q operator is used
* so that the state is known when popped.
@@ -234,6 +254,7 @@
return data;
}
+ /** the state data instance */
public class Data implements Cloneable, Serializable {
private static final long serialVersionUID = -1789481244175275686L;
@@ -261,6 +282,9 @@
/** The fonts on the current page */
private AFPPageFonts pageFonts = null;
+ /** The current image uri */
+ private String imageUri = null;
+
/** {@inheritDoc} */
public Object clone() throws CloneNotSupportedException {
Data obj = new Data();
@@ -272,7 +296,21 @@
obj.dashArray = this.dashArray;
obj.filled = this.filled;
obj.pageFonts = this.pageFonts;
+ obj.imageUri = this.imageUri;
return obj;
}
+
+ /** {@inheritDoc} */
+ public String toString() {
+ return "color=" + color
+ + ", backColor=" + backColor
+ + ", fontName=" + fontName
+ + ", fontSize=" + fontSize
+ + ", lineWidth=" + lineWidth
+ + ", dashArray=" + dashArray
+ + ", filled=" + filled
+ + ", pageFonts=" + pageFonts
+ + ", imageUri=" + imageUri;
+ }
}
}
\ No newline at end of file
Modified: xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java?rev=662738&r1=662737&r2=662738&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java (original)
+++ xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pcl/PCLRenderer.java Tue Jun 3 04:12:52 2008
@@ -701,10 +701,6 @@
return paintRect.getSize();
}
- public String getImageUri() {
- return null;
- }
-
};
g2a.paintImage(painter, rc,
paintRect.x, paintRect.y, paintRect.width, paintRect.height);
@@ -1564,10 +1560,6 @@
return paintRect.getSize();
}
- public String getImageUri() {
- return null;
- }
-
};
try {
g2a.paintImage(painter, rc,
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org