Mercurial > projects > dwt2
view org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngDecodingDataStream.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 | 7a2dd761a8b2 |
children |
line wrap: on
line source
/******************************************************************************* * 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 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * * Contributors: * IBM Corporation - initial API and implementation * Port to the D programming language: * Frank Benoit <benoit@tionex.de> *******************************************************************************/ module org.eclipse.swt.internal.image.PngDecodingDataStream; import java.io.InputStream; import org.eclipse.swt.SWT; import org.eclipse.swt.internal.image.PngLzBlockReader; public class PngDecodingDataStream : InputStream { alias InputStream.read read; InputStream stream; byte currentByte; int nextBitIndex; PngLzBlockReader lzBlockReader; int adlerValue; static const int PRIME = 65521; static const int MAX_BIT = 7; this(InputStream stream) { super(); this.stream = stream; nextBitIndex = MAX_BIT + 1; adlerValue = 1; lzBlockReader = new PngLzBlockReader(this); readCompressedDataHeader(); lzBlockReader.readNextBlockHeader(); } /** * This method should be called when the image decoder thinks * that all of the compressed image data has been read. This * method will ensure that the next data value is an end of * block marker. If there are more blocks after this one, * the method will read them and ensure that they are empty. */ void assertImageDataAtEnd() { lzBlockReader.assertCompressedDataAtEnd(); } public override void close() { assertImageDataAtEnd(); checkAdler(); } int getNextIdatBits(int length) { int value = 0; for (int i = 0; i < length; i++) { value |= (getNextIdatBit() << i); } return value; } int getNextIdatBit() { if (nextBitIndex > MAX_BIT) { currentByte = getNextIdatByte(); nextBitIndex = 0; } return (currentByte & (1 << nextBitIndex)) >> nextBitIndex++; } byte getNextIdatByte() { byte nextByte = cast(byte)stream.read(); nextBitIndex = MAX_BIT + 1; return nextByte; } void updateAdler(byte value) { int low = adlerValue & 0xFFFF; int high = (adlerValue >> 16) & 0xFFFF; int valueInt = value & 0xFF; low = (low + valueInt) % PRIME; high = (low + high) % PRIME; adlerValue = (high << 16) | low; } public override int read() { byte nextDecodedByte = lzBlockReader.getNextByte(); updateAdler(nextDecodedByte); return nextDecodedByte & 0xFF; } public override int read(byte[] buffer, int off, int len) { for (int i = 0; i < len; i++) { int b = read(); if (b is -1) return i; buffer[off + i] = cast(byte)b; } return len; } void error() { SWT.error(SWT.ERROR_INVALID_IMAGE); } private void readCompressedDataHeader() { byte headerByte1 = getNextIdatByte(); byte headerByte2 = getNextIdatByte(); int number = ((headerByte1 & 0xFF) << 8) | (headerByte2 & 0xFF); if (number % 31 !is 0) error(); int compressionMethod = headerByte1 & 0x0F; if (compressionMethod !is 8) error(); int windowSizeHint = (headerByte1 & 0xF0) >> 4; if (windowSizeHint > 7) error(); int windowSize = (1 << (windowSizeHint + 8)); lzBlockReader.setWindowSize(windowSize); int dictionary = (headerByte2 & (1 << 5)); if (dictionary !is 0) error(); // int compressionLevel = (headerByte2 & 0xC0) >> 6; } void checkAdler() { int storedAdler = 0; storedAdler |= ((getNextIdatByte() & 0xFF) << 24); storedAdler |= ((getNextIdatByte() & 0xFF) << 16); storedAdler |= ((getNextIdatByte() & 0xFF) << 8); storedAdler |= (getNextIdatByte() & 0xFF); if (storedAdler !is adlerValue) error(); } }