diff options
| -rw-r--r-- | src/java-1.4/org/apache/fop/image/ImageIOImage.java | 5 | ||||
| -rw-r--r-- | status.xml | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/java-1.4/org/apache/fop/image/ImageIOImage.java b/src/java-1.4/org/apache/fop/image/ImageIOImage.java index ebb4a09eb..1af4f0b9a 100644 --- a/src/java-1.4/org/apache/fop/image/ImageIOImage.java +++ b/src/java-1.4/org/apache/fop/image/ImageIOImage.java @@ -64,7 +64,10 @@ public class ImageIOImage extends AbstractFopImage { * @see org.apache.fop.image.AbstractFopImage#loadDimensions() */ protected boolean loadDimensions() { - if (this.bitmaps == null) { + if ((this.width > 0) && (this.height > 0)) { + return true; + } + else if (this.bitmaps == null) { return loadBitmap(); } return true; diff --git a/status.xml b/status.xml index 5e11e4247..49750b3d2 100644 --- a/status.xml +++ b/status.xml @@ -28,6 +28,9 @@ <changes> <release version="FOP Trunk"> + <action context="Code" dev="JM" type="fix" fixes-bug="41488" due-to="Dominic Brügger"> + Fix for NPE with PNG images for RTF output. + </action> <action context="Code" dev="JM" type="add"> Support for soft masks (transparency) with ImageIO image adapter. </action> |