diff org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngDeflater.d @ 120:536e43f63c81

Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661 ===D2=== * added [Try]Immutable/Const/Shared templates to work with differenses in D1/D2 instead of version statements used these templates to work with strict type storage rules of dmd-2.053 * com.ibm.icu now also compilable with D2, but not tested yet * small fixes Snippet288 - shared data is in TLS ===Phobos=== * fixed critical bugs in Phobos implemention completely incorrect segfault prone fromStringz (Linux's port ruthless killer) terrible, incorrect StringBuffer realization (StyledText killer) * fixed small bugs as well Snippet72 - misprint in the snippet * implemented missed functionality for Phobos ByteArrayOutputStream implemented (image loading available) formatting correctly works for all DWT's cases As a result, folowing snippets now works with Phobos (Snippet### - what is fixed): Snippet24, 42, 111, 115, 130, 235, 276 - bad string formatting Snippet48, 282 - crash on image loading Snippet163, 189, 211, 213, 217, 218, 222 - crash on copy/cut in StyledText Snippet244 - hang-up ===Tango=== * few changes for the latest Tango trunc-r5661 * few small performance improvments ===General=== * implMissing-s for only one version changed to implMissingInTango/InPhobos * incorrect calls to Format in toString-s fixed * fixed loading \uXXXX characters in ResourceBundle * added good UTF-8 support for StyledText, TextLayout (Win32) and friends UTF functions revised and tested. It is now in java.nonstandard.*Utf modules StyledText and TextLayout (Win32) modules revised for UTF-8 support * removed small diferences in most identical files in *.swt.* folders *.swt.internal.image, *.swt.events and *.swt.custom are identical in Win32/Linux32 now 179 of 576 (~31%) files in *.swt.* folders are fully identical * Win32: snippets now have right subsystem, pretty icons and native system style controls * small fixes in snippets Snippet44 - it's not Snippet44 Snippet212 - functions work with different images and offsets arrays Win32: Snippet282 - crash on close if the button has an image Snippet293 - setGrayed is commented and others Win32: As a result, folowing snippets now works Snippet68 - color doesn't change Snippet163, 189, 211, 213, 217, 218, 222 - UTF-8 issues (see above) Snippet193 - no tabel headers
author Denis Shelomovskij <verylonglogin.reg@gmail.com>
date Sat, 09 Jul 2011 15:50:20 +0300
parents 0ecb2b338560
children
line wrap: on
line diff
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngDeflater.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngDeflater.d	Sat Jul 09 15:50:20 2011 +0300
@@ -13,6 +13,7 @@
 module org.eclipse.swt.internal.image.PngDeflater;
 
 import java.io.ByteArrayOutputStream;
+import java.lang.all;
 
 public class PngDeflater {
 
@@ -22,7 +23,7 @@
     static const int MAX_MATCHES = 32;
     static const int HASH = 8209;
 
-    byte[] istr;
+    TryConst!(byte)[] istr;
     int inLength;
 
     ByteArrayOutputStream bytes;
@@ -120,8 +121,8 @@
 
 }
 
-static /*const*/ Code lengthCodes[];
-static /*const*/ Code distanceCodes[];
+static TryConst!(Code[]) lengthCodes;
+static TryConst!(Code[]) distanceCodes;
 
 static this() {
     lengthCodes = [
@@ -219,7 +220,7 @@
 
 }
 
-int hash(byte[] bytes) {
+int hash(in byte[] bytes) {
 
     int hash = ((bytes[0] & 0xff) << 24 | (bytes[1] & 0xff) << 16 | (bytes[2] & 0xff) << 8) % HASH;
     if (hash < 0) {
@@ -268,7 +269,7 @@
 
 }
 
-Code findCode(int value, Code[] codes) {
+TryConst!(Code) findCode(int value, in Code[] codes) {
 
     int i, j, k;
 
@@ -291,7 +292,6 @@
 
 void outputMatch(int length, int distance) {
 
-    Code d, l;
     int thisLength;
 
     while (length > 0) {
@@ -313,7 +313,7 @@
         length = length - thisLength;
 
         // find length code
-        l = findCode(thisLength, lengthCodes);
+        auto l = findCode(thisLength, lengthCodes);
 
         // transmit the length code
         // 256 through 279 are 7 bits long starting at 0000000
@@ -331,7 +331,7 @@
         }
 
         // find distance code
-        d = findCode(distance, distanceCodes);
+        auto d = findCode(distance, distanceCodes);
 
         // transmit the distance code
         // 5 bits long starting at 00000
@@ -593,7 +593,7 @@
 
 }
 
-public byte[] deflate(byte[] input) {
+public byte[] deflate(in byte[] input) {
 
     istr = input;
     inLength = input.length;