Clean-up after pull.

This commit is contained in:
Harald Kuhr 2013-12-23 11:49:45 +01:00
parent af245a80d9
commit 63d9029a3e

View File

@ -48,7 +48,7 @@ public class TargaImageReaderSpi extends JMagickImageReaderSpiSupport {
); );
} }
boolean canDecode(ImageInputStream pSource) throws IOException { boolean canDecode(final ImageInputStream pSource) throws IOException {
// // TODO: Targa 1989 signature look like (bytes 8-23 of 26 LAST bytes): // // TODO: Targa 1989 signature look like (bytes 8-23 of 26 LAST bytes):
// // 'T', 'R', 'U', 'E', 'V', 'I', 'S', 'I', 'O', 'N', '-', 'X', 'F', 'I', 'L', 'E' // // 'T', 'R', 'U', 'E', 'V', 'I', 'S', 'I', 'O', 'N', '-', 'X', 'F', 'I', 'L', 'E'
// // Targa 1987: // // Targa 1987:
@ -63,11 +63,13 @@ public class TargaImageReaderSpi extends JMagickImageReaderSpiSupport {
// new byte[] {-1, 0x01, 0x20}, // Type 31: Compressed CM // new byte[] {-1, 0x01, 0x20}, // Type 31: Compressed CM
// new byte[] {-1, 0x01, 0x21}, // Type 32: Compressed CM, 4 pass // new byte[] {-1, 0x01, 0x21}, // Type 32: Compressed CM, 4 pass
// }, // },
try {
pSource.seek(pSource.length() - 18); // If we don't know the stream length, just give up, as the Targa format has trailing magic bytes...
} catch (IndexOutOfBoundsException e) { if (pSource.length() < 0) {
return false; return false;
} }
pSource.seek(pSource.length() - 18);
byte[] magic = new byte[18]; byte[] magic = new byte[18];
pSource.readFully(magic); pSource.readFully(magic);