Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-02 19:15:29 -04:00
Code Issues Projects Releases Wiki Activity

Make IFD ReadOnly again

Browse Source
This commit is contained in:
Oliver Schmidtmer 2016-02-23 23:07:31 +01:00
parent 8387a9ad37
commit ac49e206a1
2 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
contrib/src/main/java/com/twelvemonkeys/contrib/tiff/TIFFUtilities.java
View File

@ -317,18 +317,24 @@ public class TIFFUtilities {
} }
private long write(ImageOutputStream outputStream, EXIFWriter exifWriter) throws IOException { private long write(ImageOutputStream outputStream, EXIFWriter exifWriter) throws IOException {
writeDirectoryData(IFD, outputStream); List<Entry> newIFD = writeDirectoryData(IFD, outputStream);
ArrayList<Entry> newIFD = new ArrayList<Entry>();
Iterator<Entry> it = IFD.iterator();
while (it.hasNext()) {
newIFD.add(it.next());
}
return exifWriter.writeIFD(newIFD, outputStream); return exifWriter.writeIFD(newIFD, outputStream);
} }
private void writeDirectoryData(Directory IFD, ImageOutputStream outputStream) throws IOException { private List<Entry> writeDirectoryData(Directory IFD, ImageOutputStream outputStream) throws IOException {
ArrayList<Entry> newIFD = new ArrayList<Entry>();
Iterator<Entry> it = IFD.iterator();
while (it.hasNext()) {
Entry e = it.next();
if (e.getValue() instanceof Directory) {
List<Entry> subIFD = writeDirectoryData((Directory) e.getValue(), outputStream);
new TIFFEntry((Integer) e.getIdentifier(), new AbstractDirectory(subIFD) {
});
}
newIFD.add(e);
}
Entry stripOffsetsEntry = IFD.getEntryById(TIFF.TAG_STRIP_OFFSETS); Entry stripOffsetsEntry = IFD.getEntryById(TIFF.TAG_STRIP_OFFSETS);
long[] offsets = getValueAsLongArray(stripOffsetsEntry); long[] offsets = getValueAsLongArray(stripOffsetsEntry);
@ -337,8 +343,8 @@ public class TIFFUtilities {
int[] newOffsets = writeData(offsets, byteCounts, outputStream); int[] newOffsets = writeData(offsets, byteCounts, outputStream);
IFD.remove(stripOffsetsEntry); newIFD.remove(stripOffsetsEntry);
IFD.add(new TIFFEntry(TIFF.TAG_STRIP_OFFSETS, newOffsets)); newIFD.add(new TIFFEntry(TIFF.TAG_STRIP_OFFSETS, newOffsets));
Entry oldJpegData = IFD.getEntryById(TIFF.TAG_JPEG_INTERCHANGE_FORMAT); Entry oldJpegData = IFD.getEntryById(TIFF.TAG_JPEG_INTERCHANGE_FORMAT);
Entry oldJpegDataLength = IFD.getEntryById(TIFF.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH); Entry oldJpegDataLength = IFD.getEntryById(TIFF.TAG_JPEG_INTERCHANGE_FORMAT_LENGTH);
@ -348,8 +354,8 @@ public class TIFFUtilities {
byteCounts = getValueAsLongArray(oldJpegDataLength); byteCounts = getValueAsLongArray(oldJpegDataLength);
newOffsets = writeData(offsets, byteCounts, outputStream); newOffsets = writeData(offsets, byteCounts, outputStream);
} }
IFD.remove(oldJpegData); newIFD.remove(oldJpegData);
IFD.add(new TIFFEntry(TIFF.TAG_JPEG_INTERCHANGE_FORMAT, newOffsets)); newIFD.add(new TIFFEntry(TIFF.TAG_JPEG_INTERCHANGE_FORMAT, newOffsets));
} }
Entry oldJpegTable; Entry oldJpegTable;
@ -361,8 +367,8 @@ public class TIFFUtilities {
byteCounts = new long[tableOffsets.length]; byteCounts = new long[tableOffsets.length];
Arrays.fill(byteCounts, 64); Arrays.fill(byteCounts, 64);
newOffsets = writeData(tableOffsets, byteCounts, outputStream); newOffsets = writeData(tableOffsets, byteCounts, outputStream);
IFD.remove(oldJpegTable); newIFD.remove(oldJpegTable);
IFD.add(new TIFFEntry(TIFF.TAG_OLD_JPEG_AC_TABLES, newOffsets)); newIFD.add(new TIFFEntry(TIFF.TAG_OLD_JPEG_AC_TABLES, newOffsets));
} }
oldJpegTable = IFD.getEntryById(TIFF.TAG_OLD_JPEG_Q_TABLES); oldJpegTable = IFD.getEntryById(TIFF.TAG_OLD_JPEG_Q_TABLES);
@ -371,8 +377,8 @@ public class TIFFUtilities {
byteCounts = new long[tableOffsets.length]; byteCounts = new long[tableOffsets.length];
Arrays.fill(byteCounts, 64); Arrays.fill(byteCounts, 64);
newOffsets = writeData(tableOffsets, byteCounts, outputStream); newOffsets = writeData(tableOffsets, byteCounts, outputStream);
IFD.remove(oldJpegTable); newIFD.remove(oldJpegTable);
IFD.add(new TIFFEntry(TIFF.TAG_OLD_JPEG_Q_TABLES, newOffsets)); newIFD.add(new TIFFEntry(TIFF.TAG_OLD_JPEG_Q_TABLES, newOffsets));
} }
oldJpegTable = IFD.getEntryById(TIFF.TAG_OLD_JPEG_DC_TABLES); oldJpegTable = IFD.getEntryById(TIFF.TAG_OLD_JPEG_DC_TABLES);
@ -381,17 +387,11 @@ public class TIFFUtilities {
byteCounts = new long[tableOffsets.length]; byteCounts = new long[tableOffsets.length];
Arrays.fill(byteCounts, 64); Arrays.fill(byteCounts, 64);
newOffsets = writeData(tableOffsets, byteCounts, outputStream); newOffsets = writeData(tableOffsets, byteCounts, outputStream);
IFD.remove(oldJpegTable); newIFD.remove(oldJpegTable);
IFD.add(new TIFFEntry(TIFF.TAG_OLD_JPEG_DC_TABLES, newOffsets)); newIFD.add(new TIFFEntry(TIFF.TAG_OLD_JPEG_DC_TABLES, newOffsets));
} }
Iterator<Entry> it = IFD.iterator(); return newIFD;
while (it.hasNext()) {
Entry e = it.next();
if (e.getValue() instanceof Directory) {
writeDirectoryData((Directory) e.getValue(), outputStream);
}
}
} }
private int[] writeData(long[] offsets, long[] byteCounts, ImageOutputStream outputStream) throws IOException { private int[] writeData(long[] offsets, long[] byteCounts, ImageOutputStream outputStream) throws IOException {
@ -502,10 +502,6 @@ public class TIFFUtilities {
} }
newIDFData.add(new TIFFEntry(TIFF.TAG_ORIENTATION, (short) orientation)); newIDFData.add(new TIFFEntry(TIFF.TAG_ORIENTATION, (short) orientation));
IFD = new AbstractDirectory(newIDFData) { IFD = new AbstractDirectory(newIDFData) {
@Override
public boolean isReadOnly() {
return false;
}
}; };
} }
} }

4
imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/exif/IFD.java
View File

@ -44,8 +44,4 @@ final class IFD extends AbstractDirectory {
protected IFD(final Collection<? extends Entry> pEntries) { protected IFD(final Collection<? extends Entry> pEntries) {
super(pEntries); super(pEntries);
} }
@Override
public boolean isReadOnly() {
return false;
}
} }