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 #170 Fix General CMM error517/LCMS error 13 (Ignore incompatible ICC profile)

Browse Source
This commit is contained in:
Harald Kuhr
2015-08-25 14:13:35 +02:00
parent 25bef72ac0
commit d4e34d6109
2 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
+14 -5
View File
@@ -61,6 +61,7 @@ import javax.imageio.spi.ImageReaderSpi;
import javax.imageio.spi.ServiceRegistry;
import javax.imageio.stream.ImageInputStream;
import java.awt.*;
import java.awt.color.CMMException;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_Profile;
import java.awt.image.*;
@@ -1562,14 +1563,22 @@ public class TIFFImageReader extends ImageReaderBase {
return value;
}
public ICC_Profile getICCProfile() {
private ICC_Profile getICCProfile() {
Entry entry = currentIFD.getEntryById(TIFF.TAG_ICC_PROFILE);
if (entry == null) {
return null;
if (entry != null) {
byte[] value = (byte[]) entry.getValue();
ICC_Profile profile = ICC_Profile.getInstance(value);
try {
return ColorSpaces.validateProfile(profile);
}
catch (CMMException ignore) {
processWarningOccurred("Ignoring broken/incompatible ICC profile: " + ignore.getMessage());
}
}
byte[] value = (byte[]) entry.getValue();
return ICC_Profile.getInstance(value);
return null;
}
// TODO: Tiling support