From 838b976e8a371dbec1c6d3a4780e653442aff157 Mon Sep 17 00:00:00 2001
From: Jeremias Maerki <jeremias@apache.org>
Date: Sat, 3 Feb 2007 22:31:34 +0000
Subject: [PATCH] =?utf8?q?Bugzilla=20#41488:=20Fix=20for=20NPE=20with=20PN?=
 =?utf8?q?G=20images=20for=20RTF=20output.=20Submitted=20by:=20Dominic=20B?=
 =?utf8?q?r=C3=BCgger=20<bruegger.at.puzzle.ch>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@503326 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java-1.4/org/apache/fop/image/ImageIOImage.java | 5 ++++-
 status.xml                                          | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

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>
-- 
2.39.5