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

Merging TIFF pages failed, if a page contained a sub IFD without a TIFF.TAG_COMPRESSION entry

Browse Source
This commit is contained in:
Oliver Schmidtmer
2018-07-09 16:42:34 +02:00
parent 7cb1c6811a
commit 18800b6ee4
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/src/main/java/com/twelvemonkeys/contrib/tiff/TIFFUtilities.java
+6 -5
View File
@@ -477,12 +477,13 @@ public final class TIFFUtilities {
}
Entry compressionEntry = IFD.getEntryById(TIFF.TAG_COMPRESSION);
Number compression = (Number) compressionEntry.getValue();
if (compression.shortValue() == TIFFExtension.COMPRESSION_OLD_JPEG) {
newIFD.remove(compressionEntry);
newIFD.add(new TIFFEntry(TIFF.TAG_COMPRESSION, TIFF.TYPE_SHORT, TIFFExtension.COMPRESSION_JPEG));
if(compressionEntry != null) {
Number compression = (Number) compressionEntry.getValue();
if (compression.shortValue() == TIFFExtension.COMPRESSION_OLD_JPEG) {
newIFD.remove(compressionEntry);
newIFD.add(new TIFFEntry(TIFF.TAG_COMPRESSION, TIFF.TYPE_SHORT, TIFFExtension.COMPRESSION_JPEG));
}
}
return newIFD;
}