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

TMI-22: Changed IIOException to warning for images with single chunk ICC_PROFILE with bad index/count.

Browse Source
This commit is contained in:
Harald Kuhr
2012-06-21 16:03:59 +02:00
parent 75c09d3aef
commit c2245a503d
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReader.java
+3 -3
View File
@@ -731,7 +731,7 @@ public class JPEGImageReader extends ImageReaderBase {
int chunkCount = stream.readUnsignedByte();
if (chunkNumber != 1 && chunkCount != 1) {
throw new IIOException(String.format("Bad number of 'ICC_PROFILE' chunks: %d of %d.", chunkNumber, chunkCount));
processWarningOccurred(String.format("Bad number of 'ICC_PROFILE' chunks: %d of %d.", chunkNumber, chunkCount));
}
return readICCProfileSafe(stream);
@@ -744,7 +744,7 @@ public class JPEGImageReader extends ImageReaderBase {
if (chunkNumber < 1) {
// Some weird JPEGs use 0-based indexes... count == 0 and all numbers == 0. Ignore these profiles
processWarningOccurred("Invalid 'ICC_PROFILE' chunk index: " + chunkNumber + ". Ignoring ICC profile.");
processWarningOccurred(String.format("Invalid 'ICC_PROFILE' chunk index: %d. Ignoring ICC profile.", chunkNumber));
return null;
}
@@ -753,7 +753,7 @@ public class JPEGImageReader extends ImageReaderBase {
// Others use count == 1, and all numbers == 1.
// Handle these by issuing warning
badICC = true;
processWarningOccurred("Unexpected 'ICC_PROFILE' chunk count: " + chunkCount + ". Ignoring count, assuming " + segments.size() + " chunks in sequence.");
processWarningOccurred(String.format("Unexpected 'ICC_PROFILE' chunk count: %d. Ignoring count, assuming %d chunks in sequence.", chunkCount, segments.size()));
}
int count = badICC ? segments.size() : chunkCount;