2004/01/17 22:54:24

[org.ibex.core.git] / src / org / xwt / translators / PNG.java

diff --git a/src/org/xwt/translators/PNG.java b/src/org/xwt/translators/PNG.java
index a3578f9..c20263f 100644 (file)
--- a/src/org/xwt/translators/PNG.java
+++ b/src/org/xwt/translators/PNG.java
@@ -33,8 +33,9 @@ public class PNG {
         if (g == null) g = new PNG();
         try {
             g._load(is, p);
+            p.data = g.data;
         } catch (Exception e) {
-            if (Log.on) Log.log(PNG.class, e);
+            if (Log.on) Log.info(PNG.class, e);
             return;
         }
         // FIXME: must reset fields
@@ -58,8 +59,8 @@ public class PNG {
         // consume the header
         if ((inputStream.read() != 137) || (inputStream.read() != 80) || (inputStream.read() != 78) || (inputStream.read() != 71) ||
             (inputStream.read() != 13) || (inputStream.read() != 10) || (inputStream.read() != 26) || (inputStream.read() != 10)) {
-            Log.log(this, "PNG: error: input file is not a PNG file");
-            data = new int[] { };
+            Log.info(this, "PNG: error: input file is not a PNG file");
+            data = p.data = new int[] { };
             p.width = p.height = 0;
             return;
         }
@@ -165,7 +166,7 @@ public class PNG {
     private void handletRNS() throws IOException {
         int chunkLen = chunkLength;
         if (palette == null) {
-            if (Log.on) Log.log(this, "warning: tRNS chunk encountered before pLTE; ignoring alpha channel");
+            if (Log.on) Log.info(this, "warning: tRNS chunk encountered before pLTE; ignoring alpha channel");
             inputStream.skip(chunkLength);
             return;
         }
@@ -558,7 +559,7 @@ public class PNG {
     private boolean complete = false;
     private boolean error = false;
 
-    private int[] data = null;
+    int[] data = null;
 
     private InputStream underlyingStream = null;
     private DataInputStream inputStream = null;