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

Fixed some alignment issues in the resources.

Browse Source
This commit is contained in:
Harald Kuhr 2009-09-16 00:10:45 +02:00
parent 4baafd2e4d
commit 40a5960a9f
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReader.java Executable file → Normal file
View File

@ -425,6 +425,7 @@ public class PSDImageReader extends ImageReaderBase {
if (mImageResources == null) { if (mImageResources == null) {
mImageResources = new ArrayList<PSDImageResource>(); mImageResources = new ArrayList<PSDImageResource>();
long expectedEnd = mImageInput.getStreamPosition() + length; long expectedEnd = mImageInput.getStreamPosition() + length;
while (mImageInput.getStreamPosition() < expectedEnd) { while (mImageInput.getStreamPosition() < expectedEnd) {
PSDImageResource resource = PSDImageResource.read(mImageInput); PSDImageResource resource = PSDImageResource.read(mImageInput);
mImageResources.add(resource); mImageResources.add(resource);

3
twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageResource.java Executable file → Normal file
View File

@ -52,6 +52,7 @@ class PSDImageResource {
mSize = pInput.readUnsignedInt(); mSize = pInput.readUnsignedInt();
readData(pInput); readData(pInput);
// Data is even-padded // Data is even-padded
if (mSize % 2 != 0) { if (mSize % 2 != 0) {
pInput.read(); pInput.read();
@ -128,7 +129,7 @@ class PSDImageResource {
public static PSDImageResource read(final ImageInputStream pInput) throws IOException { public static PSDImageResource read(final ImageInputStream pInput) throws IOException {
int type = pInput.readInt(); int type = pInput.readInt();
if (type != PSD.RESOURCE_TYPE) { if (type != PSD.RESOURCE_TYPE) {
throw new IIOException("Wrong image resource type, expected 8BIM: " + PSDUtil.intToStr(type)); throw new IIOException(String.format("Wrong image resource type, expected '8BIM': '%s'", PSDUtil.intToStr(type)));
} }
// TODO: Process more of the resource stuff, most important are IPTC, EXIF and XMP data, // TODO: Process more of the resource stuff, most important are IPTC, EXIF and XMP data,

2
twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlags.java Executable file → Normal file
View File

@ -35,7 +35,7 @@ final class PSDPrintFlags extends PSDImageResource {
mInterpolate = pInput.readUnsignedByte() != 0; mInterpolate = pInput.readUnsignedByte() != 0;
mCaption = pInput.readUnsignedByte() != 0; mCaption = pInput.readUnsignedByte() != 0;
pInput.readUnsignedByte(); // Pad pInput.skipBytes(mSize - 8);
} }
@Override @Override

2
twelvemonkeys-imageio/psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDPrintFlagsInformation.java Executable file → Normal file
View File

@ -28,6 +28,8 @@ final class PSDPrintFlagsInformation extends PSDImageResource {
mField = pInput.readUnsignedByte(); mField = pInput.readUnsignedByte();
mBleedWidth = pInput.readUnsignedInt(); mBleedWidth = pInput.readUnsignedInt();
mBleedScale = pInput.readUnsignedShort(); mBleedScale = pInput.readUnsignedShort();
pInput.skipBytes(mSize - 10);
} }
@Override @Override