Author: acumiskey
Date: Tue Nov 25 10:34:05 2008
New Revision: 720561
URL: http://svn.apache.org/viewvc?rev=720561&view=rev
Log:
* Reverted back the interface changes I made to ImageHandler.
* Created AbstractAFPImageHandlerRawStream base class to handle raw image
streams for AFP.
* Fixed a bug in handling native embedded TIFF images.
I think its finally ready to roll now guys, sorry for the last minute glitches.
My apologies for not finding time to respond to the fop-dev mailing list this
afternoon but have been trying to put my efforts into applying the final
touches to the branch. If my good lady allows I'll respond to your comments
later this evening :).
Added:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
(with props)
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageContent.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageSegment.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractDataObject.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ImageObject.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectContainer.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ImageHandler.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandler.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawCCITTFax.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerXML.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/AFPRendererImageInfo.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerXML.java
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectFactory.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectFactory.java
Tue Nov 25 10:34:05 2008
@@ -77,7 +77,7 @@
ObjectClassificationTriplet.CLASS_TIME_INVARIANT_PAGINATED_PRESENTATION_OBJECT,
objectType, dataInContainer, containerHasOEG, dataInOCD);
- objectContainer.setInputStream(dataObjectInfo.getInputStream());
+ objectContainer.setData(dataObjectInfo.getData());
return objectContainer;
}
@@ -117,6 +117,7 @@
} else {
imageObj.setIDESize((byte) imageObjectInfo.getBitsPerPixel());
}
+
imageObj.setData(imageObjectInfo.getData());
return imageObj;
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectInfo.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPDataObjectInfo.java
Tue Nov 25 10:34:05 2008
@@ -19,8 +19,6 @@
package org.apache.fop.afp;
-import java.io.InputStream;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.afp.modca.Registry;
@@ -43,12 +41,18 @@
/** the data object height */
private int dataHeight;
- /** the object data in an inputstream */
- private InputStream inputStream;
-
/** the object registry mimetype */
private String mimeType;
+ /** the object data in a byte array */
+ private byte[] data;
+
+ /** the object data height resolution */
+ private int dataHeightRes;
+
+ /** the object data width resolution */
+ private int dataWidthRes;
+
/**
* Default constructor
*/
@@ -121,16 +125,6 @@
return this.objectAreaInfo;
}
- /** [EMAIL PROTECTED] */
- public String toString() {
- return "AFPDataObjectInfo{"
- + "mimeType=" + mimeType
- + ", dataWidth=" + dataWidth
- + ", dataHeight=" + dataHeight
- + (objectAreaInfo != null ? ", objectAreaInfo=" + objectAreaInfo :
"")
- + (resourceInfo != null ? ", resourceInfo=" + resourceInfo : "");
- }
-
/**
* Returns the uri of this data object
*
@@ -186,21 +180,68 @@
}
/**
- * Sets the object data inputstream
+ * Returns the data height resolution
+ *
+ * @return the data height resolution
+ */
+ public int getDataHeightRes() {
+ return this.dataHeightRes;
+ }
+
+ /**
+ * Sets the data width resolution
+ *
+ * @param dataWidthRes the data width resolution
+ */
+ public void setDataHeightRes(int dataHeightRes) {
+ this.dataHeightRes = dataHeightRes;
+ }
+
+ /**
+ * Returns the data width resolution
+ *
+ * @return the data width resolution
+ */
+ public int getDataWidthRes() {
+ return this.dataWidthRes;
+ }
+
+ /**
+ * Sets the data width resolution
+ *
+ * @param dataWidthRes the data width resolution
+ */
+ public void setDataWidthRes(int dataWidthRes) {
+ this.dataWidthRes = dataWidthRes;
+ }
+
+ /**
+ * Sets the object data
*
- * @param inputStream the object data inputstream
+ * @param data the object data
*/
- public void setInputStream(InputStream inputStream) {
- this.inputStream = inputStream;
+ public void setData(byte[] data) {
+ this.data = data;
}
/**
- * Returns the object data inputstream
+ * Returns the object data
*
- * @return the object data inputstream
+ * @return the object data
*/
- public InputStream getInputStream() {
- return this.inputStream;
+ public byte[] getData() {
+ return this.data;
}
+ /** [EMAIL PROTECTED] */
+ public String toString() {
+ return "AFPDataObjectInfo{"
+ + "mimeType=" + mimeType
+ + ", dataWidth=" + dataWidth
+ + ", dataHeight=" + dataHeight
+ + ", dataWidthRes=" + dataWidthRes
+ + ", dataHeightRes=" + dataHeightRes
+ + (objectAreaInfo != null ? ", objectAreaInfo=" + objectAreaInfo :
"")
+ + (resourceInfo != null ? ", resourceInfo=" + resourceInfo : "");
+ }
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/AFPImageObjectInfo.java
Tue Nov 25 10:34:05 2008
@@ -24,6 +24,7 @@
* A list of parameters associated with an image
*/
public class AFPImageObjectInfo extends AFPDataObjectInfo {
+
/** number of bits per pixel used */
private int bitsPerPixel;
@@ -33,9 +34,6 @@
/** compression type if any */
private int compression = -1;
- /** the object data in a byte array */
- private byte[] data;
-
/**
* Default constructor
*/
@@ -106,24 +104,6 @@
this.compression = compression;
}
- /**
- * Sets the object data
- *
- * @param data the object data
- */
- public void setData(byte[] data) {
- this.data = data;
- }
-
- /**
- * Returns the object data
- *
- * @return the object data
- */
- public byte[] getData() {
- return this.data;
- }
-
/** [EMAIL PROTECTED] */
public String toString() {
return "AFPImageObjectInfo{" + super.toString()
@@ -132,5 +112,4 @@
+ ", bitsPerPixel=" + bitsPerPixel
+ "}";
}
-
}
\ No newline at end of file
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageContent.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageContent.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageContent.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageContent.java
Tue Nov 25 10:34:05 2008
@@ -123,7 +123,7 @@
}
/**
- * Set the data image store information.
+ * Set the image data (can be byte array or inputstream)
*
* @param imageData the image data
*/
@@ -148,15 +148,16 @@
os.write(getExternalAlgorithmParameter());
- // Image Data
- if (data != null) {
- final byte[] dataHeader = new byte[] {
+ final byte[] dataHeader = new byte[] {
(byte)0xFE, // ID
(byte)0x92, // ID
0x00, // length
0x00 // length
};
- final int lengthOffset = 2;
+ final int lengthOffset = 2;
+
+ // Image Data
+ if (data != null) {
writeChunksToStream(data, dataHeader, lengthOffset, MAX_DATA_LEN,
os);
}
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageSegment.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageSegment.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageSegment.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/ioca/ImageSegment.java
Tue Nov 25 10:34:05 2008
@@ -118,8 +118,8 @@
*
* @param data the image data
*/
- public void setData(byte[] data) {
- getImageContent().setImageData(data);
+ public void setData(byte[] imageData) {
+ getImageContent().setImageData(imageData);
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractDataObject.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractDataObject.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractDataObject.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/AbstractDataObject.java
Tue Nov 25 10:34:05 2008
@@ -112,6 +112,7 @@
/** [EMAIL PROTECTED] */
protected void writeContent(OutputStream os) throws IOException {
+ writeTriplets(os);
if (objectEnvironmentGroup != null) {
objectEnvironmentGroup.writeToStream(os);
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ImageObject.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ImageObject.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ImageObject.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ImageObject.java
Tue Nov 25 10:34:05 2008
@@ -25,7 +25,6 @@
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.apache.fop.afp.AFPDataObjectInfo;
import org.apache.fop.afp.AFPImageObjectInfo;
-import org.apache.fop.afp.AFPObjectAreaInfo;
import org.apache.fop.afp.Factory;
import org.apache.fop.afp.ioca.ImageSegment;
@@ -65,15 +64,17 @@
int dataWidth = imageObjectInfo.getDataWidth();
int dataHeight = imageObjectInfo.getDataHeight();
- AFPObjectAreaInfo objectAreaInfo = dataObjectInfo.getObjectAreaInfo();
- int widthRes = objectAreaInfo.getWidthRes();
- int heightRes = objectAreaInfo.getHeightRes();
+// AFPObjectAreaInfo objectAreaInfo =
dataObjectInfo.getObjectAreaInfo();
+// int widthRes = objectAreaInfo.getWidthRes();
+// int heightRes = objectAreaInfo.getHeightRes();
+ int dataWidthRes = imageObjectInfo.getDataWidthRes();
+ int dataHeightRes = imageObjectInfo.getDataWidthRes();
ImageDataDescriptor imageDataDescriptor
- = factory.createImageDataDescriptor(dataWidth, dataHeight,
widthRes, heightRes);
+ = factory.createImageDataDescriptor(dataWidth, dataHeight,
dataWidthRes, dataHeightRes);
getObjectEnvironmentGroup().setDataDescriptor(imageDataDescriptor);
- getImageSegment().setImageSize(dataWidth, dataHeight, widthRes,
heightRes);
+ getImageSegment().setImageSize(dataWidth, dataHeight, dataWidthRes,
dataHeightRes);
}
/**
@@ -117,8 +118,8 @@
*
* @param data the image data
*/
- public void setData(byte[] data) {
- getImageSegment().setData(data);
+ public void setData(byte[] imageData) {
+ getImageSegment().setData(imageData);
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectContainer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectContainer.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectContainer.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/afp/modca/ObjectContainer.java
Tue Nov 25 10:34:05 2008
@@ -20,10 +20,8 @@
package org.apache.fop.afp.modca;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.commons.io.IOUtils;
import org.apache.fop.afp.AFPDataObjectInfo;
import org.apache.fop.afp.AFPObjectAreaInfo;
import org.apache.fop.afp.AFPResourceInfo;
@@ -40,7 +38,7 @@
/** the object container data maximum length */
private static final int MAX_DATA_LEN = 32759;
- private InputStream inputStream;
+ private byte[] data;
/**
* Main constructor
@@ -75,8 +73,9 @@
copySF(dataHeader, SF_CLASS, Type.DATA, Category.OBJECT_CONTAINER);
final int lengthOffset = 1;
- copyChunks(dataHeader, lengthOffset, MAX_DATA_LEN, inputStream, os);
- IOUtils.closeQuietly(inputStream);
+ if (data != null) {
+ writeChunksToStream(data, dataHeader, lengthOffset, MAX_DATA_LEN,
os);
+ }
}
/** [EMAIL PROTECTED] */
@@ -118,7 +117,7 @@
*
* @param inputStream the inputstream for the object container data
*/
- public void setInputStream(InputStream inputStream) {
- this.inputStream = inputStream;
+ public void setData(byte[] data) {
+ this.data = data;
}
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/AbstractImageHandlerRegistry.java
Tue Nov 25 10:34:05 2008
@@ -100,10 +100,7 @@
* @param handler the ImageHandler instance
*/
public synchronized void addHandler(ImageHandler handler) {
- Class[] imageClasses = handler.getSupportedImageClasses();
- for (int i = 0; i < imageClasses.length; i++) {
- this.handlers.put(imageClasses[i], handler);
- }
+ this.handlers.put(handler.getSupportedImageClass(), handler);
//Sorted insert
ListIterator iter = this.handlerList.listIterator();
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ImageHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ImageHandler.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ImageHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/ImageHandler.java
Tue Nov 25 10:34:05 2008
@@ -19,15 +19,14 @@
package org.apache.fop.render;
-import org.apache.xmlgraphics.image.loader.Image;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
public interface ImageHandler {
/**
* Returns the priority for this image handler. A lower value means higher
priority. This
- * information is used to build the ordered/prioritized list of supported
ImageFlavors for
- * the PDF renderer. The built-in handlers use priorities between 100 and
999.
+ * information is used to build the ordered/prioritized list of supported
ImageFlavors.
+ * The built-in handlers use priorities between 100 and 999.
* @return a positive integer (>0) indicating the priority
*/
int getPriority();
@@ -39,8 +38,8 @@
ImageFlavor[] getSupportedImageFlavors();
/**
- * Returns the [EMAIL PROTECTED] Image} subclasses supported by this
instance.
- * @return the Image types
+ * Returns the [EMAIL PROTECTED] Class} subclass supported by this
instance.
+ * @return the image Class type
*/
- Class[] getSupportedImageClasses();
+ Class getSupportedImageClass();
}
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandler.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandler.java
Tue Nov 25 10:34:05 2008
@@ -31,6 +31,9 @@
import org.apache.fop.afp.AFPUnitConverter;
import org.apache.fop.render.ImageHandler;
+/**
+ * A base abstract AFP image handler
+ */
public abstract class AFPImageHandler implements ImageHandler {
private static final int X = 0;
private static final int Y = 1;
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerGraphics2D.java
Tue Nov 25 10:34:05 2008
@@ -41,10 +41,6 @@
ImageFlavor.GRAPHICS2D
};
- private static final Class[] CLASSES = new Class[] {
- ImageGraphics2D.class
- };
-
/** [EMAIL PROTECTED] */
public AFPDataObjectInfo generateDataObjectInfo(
AFPRendererImageInfo rendererImageInfo) throws IOException {
@@ -98,8 +94,8 @@
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageGraphics2D.class;
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawCCITTFax.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawCCITTFax.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawCCITTFax.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawCCITTFax.java
Tue Nov 25 10:34:05 2008
@@ -23,24 +23,18 @@
import org.apache.fop.afp.AFPDataObjectInfo;
import org.apache.fop.afp.AFPImageObjectInfo;
-import org.apache.fop.afp.AFPObjectAreaInfo;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
-import org.apache.xmlgraphics.image.loader.ImageSize;
import org.apache.xmlgraphics.image.loader.impl.ImageRawCCITTFax;
/**
- * PDFImageHandler implementation which handles CCITT encoded images (CCITT
fax group 3/4).
+ * AFPImageHandler implementation which handles CCITT encoded images (CCITT
fax group 3/4).
*/
-public class AFPImageHandlerRawCCITTFax extends AFPImageHandler {
+public class AFPImageHandlerRawCCITTFax extends
AbstractAFPImageHandlerRawStream {
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.RAW_CCITTFAX,
};
- private static final Class[] CLASSES = new Class[] {
- ImageRawCCITTFax.class,
- };
-
/** [EMAIL PROTECTED] */
public AFPDataObjectInfo generateDataObjectInfo(
AFPRendererImageInfo rendererImageInfo) throws IOException {
@@ -48,18 +42,10 @@
=
(AFPImageObjectInfo)super.generateDataObjectInfo(rendererImageInfo);
ImageRawCCITTFax ccitt = (ImageRawCCITTFax)
rendererImageInfo.getImage();
- imageObjectInfo.setCompression(ccitt.getCompression());
-
- AFPObjectAreaInfo objectAreaInfo = imageObjectInfo.getObjectAreaInfo();
- ImageSize imageSize = ccitt.getSize();
- int widthRes = (int) (imageSize.getDpiHorizontal() * 10);
- objectAreaInfo.setWidthRes(widthRes);
-
- int heightRes = (int) (imageSize.getDpiVertical() * 10);
- objectAreaInfo.setHeightRes(heightRes);
-
- imageObjectInfo.setInputStream(ccitt.createInputStream());
+ int compression = ccitt.getCompression();
+ imageObjectInfo.setCompression(compression);
+ imageObjectInfo.setBitsPerPixel(1);
return imageObjectInfo;
}
@@ -74,8 +60,8 @@
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageRawCCITTFax.class;
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRawStream.java
Tue Nov 25 10:34:05 2008
@@ -19,76 +19,28 @@
package org.apache.fop.render.afp;
-import java.io.IOException;
-import java.io.InputStream;
-
import org.apache.fop.afp.AFPDataObjectInfo;
-import org.apache.fop.afp.AFPObjectAreaInfo;
-import org.apache.fop.afp.AFPPaintingState;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
-import org.apache.xmlgraphics.image.loader.ImageInfo;
-import org.apache.xmlgraphics.image.loader.impl.ImageRawCCITTFax;
-import org.apache.xmlgraphics.image.loader.impl.ImageRawEPS;
-import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG;
import org.apache.xmlgraphics.image.loader.impl.ImageRawStream;
/**
* AFPImageHandler implementation which handles raw stream images.
*/
-public class AFPImageHandlerRawStream extends AFPImageHandler {
+public class AFPImageHandlerRawStream extends AbstractAFPImageHandlerRawStream
{
private static final ImageFlavor[] FLAVORS = new ImageFlavor[] {
ImageFlavor.RAW_JPEG,
- ImageFlavor.RAW_CCITTFAX,
ImageFlavor.RAW_EPS,
};
- private static final Class[] CLASSES = new Class[] {
- ImageRawJPEG.class,
- ImageRawCCITTFax.class,
- ImageRawEPS.class
- };
-
- /** [EMAIL PROTECTED] */
- public AFPDataObjectInfo generateDataObjectInfo(
- AFPRendererImageInfo rendererImageInfo) throws IOException {
- AFPDataObjectInfo dataObjectInfo =
super.generateDataObjectInfo(rendererImageInfo);
- ImageInfo imageInfo = rendererImageInfo.getImageInfo();
- String mimeType = imageInfo.getMimeType();
- if (mimeType != null) {
- dataObjectInfo.setMimeType(mimeType);
- }
- ImageRawStream rawStream = (ImageRawStream)
rendererImageInfo.getImage();
-
- AFPObjectAreaInfo objectAreaInfo = dataObjectInfo.getObjectAreaInfo();
-
- AFPRendererContext rendererContext
- = (AFPRendererContext)rendererImageInfo.getRendererContext();
- AFPInfo afpInfo = rendererContext.getInfo();
- AFPPaintingState paintingState = afpInfo.getPaintingState();
- int resolution = paintingState.getResolution();
- objectAreaInfo.setWidthRes(resolution);
- objectAreaInfo.setHeightRes(resolution);
-
- InputStream inputStream = rawStream.createInputStream();
- dataObjectInfo.setInputStream(inputStream);
-
- int dataHeight = rawStream.getSize().getHeightPx();
- dataObjectInfo.setDataHeight(dataHeight);
-
- int dataWidth = rawStream.getSize().getWidthPx();
- dataObjectInfo.setDataWidth(dataWidth);
- return dataObjectInfo;
- }
-
/** [EMAIL PROTECTED] */
public int getPriority() {
- return 100;
+ return 200;
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageRawStream.class;
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerRenderedImage.java
Tue Nov 25 10:34:05 2008
@@ -28,7 +28,6 @@
import org.apache.fop.afp.AFPObjectAreaInfo;
import org.apache.fop.afp.AFPPaintingState;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
-import org.apache.xmlgraphics.image.loader.impl.ImageBuffered;
import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
import org.apache.xmlgraphics.ps.ImageEncodingHelper;
import org.apache.xmlgraphics.util.MimeConstants;
@@ -43,27 +42,21 @@
ImageFlavor.RENDERED_IMAGE
};
- private static final Class[] CLASSES = new Class[] {
- ImageBuffered.class,
- ImageRendered.class
- };
-
/** [EMAIL PROTECTED] */
public AFPDataObjectInfo generateDataObjectInfo(
AFPRendererImageInfo rendererImageInfo) throws IOException {
AFPImageObjectInfo imageObjectInfo
=
(AFPImageObjectInfo)super.generateDataObjectInfo(rendererImageInfo);
- imageObjectInfo.setMimeType(MimeConstants.MIME_AFP_IOCA_FS45);
-
- AFPObjectAreaInfo objectAreaInfo = imageObjectInfo.getObjectAreaInfo();
AFPRendererContext rendererContext
= (AFPRendererContext)rendererImageInfo.getRendererContext();
AFPInfo afpInfo = rendererContext.getInfo();
AFPPaintingState paintingState = afpInfo.getPaintingState();
int resolution = paintingState.getResolution();
- objectAreaInfo.setWidthRes(resolution);
- objectAreaInfo.setHeightRes(resolution);
+
+ imageObjectInfo.setMimeType(MimeConstants.MIME_AFP_IOCA_FS45);
+ imageObjectInfo.setDataHeightRes(resolution);
+ imageObjectInfo.setDataWidthRes(resolution);
ImageRendered imageRendered = (ImageRendered) rendererImageInfo.img;
RenderedImage renderedImage = imageRendered.getRenderedImage();
@@ -92,6 +85,11 @@
}
imageObjectInfo.setData(imageData);
+ // set object area info
+ AFPObjectAreaInfo objectAreaInfo = imageObjectInfo.getObjectAreaInfo();
+ objectAreaInfo.setWidthRes(resolution);
+ objectAreaInfo.setHeightRes(resolution);
+
return imageObjectInfo;
}
@@ -106,8 +104,8 @@
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageRendered.class;
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerXML.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerXML.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerXML.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPImageHandlerXML.java
Tue Nov 25 10:34:05 2008
@@ -39,10 +39,6 @@
ImageFlavor.XML_DOM,
};
- private static final Class[] CLASSES = new Class[] {
- ImageXMLDOM.class,
- };
-
/** [EMAIL PROTECTED] */
public AFPDataObjectInfo generateDataObjectInfo(AFPRendererImageInfo
rendererImageInfo)
throws IOException {
@@ -64,8 +60,8 @@
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageXMLDOM.class;
}
/** [EMAIL PROTECTED] */
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=720561&r1=720560&r2=720561&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 Nov 25 10:34:05 2008
@@ -71,7 +71,6 @@
import org.apache.fop.render.RendererContext;
import org.apache.fop.render.afp.extensions.AFPElementMapping;
import org.apache.fop.render.afp.extensions.AFPPageSetup;
-import org.apache.fop.util.AbstractPaintingState;
import org.apache.xmlgraphics.image.loader.ImageException;
import org.apache.xmlgraphics.image.loader.ImageFlavor;
import org.apache.xmlgraphics.image.loader.ImageInfo;
@@ -743,15 +742,6 @@
}
/**
- * Returns the current AFP state
- *
- * @return the current AFP state
- */
- public AbstractPaintingState getState() {
- return this.paintingState;
- }
-
- /**
* Sets the default resource group file path
* @param filePath the default resource group file path
*/
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AFPRendererImageInfo.java
Tue Nov 25 10:34:05 2008
@@ -146,4 +146,17 @@
return this.pos;
}
+ /** [EMAIL PROTECTED] */
+ public String toString() {
+ return "AFPRendererImageInfo{\n"
+ + "\turi=" + uri + ",\n"
+ + "\tinfo=" + info + ",\n"
+ + "\tpos=" + pos + ",\n"
+ + "\torigin=" + origin + ",\n"
+ + "\timg=" + img + ",\n"
+ + "\tforeignAttributes=" + foreignAttributes + ",\n"
+ + "\trendererContext=" + rendererContext + "\n"
+ + "}";
+
+ }
}
Added:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java?rev=720561&view=auto
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
(added)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
Tue Nov 25 10:34:05 2008
@@ -0,0 +1,79 @@
+/*
+ * 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.afp;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.fop.afp.AFPDataObjectInfo;
+import org.apache.fop.afp.AFPObjectAreaInfo;
+import org.apache.fop.afp.AFPPaintingState;
+import org.apache.xmlgraphics.image.loader.ImageInfo;
+import org.apache.xmlgraphics.image.loader.ImageSize;
+import org.apache.xmlgraphics.image.loader.impl.ImageRawStream;
+
+/**
+ * A base abstract AFP raw stream image handler
+ */
+public abstract class AbstractAFPImageHandlerRawStream extends AFPImageHandler
{
+
+ /** [EMAIL PROTECTED] */
+ public AFPDataObjectInfo generateDataObjectInfo(
+ AFPRendererImageInfo rendererImageInfo) throws IOException {
+ AFPDataObjectInfo dataObjectInfo =
super.generateDataObjectInfo(rendererImageInfo);
+
+ ImageInfo imageInfo = rendererImageInfo.getImageInfo();
+ String mimeType = imageInfo.getMimeType();
+ if (mimeType != null) {
+ dataObjectInfo.setMimeType(mimeType);
+ }
+ ImageRawStream rawStream = (ImageRawStream)
rendererImageInfo.getImage();
+ InputStream inputStream = rawStream.createInputStream();
+ try {
+ dataObjectInfo.setData(IOUtils.toByteArray(inputStream));
+ } finally {
+ IOUtils.closeQuietly(inputStream);
+ }
+
+ int dataHeight = rawStream.getSize().getHeightPx();
+ dataObjectInfo.setDataHeight(dataHeight);
+
+ int dataWidth = rawStream.getSize().getWidthPx();
+ dataObjectInfo.setDataWidth(dataWidth);
+
+ ImageSize imageSize = rawStream.getSize();
+ dataObjectInfo.setDataHeightRes((int) (imageSize.getDpiHorizontal() *
10));
+ dataObjectInfo.setDataWidthRes((int) (imageSize.getDpiVertical() *
10));
+
+ // set object area info
+ AFPObjectAreaInfo objectAreaInfo = dataObjectInfo.getObjectAreaInfo();
+ AFPRendererContext rendererContext
+ = (AFPRendererContext)rendererImageInfo.getRendererContext();
+ AFPInfo afpInfo = rendererContext.getInfo();
+ AFPPaintingState paintingState = afpInfo.getPaintingState();
+ int resolution = paintingState.getResolution();
+ objectAreaInfo.setWidthRes(resolution);
+ objectAreaInfo.setHeightRes(resolution);
+
+ return dataObjectInfo;
+ }
+
+}
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/AbstractAFPImageHandlerRawStream.java
------------------------------------------------------------------------------
svn:keywords = Revision Id
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerGraphics2D.java
Tue Nov 25 10:34:05 2008
@@ -38,10 +38,6 @@
ImageFlavor.GRAPHICS2D,
};
- private static final Class[] CLASSES = new Class[] {
- ImageGraphics2D.class,
- };
-
/** [EMAIL PROTECTED] */
public PDFXObject generateImage(RendererContext context, Image image,
Point origin, Rectangle pos)
@@ -59,8 +55,8 @@
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageGraphics2D.class;
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawCCITTFax.java
Tue Nov 25 10:34:05 2008
@@ -41,10 +41,6 @@
ImageFlavor.RAW_CCITTFAX,
};
- private static final Class[] CLASSES = new Class[] {
- ImageRawCCITTFax.class,
- };
-
/** [EMAIL PROTECTED] */
public PDFXObject generateImage(RendererContext context, Image image,
Point origin, Rectangle pos)
@@ -74,8 +70,8 @@
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageRawCCITTFax.class;
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRawJPEG.java
Tue Nov 25 10:34:05 2008
@@ -41,10 +41,6 @@
ImageFlavor.RAW_JPEG,
};
- private static final Class[] CLASSES = new Class[] {
- ImageRawJPEG.class,
- };
-
/** [EMAIL PROTECTED] */
public PDFXObject generateImage(RendererContext context, Image image,
Point origin, Rectangle pos)
@@ -74,8 +70,8 @@
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageRawJPEG.class;
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerRenderedImage.java
Tue Nov 25 10:34:05 2008
@@ -42,11 +42,6 @@
ImageFlavor.RENDERED_IMAGE
};
- private static final Class[] CLASSES = new Class[] {
- ImageRendered.class,
- };
-
-
/** [EMAIL PROTECTED] */
public PDFXObject generateImage(RendererContext context, Image image,
Point origin, Rectangle pos)
@@ -76,8 +71,8 @@
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageRendered.class;
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerXML.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerXML.java?rev=720561&r1=720560&r2=720561&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerXML.java
(original)
+++
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/pdf/PDFImageHandlerXML.java
Tue Nov 25 10:34:05 2008
@@ -40,10 +40,6 @@
ImageFlavor.XML_DOM,
};
- private static final Class[] CLASSES = new Class[] {
- ImageXMLDOM.class,
- };
-
/** [EMAIL PROTECTED] */
public PDFXObject generateImage(RendererContext context, Image image,
Point origin, Rectangle pos)
@@ -64,8 +60,8 @@
}
/** [EMAIL PROTECTED] */
- public Class[] getSupportedImageClasses() {
- return CLASSES;
+ public Class getSupportedImageClass() {
+ return ImageXMLDOM.class;
}
/** [EMAIL PROTECTED] */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
