Mercurial > projects > dwt2
annotate org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/PngChunkReader.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 | f713da8bc051 |
| children |
| rev | line source |
|---|---|
| 25 | 1 /******************************************************************************* |
| 2 * Copyright (c) 2000, 2006 IBM Corporation and others. | |
| 3 * All rights reserved. This program and the accompanying materials | |
| 4 * are made available under the terms of the Eclipse Public License v1.0 | |
| 5 * which accompanies this distribution, and is available at | |
| 6 * http://www.eclipse.org/legal/epl-v10.html | |
| 7 * | |
| 8 * Contributors: | |
| 9 * IBM Corporation - initial API and implementation | |
| 10 * Port to the D programming language: | |
| 11 * Frank Benoit <benoit@tionex.de> | |
| 12 *******************************************************************************/ | |
| 13 module org.eclipse.swt.internal.image.PngChunkReader; | |
| 14 | |
| 15 | |
| 16 import org.eclipse.swt.SWT; | |
| 17 import org.eclipse.swt.internal.image.LEDataInputStream; | |
| 18 import org.eclipse.swt.internal.image.PngFileReadState; | |
| 19 import org.eclipse.swt.internal.image.PngIhdrChunk; | |
| 20 import org.eclipse.swt.internal.image.PngPlteChunk; | |
| 21 import org.eclipse.swt.internal.image.PngTrnsChunk; | |
| 22 import org.eclipse.swt.internal.image.PngChunk; | |
| 23 | |
| 24 public class PngChunkReader { | |
| 25 LEDataInputStream inputStream; | |
| 26 PngFileReadState readState; | |
| 27 PngIhdrChunk headerChunk; | |
| 28 PngPlteChunk paletteChunk; | |
| 29 | |
| 30 this(LEDataInputStream inputStream) { | |
| 31 this.inputStream = inputStream; | |
| 32 readState = new PngFileReadState(); | |
| 33 headerChunk = null; | |
| 34 } | |
| 35 | |
| 36 PngIhdrChunk getIhdrChunk() { | |
| 37 if (headerChunk is null) { | |
| 38 PngChunk chunk = PngChunk.readNextFromStream(inputStream); | |
| 39 if (chunk is null) SWT.error(SWT.ERROR_INVALID_IMAGE); | |
| 40 if(( headerChunk = cast(PngIhdrChunk) chunk ) !is null ){ | |
| 41 headerChunk.validate(readState, null); | |
| 42 } | |
| 43 else{ | |
| 44 SWT.error(SWT.ERROR_INVALID_IMAGE); | |
| 45 } | |
| 46 } | |
| 47 return headerChunk; | |
| 48 } | |
| 49 | |
| 50 PngChunk readNextChunk() { | |
| 51 if (headerChunk is null) return getIhdrChunk(); | |
| 52 | |
| 53 PngChunk chunk = PngChunk.readNextFromStream(inputStream); | |
| 54 if (chunk is null) SWT.error(SWT.ERROR_INVALID_IMAGE); | |
| 55 switch (chunk.getChunkType()) { | |
| 56 case PngChunk.CHUNK_tRNS: | |
| 57 (cast(PngTrnsChunk) chunk).validate(readState, headerChunk, paletteChunk); | |
| 58 break; | |
| 59 case PngChunk.CHUNK_PLTE: | |
| 60 chunk.validate(readState, headerChunk); | |
| 61 paletteChunk = cast(PngPlteChunk) chunk; | |
| 62 break; | |
| 63 default: | |
| 64 chunk.validate(readState, headerChunk); | |
| 65 } | |
| 66 if (readState.readIDAT && !(chunk.getChunkType() is PngChunk.CHUNK_IDAT)) { | |
| 67 readState.readPixelData = true; | |
| 68 } | |
| 69 return chunk; | |
| 70 } | |
| 71 | |
| 72 bool readPixelData() { | |
| 73 return readState.readPixelData; | |
| 74 } | |
| 75 | |
| 76 bool hasMoreChunks() { | |
| 77 return !readState.readIEND; | |
| 78 } | |
| 79 | |
| 80 } |