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 ke...@apache.org on 2002/08/02 10:47:02 UTC
cvs commit: xml-fop/src/org/apache/fop/render/pdf FopPDFImage.java
keiron 2002/08/02 01:47:02
Modified: src/org/apache/fop/image AbstractFopImage.java
JimiImage.java
src/org/apache/fop/render/pdf FopPDFImage.java
Log:
get Jimi working again and correctly reporting errors
fixed some eps npe's
Revision Changes Path
1.11 +3 -3 xml-fop/src/org/apache/fop/image/AbstractFopImage.java
Index: AbstractFopImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/AbstractFopImage.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractFopImage.java 23 Jul 2002 10:59:09 -0000 1.10
+++ AbstractFopImage.java 2 Aug 2002 08:47:02 -0000 1.11
@@ -49,7 +49,7 @@
protected FopImage.ImageInfo imageInfo = null;
/**
- * Image color space (org.apache.fop.datatypes.ColorSpace).
+ * Image color space (java.awt.color.ColorSpace).
*/
protected ColorSpace m_colorSpace = null;
@@ -163,7 +163,7 @@
/**
* Return the image color space.
- * @return the image color space (org.apache.fop.datatypes.ColorSpace)
+ * @return the image color space (java.awt.color.ColorSpace)
*/
public ColorSpace getColorSpace() {
return this.m_colorSpace;
1.13 +28 -10 xml-fop/src/org/apache/fop/image/JimiImage.java
Index: JimiImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/JimiImage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- JimiImage.java 8 Jul 2002 08:48:26 -0000 1.12
+++ JimiImage.java 2 Aug 2002 08:47:02 -0000 1.13
@@ -20,6 +20,9 @@
// FOP
import org.apache.fop.pdf.PDFColor;
import org.apache.fop.image.analyser.ImageReader;
+import org.apache.fop.fo.FOUserAgent;
+
+import org.apache.avalon.framework.logger.Logger;
/**
* FopImage object for several images types, using Jimi.
@@ -38,7 +41,23 @@
}
}
- protected void loadImage() {
+ protected boolean loadDimensions(FOUserAgent ua) {
+ if(this.m_bitmaps == null) {
+ loadImage(ua.getLogger());
+ }
+
+ return this.m_bitmaps != null;
+ }
+
+ protected boolean loadBitmap(FOUserAgent ua) {
+ if(this.m_bitmaps == null) {
+ loadImage(ua.getLogger());
+ }
+
+ return this.m_bitmaps != null;
+ }
+
+ protected void loadImage(Logger log) {
int[] tmpMap = null;
try {
ImageProducer ip =
@@ -56,9 +75,9 @@
try {
tmpMap = consumer.getImage();
} catch (Exception ex) {
- /*throw new FopImageException("Image grabbing interrupted : "
- + ex.getMessage());
- */}
+ log.error("Image grabbing interrupted", ex);
+ return;
+ }
ColorModel cm = consumer.getColorModel();
this.m_bitsPerPixel = 8;
@@ -118,11 +137,10 @@
this.m_isTransparent = false;
}
} catch (Exception ex) {
- /*throw new FopImageException("Error while loading image "
- + this.m_href.toString() + " : "
- + ex.getClass() + " - "
- + ex.getMessage());
- */}
+ log.error("Error while loading image "
+ + this.m_href.toString(), ex);
+ return;
+ }
// Should take care of the ColorSpace and bitsPerPixel
1.4 +7 -5 xml-fop/src/org/apache/fop/render/pdf/FopPDFImage.java
Index: FopPDFImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/FopPDFImage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FopPDFImage.java 4 Jul 2002 14:08:20 -0000 1.3
+++ FopPDFImage.java 2 Aug 2002 08:47:02 -0000 1.4
@@ -162,14 +162,16 @@
byte[] preBytes = preamble.toString().getBytes();
byte[] postBytes = post.toString().getBytes();
+ byte[] epsBytes = ((EPSImage)fopImage).getEPSImage();
+ int epsLength = epsBytes.length;
byte[] imgData = new byte[preBytes.length + postBytes.length +
- fopImage.getBitmaps().length];
+ epsLength];
System.arraycopy (preBytes, 0, imgData, 0, preBytes.length);
- System.arraycopy (fopImage.getBitmaps(), 0, imgData,
- preBytes.length, fopImage.getBitmaps().length);
+ System.arraycopy (epsBytes, 0, imgData,
+ preBytes.length, epsBytes.length);
System.arraycopy (postBytes, 0, imgData,
- preBytes.length + fopImage.getBitmaps().length,
+ preBytes.length + epsBytes.length,
postBytes.length);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org