--- a/dwt/internal/image/PNGFileFormat.d	Mon May 05 00:12:38 2008 +0200
+++ b/dwt/internal/image/PNGFileFormat.d	Sat May 17 17:34:28 2008 +0200
@@ -29,9 +29,9 @@
 import dwt.internal.image.PngEncoder;
 import dwt.internal.image.PngInputStream;
 import dwt.internal.image.PngDecodingDataStream;
+import dwt.dwthelper.utils;
 
 import dwt.dwthelper.BufferedInputStream;
-import dwt.dwthelper.System;
 
 import tango.core.Exception;
 
@@ -176,7 +176,7 @@
         if ((signature[4] & 0xFF) !is 13) return false; //<RETURN>
         if ((signature[5] & 0xFF) !is 10) return false; //<LINEFEED>
         if ((signature[6] & 0xFF) !is 26) return false; //<CTRL/Z>
-        if ((signature[7] & 0xFF) !is 10) return false; //<LINEFEED>
+        if ((signature[7] & 0xFF) !is 10) return false; //<LINEFEED>        
         return true;
     } catch (Exception e) {
         return false;
@@ -314,7 +314,7 @@
     bool use3_2 = true;//System.getProperty("dwt.internal.image.PNGFileFormat_3.2") !is null;
     InputStream inflaterStream = use3_2 ? null : Compatibility.newInflaterInputStream(stream);
     if (inflaterStream !is null) {
-        stream = new BufferedInputStream(inflaterStream);
+        stream = inflaterStream;
     } else {
         stream = new PngDecodingDataStream(stream);
     }