Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 12:05:29 -04:00
Code Issues Projects Releases Wiki Activity

Now more efficient subsampling for RLE-encoding. No longer decodes skipped rows.

Browse Source
This commit is contained in:
Harald Kuhr 2009-09-23 20:21:46 +02:00
parent cac1212944
commit 9a05cca4c8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java
View File

@ -315,12 +315,12 @@ public class PSDImageReader extends ImageReaderBase {
for (y = 0; y < mHeader.mHeight; y++) { for (y = 0; y < mHeader.mHeight; y++) {
int length = offsets[c * mHeader.mHeight + y]; int length = offsets[c * mHeader.mHeight + y];
// System.out.println("channel: " + c + " line: " + y + " length: " + length); // System.out.println("channel: " + c + " line: " + y + " length: " + length);
// TODO: Skip rows without decoding
DataInputStream input = PSDUtil.createPackBitsStream(mImageInput, length);
// TODO: Sometimes need to read the line y == source.y + source.height... // TODO: Sometimes need to read the line y == source.y + source.height...
// Read entire line, if within source region and sampling // Read entire line, if within source region and sampling
if (y >= source.y && y < source.y + source.height && y % ySub == 0) { if (y >= source.y && y < source.y + source.height && y % ySub == 0) {
DataInputStream input = PSDUtil.createPackBitsStream(mImageInput, length);
for (x = 0; x < mHeader.mWidth; x++) { for (x = 0; x < mHeader.mWidth; x++) {
byte value = input.readByte(); byte value = input.readByte();
@ -343,13 +343,13 @@ public class PSDImageReader extends ImageReaderBase {
for (int i = 0; i < dest.width; i++) { for (int i = 0; i < dest.width; i++) {
data[offset + i * channels] = line[source.x + i * xSub]; data[offset + i * channels] = line[source.x + i * xSub];
} }
input.close();
} }
else { else {
// TODO: (If not reading compressed) skip data mImageInput.skipBytes(length);
} }
input.close();
if (abortRequested()) { if (abortRequested()) {
break; break;
} }
@ -613,6 +613,7 @@ public class PSDImageReader extends ImageReaderBase {
// param.setSourceRegion(new Rectangle(200, 200, 400, 400)); // param.setSourceRegion(new Rectangle(200, 200, 400, 400));
// param.setSourceRegion(new Rectangle(300, 200)); // param.setSourceRegion(new Rectangle(300, 200));
param.setSourceSubsampling(3, 3, 0, 0); param.setSourceSubsampling(3, 3, 0, 0);
// param.setSourceSubsampling(2, 2, 0, 0);
BufferedImage image = imageReader.read(0, param); BufferedImage image = imageReader.read(0, param);
System.out.println("time: " + (System.currentTimeMillis() - start)); System.out.println("time: " + (System.currentTimeMillis() - start));
System.out.println("image: " + image); System.out.println("image: " + image);