--- a/dwt/internal/image/PngDeflater.d	Mon May 05 00:12:38 2008 +0200
+++ b/dwt/internal/image/PngDeflater.d	Sat May 17 17:34:28 2008 +0200
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*******************************************************************************
  * Copyright (c) 2000, 2006 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -36,7 +36,6 @@
     int nextWindow;
 
 public this(){
-    static_this();
     bytes = new ByteArrayOutputStream(1024);
 }
 
@@ -56,7 +55,7 @@
 
 }
 
-class Match {
+static class Match {
 
     int length, distance;
 
@@ -121,82 +120,72 @@
 
 }
 
-private static /+const+/ Code lengthCodes[];
-private static /+const+/ Code distanceCodes[];
+static const Code lengthCodes[];
+static const Code distanceCodes[];
 
-private static bool static_this_completed = false;
-private static void static_this() {
-    if( static_this_completed ){
-        return;
-    }
-    synchronized {
-        if( static_this_completed ){
-            return;
-        }
-        lengthCodes = [
-            new Code(257, 0, 3, 3),
-            new Code(258, 0, 4, 4),
-            new Code(259, 0, 5, 5),
-            new Code(260, 0, 6, 6),
-            new Code(261, 0, 7, 7),
-            new Code(262, 0, 8, 8),
-            new Code(263, 0, 9, 9),
-            new Code(264, 0, 10, 10),
-            new Code(265, 1, 11, 12),
-            new Code(266, 1, 13, 14),
-            new Code(267, 1, 15, 16),
-            new Code(268, 1, 17, 18),
-            new Code(269, 2, 19, 22),
-            new Code(270, 2, 23, 26),
-            new Code(271, 2, 27, 30),
-            new Code(272, 2, 31, 34),
-            new Code(273, 3, 35, 42),
-            new Code(274, 3, 43, 50),
-            new Code(275, 3, 51, 58),
-            new Code(276, 3, 59, 66),
-            new Code(277, 4, 67, 82),
-            new Code(278, 4, 83, 98),
-            new Code(279, 4, 99, 114),
-            new Code(280, 4, 115, 130),
-            new Code(281, 5, 131, 162),
-            new Code(282, 5, 163, 194),
-            new Code(283, 5, 195, 226),
-            new Code(284, 5, 227, 257),
-            new Code(285, 0, 258, 258)];
+static this() {
+    lengthCodes = [
+        new Code(257, 0, 3, 3),
+        new Code(258, 0, 4, 4),
+        new Code(259, 0, 5, 5),
+        new Code(260, 0, 6, 6),
+        new Code(261, 0, 7, 7),
+        new Code(262, 0, 8, 8),
+        new Code(263, 0, 9, 9),
+        new Code(264, 0, 10, 10),
+        new Code(265, 1, 11, 12),
+        new Code(266, 1, 13, 14),
+        new Code(267, 1, 15, 16),
+        new Code(268, 1, 17, 18),
+        new Code(269, 2, 19, 22),
+        new Code(270, 2, 23, 26),
+        new Code(271, 2, 27, 30),
+        new Code(272, 2, 31, 34),
+        new Code(273, 3, 35, 42),
+        new Code(274, 3, 43, 50),
+        new Code(275, 3, 51, 58),
+        new Code(276, 3, 59, 66),
+        new Code(277, 4, 67, 82),
+        new Code(278, 4, 83, 98),
+        new Code(279, 4, 99, 114),
+        new Code(280, 4, 115, 130),
+        new Code(281, 5, 131, 162),
+        new Code(282, 5, 163, 194),
+        new Code(283, 5, 195, 226),
+        new Code(284, 5, 227, 257),
+        new Code(285, 0, 258, 258)];
 
-        distanceCodes = [
-            new Code(0, 0, 1, 1),
-            new Code(1, 0, 2, 2),
-            new Code(2, 0, 3, 3),
-            new Code(3, 0, 4, 4),
-            new Code(4, 1, 5, 6),
-            new Code(5, 1, 7, 8),
-            new Code(6, 2, 9, 12),
-            new Code(7, 2, 13, 16),
-            new Code(8, 3, 17, 24),
-            new Code(9, 3, 25, 32),
-            new Code(10, 4, 33, 48),
-            new Code(11, 4, 49, 64),
-            new Code(12, 5, 65, 96),
-            new Code(13, 5, 97, 128),
-            new Code(14, 6, 129, 192),
-            new Code(15, 6, 193, 256),
-            new Code(16, 7, 257, 384),
-            new Code(17, 7, 385, 512),
-            new Code(18, 8, 513, 768),
-            new Code(19, 8, 769, 1024),
-            new Code(20, 9, 1025, 1536),
-            new Code(21, 9, 1537, 2048),
-            new Code(22, 10, 2049, 3072),
-            new Code(23, 10, 3073, 4096),
-            new Code(24, 11, 4097, 6144),
-            new Code(25, 11, 6145, 8192),
-            new Code(26, 12, 8193, 12288),
-            new Code(27, 12, 12289, 16384),
-            new Code(28, 13, 16385, 24576),
-            new Code(29, 13, 24577, 32768)];
-        static_this_completed = true;
-    }
+    distanceCodes = [
+        new Code(0, 0, 1, 1),
+        new Code(1, 0, 2, 2),
+        new Code(2, 0, 3, 3),
+        new Code(3, 0, 4, 4),
+        new Code(4, 1, 5, 6),
+        new Code(5, 1, 7, 8),
+        new Code(6, 2, 9, 12),
+        new Code(7, 2, 13, 16),
+        new Code(8, 3, 17, 24),
+        new Code(9, 3, 25, 32),
+        new Code(10, 4, 33, 48),
+        new Code(11, 4, 49, 64),
+        new Code(12, 5, 65, 96),
+        new Code(13, 5, 97, 128),
+        new Code(14, 6, 129, 192),
+        new Code(15, 6, 193, 256),
+        new Code(16, 7, 257, 384),
+        new Code(17, 7, 385, 512),
+        new Code(18, 8, 513, 768),
+        new Code(19, 8, 769, 1024),
+        new Code(20, 9, 1025, 1536),
+        new Code(21, 9, 1537, 2048),
+        new Code(22, 10, 2049, 3072),
+        new Code(23, 10, 3073, 4096),
+        new Code(24, 11, 4097, 6144),
+        new Code(25, 11, 6145, 8192),
+        new Code(26, 12, 8193, 12288),
+        new Code(27, 12, 12289, 16384),
+        new Code(28, 13, 16385, 24576),
+        new Code(29, 13, 24577, 32768)];
 }
 
 void writeShortLSB(ByteArrayOutputStream baos, int theShort) {