Mercurial > projects > dwt2
annotate org.eclipse.swt.gtk.linux.x86/src/org/eclipse/swt/internal/image/TIFFRandomFileAccess.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 |
| rev | line source |
|---|---|
| 25 | 1 /******************************************************************************* |
| 2 * Copyright (c) 2000, 2003 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.TIFFRandomFileAccess; | |
| 14 | |
|
120
536e43f63c81
Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661
Denis Shelomovskij <verylonglogin.reg@gmail.com>
parents:
49
diff
changeset
|
15 import org.eclipse.swt.internal.image.LEDataInputStream; |
| 25 | 16 import java.lang.all; |
| 17 | |
| 18 final class TIFFRandomFileAccess { | |
| 19 | |
| 20 LEDataInputStream inputStream; | |
| 21 int start, current, next; | |
| 22 byte[][] buffers; | |
| 23 | |
|
49
7a2dd761a8b2
more work until dmd 2.026 linux segfaults.
Frank Benoit <benoit@tionex.de>
parents:
48
diff
changeset
|
24 static const int CHUNK_SIZE = 8192; |
|
7a2dd761a8b2
more work until dmd 2.026 linux segfaults.
Frank Benoit <benoit@tionex.de>
parents:
48
diff
changeset
|
25 static const int LIST_SIZE = 128; |
| 25 | 26 |
| 27 public this(LEDataInputStream stream) { | |
| 28 inputStream = stream; | |
| 29 start = current = next = inputStream.getPosition(); | |
| 30 buffers = new byte[][](LIST_SIZE); | |
| 31 } | |
| 32 | |
| 33 void seek(int pos) { | |
| 34 if (pos is current) return; | |
| 35 if (pos < start) throw new IOException( "pos < start" ); | |
| 36 current = pos; | |
| 37 if (current > next) { | |
| 38 int n = current - next; | |
| 39 /* store required bytes */ | |
| 40 int index = next / CHUNK_SIZE; | |
| 41 int offset = next % CHUNK_SIZE; | |
| 42 while (n > 0) { | |
| 43 if (index >= buffers.length) { | |
| 44 byte[][] oldBuffers = buffers; | |
| 45 buffers = new byte[][]( Math.max(index + 1, oldBuffers.length + LIST_SIZE) ); | |
| 46 System.arraycopy(oldBuffers, 0, buffers, 0, oldBuffers.length); | |
| 47 } | |
| 48 if (buffers[index] is null) buffers[index] = new byte[CHUNK_SIZE]; | |
| 49 int cnt = inputStream.read(buffers[index], offset, Math.min(n, CHUNK_SIZE - offset)); | |
| 50 n -= cnt; | |
| 51 next += cnt; | |
| 52 index++; | |
| 53 offset = 0; | |
| 54 } | |
| 55 } | |
| 56 } | |
| 57 | |
| 58 void read(byte b[]) { | |
| 59 int size = b.length; | |
| 60 int nCached = Math.min(size, next - current); | |
| 61 int nMissing = size - next + current; | |
| 62 int destNext = 0; | |
| 63 if (nCached > 0) { | |
| 64 /* Get cached bytes */ | |
| 65 int index = current / CHUNK_SIZE; | |
| 66 int offset = current % CHUNK_SIZE; | |
| 67 while (nCached > 0) { | |
| 68 int cnt = Math.min(nCached, CHUNK_SIZE - offset); | |
| 69 System.arraycopy(buffers[index], offset, b, destNext, cnt); | |
| 70 nCached -= cnt; | |
| 71 destNext += cnt; | |
| 72 index++; | |
| 73 offset = 0; | |
| 74 } | |
| 75 } | |
| 76 if (nMissing > 0) { | |
| 77 /* Read required bytes */ | |
| 78 int index = next / CHUNK_SIZE; | |
| 79 int offset = next % CHUNK_SIZE; | |
| 80 while (nMissing > 0) { | |
| 81 if (index >= buffers.length) { | |
| 82 byte[][] oldBuffers = buffers; | |
| 83 buffers = new byte[][](Math.max(index, oldBuffers.length + LIST_SIZE)); | |
| 84 System.arraycopy(oldBuffers, 0, buffers, 0, oldBuffers.length); | |
| 85 } | |
| 86 if (buffers[index] is null) buffers[index] = new byte[CHUNK_SIZE]; | |
| 87 int cnt = inputStream.read(buffers[index], offset, Math.min(nMissing, CHUNK_SIZE - offset)); | |
| 88 System.arraycopy(buffers[index], offset, b, destNext, cnt); | |
| 89 nMissing -= cnt; | |
| 90 next += cnt; | |
| 91 destNext += cnt; | |
| 92 index++; | |
| 93 offset = 0; | |
| 94 } | |
| 95 } | |
| 96 current += size; | |
| 97 } | |
| 98 | |
| 99 } |