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

Added test for PICTImageReader to makes sure JPEGs or other images with PICT magic are recognized.

Browse Source 
Better Exception handling.
This commit is contained in:
Harald Kuhr
2009-09-08 12:59:12 +02:00
parent a493cebe13
commit 79ca02c8b0
4 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twelvemonkeys-imageio/pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java
Executable → Regular
+17 -9
View File
@@ -191,7 +191,7 @@ public class PICTImageReader extends ImageReaderBase {
// Get frame at 72 dpi
// NOTE: These are not pixel sizes!
// Need sto be multiplied with hRes/screenResolution and vRes/screenResolution
// Need to be multiplied with hRes/screenResolution and vRes/screenResolution
int y = pStream.readUnsignedShort();
int x = pStream.readUnsignedShort();
int h = pStream.readUnsignedShort();
@@ -1664,10 +1664,18 @@ public class PICTImageReader extends ImageReaderBase {
throw e;
}
catch (EOFException e) {
throw new IIOException("Error in PICT format: Unexpected end of File", e);
String pos;
try {
pos = String.format("position %d", mImageInput.getStreamPosition());
}
catch (IOException ignore) {
pos = "unknown position";
}
throw new IIOException(String.format("Error in PICT format: Unexpected end of File at %s", pos), e);
}
catch (IOException e) {
throw new IIOException("Error in PICT format: " + e.getMessage(), e);
throw new IIOException(String.format("Error in PICT format: %s", e.getMessage()), e);
}
}
@@ -2528,7 +2536,7 @@ public class PICTImageReader extends ImageReaderBase {
/*
* Read a long comment from the stream.
*/
private void readLongComment(DataInput pStream) throws IOException {
private void readLongComment(final DataInput pStream) throws IOException {
// Comment kind and data byte count
pStream.readShort();
@@ -2604,12 +2612,12 @@ public class PICTImageReader extends ImageReaderBase {
// TODO: Might need to clear background
g.setTransform(AffineTransform.getScaleInstance(mScreenImageXRatio, mScreenImageYRatio));
try {
// try {
drawOnto(g);
}
catch (IOException e) {
e.printStackTrace();
}
// }
// catch (IOException e) {
// e.printStackTrace();
// }
}
finally {
g.dispose();