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/20 08:52:37 UTC
cvs commit: xml-fop/src/org/apache/fop/image JimiImage.java JpegImage.java
keiron 2002/08/19 23:52:37
Modified: src/org/apache/fop/image JimiImage.java JpegImage.java
Log:
fix for invalid colorspace on jpeg
also catches error when jimi not in classpath
Revision Changes Path
1.14 +2 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JimiImage.java 2 Aug 2002 08:47:02 -0000 1.13
+++ JimiImage.java 20 Aug 2002 06:52:37 -0000 1.14
@@ -136,7 +136,7 @@
} else {
this.m_isTransparent = false;
}
- } catch (Exception ex) {
+ } catch (Throwable ex) {
log.error("Error while loading image "
+ this.m_href.toString(), ex);
return;
1.7 +9 -1 xml-fop/src/org/apache/fop/image/JpegImage.java
Index: JpegImage.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/image/JpegImage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JpegImage.java 19 Aug 2002 11:54:53 -0000 1.6
+++ JpegImage.java 20 Aug 2002 06:52:37 -0000 1.7
@@ -94,6 +94,10 @@
// howto create CMYK color space
this.m_colorSpace = ColorSpace.getInstance(
ColorSpace.CS_CIEXYZ);
+ } else {
+ ua.getLogger().error("Unknown ColorSpace for image: "
+ + this.m_href.toString());
+ return false;
}
found_dimensions = true;
@@ -153,6 +157,10 @@
return false;
}
iccProfile = ICC_Profile.getInstance(iccStream.toByteArray());
+ } else if(this.m_colorSpace == null) {
+ ua.getLogger().error("ColorSpace not specified for image: "
+ + this.m_href.toString());
+ return false;
}
return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org