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

Simplified TIFF writing.

Browse Source
This commit is contained in:
Harald Kuhr 2022-05-06 19:49:06 +02:00
parent fa5c77bff0
commit 8c85c4ca96
1 changed files with 40 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java
View File

@ -30,36 +30,6 @@
package com.twelvemonkeys.imageio.plugins.tiff; package com.twelvemonkeys.imageio.plugins.tiff;
import static com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME;
import static com.twelvemonkeys.imageio.plugins.tiff.TIFFStreamMetadata.configureStreamByteOrder;
import java.awt.*;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_ColorSpace;
import java.awt.image.*;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
import javax.imageio.*;
import javax.imageio.event.IIOWriteWarningListener;
import javax.imageio.metadata.IIOInvalidTreeException;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataFormatImpl;
import javax.imageio.spi.ImageWriterSpi;
import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.ImageOutputStream;
import com.twelvemonkeys.image.ImageUtil; import com.twelvemonkeys.image.ImageUtil;
import com.twelvemonkeys.imageio.ImageWriterBase; import com.twelvemonkeys.imageio.ImageWriterBase;
import com.twelvemonkeys.imageio.color.ColorProfiles; import com.twelvemonkeys.imageio.color.ColorProfiles;
@ -75,6 +45,26 @@ import com.twelvemonkeys.io.enc.EncoderStream;
import com.twelvemonkeys.io.enc.PackBitsEncoder; import com.twelvemonkeys.io.enc.PackBitsEncoder;
import com.twelvemonkeys.lang.Validate; import com.twelvemonkeys.lang.Validate;
import javax.imageio.*;
import javax.imageio.event.IIOWriteWarningListener;
import javax.imageio.metadata.IIOInvalidTreeException;
import javax.imageio.metadata.IIOMetadata;
import javax.imageio.metadata.IIOMetadataFormatImpl;
import javax.imageio.spi.ImageWriterSpi;
import javax.imageio.stream.ImageInputStream;
import javax.imageio.stream.ImageOutputStream;
import java.awt.*;
import java.awt.color.ColorSpace;
import java.awt.color.ICC_ColorSpace;
import java.awt.image.*;
import java.io.*;
import java.util.*;
import java.util.zip.Deflater;
import java.util.zip.DeflaterOutputStream;
import static com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME;
import static com.twelvemonkeys.imageio.plugins.tiff.TIFFStreamMetadata.configureStreamByteOrder;
/** /**
* TIFFImageWriter * TIFFImageWriter
* *
@ -534,8 +524,6 @@ public final class TIFFImageWriter extends ImageWriterBase {
final int sampleSize = renderedImage.getSampleModel().getSampleSize(0); final int sampleSize = renderedImage.getSampleModel().getSampleSize(0);
final int numBands = renderedImage.getSampleModel().getNumBands(); final int numBands = renderedImage.getSampleModel().getNumBands();
final ByteBuffer buffer = ByteBuffer.allocate((tileWidth * numBands * sampleSize + 7) / 8);
for (int yTile = minTileY; yTile < maxYTiles; yTile++) { for (int yTile = minTileY; yTile < maxYTiles; yTile++) {
for (int xTile = minTileX; xTile < maxXTiles; xTile++) { for (int xTile = minTileX; xTile < maxXTiles; xTile++) {
final Raster tile = renderedImage.getTile(xTile, yTile); final Raster tile = renderedImage.getTile(xTile, yTile);
@ -573,21 +561,17 @@ public final class TIFFImageWriter extends ImageWriterBase {
for (int s = 0; s < numBands; s++) { for (int s = 0; s < numBands; s++) {
if (sampleSize == 8 || shift == 0) { if (sampleSize == 8 || shift == 0) {
// Normal interleaved/planar case // Normal interleaved/planar case
buffer.put((byte) (dataBuffer.getElem(b, xOff + bandOffsets[s]) & 0xff)); stream.writeByte((byte) (dataBuffer.getElem(b, xOff + bandOffsets[s]) & 0xff));
} }
else { else {
// "Packed" case // "Packed" case
buffer.put((byte) (rowBuffer.getElem(b, x - offsetX + bandOffsets[s]) & 0xff)); stream.writeByte((byte) (rowBuffer.getElem(b, x - offsetX + bandOffsets[s]) & 0xff));
} }
} }
} }
flushBuffer(buffer, stream); flushStream(stream);
if (stream instanceof DataOutputStream) {
DataOutputStream dataOutputStream = (DataOutputStream) stream;
dataOutputStream.flush();
}
} }
} }
@ -606,15 +590,10 @@ public final class TIFFImageWriter extends ImageWriterBase {
for (int x = offsetX; x < tileWidth + offsetX; x++) { for (int x = offsetX; x < tileWidth + offsetX; x++) {
int xOff = yOff + x; int xOff = yOff + x;
buffer.putShort((short) (dataBuffer.getElem(b, xOff) & 0xffff)); stream.writeShort((short) (dataBuffer.getElem(b, xOff) & 0xffff));
} }
flushBuffer(buffer, stream); flushStream(stream);
if (stream instanceof DataOutputStream) {
DataOutputStream dataOutputStream = (DataOutputStream) stream;
dataOutputStream.flush();
}
} }
} }
} }
@ -645,7 +624,7 @@ public final class TIFFImageWriter extends ImageWriterBase {
break; break;
case DataBuffer.TYPE_INT: case DataBuffer.TYPE_INT:
// TODO: This is incorrect for 32 bits/sample, only works for packed (INT_(A)RGB) // TODO: This is incorrect for general 32 bits/sample, only works for packed (INT_(A)RGB) and single channel
final int intStride = stride / 4; final int intStride = stride / 4;
if (1 == numComponents) { if (1 == numComponents) {
// System.err.println("Writing INT -> " + numBands * 4 + "_BYTES"); // System.err.println("Writing INT -> " + numBands * 4 + "_BYTES");
@ -656,15 +635,10 @@ public final class TIFFImageWriter extends ImageWriterBase {
for (int x = offsetX; x < tileWidth + offsetX; x++) { for (int x = offsetX; x < tileWidth + offsetX; x++) {
int xOff = yOff + x; int xOff = yOff + x;
buffer.putInt(dataBuffer.getElem(b, xOff)); stream.writeInt(dataBuffer.getElem(b, xOff));
} }
flushBuffer(buffer, stream); flushStream(stream);
if (stream instanceof DataOutputStream) {
DataOutputStream dataOutputStream = (DataOutputStream) stream;
dataOutputStream.flush();
}
} }
} }
} }
@ -680,15 +654,11 @@ public final class TIFFImageWriter extends ImageWriterBase {
int element = dataBuffer.getElem(b, xOff); int element = dataBuffer.getElem(b, xOff);
for (int s = 0; s < numBands; s++) { for (int s = 0; s < numBands; s++) {
buffer.put((byte) ((element >> bitOffsets[s]) & 0xff)); stream.writeByte((byte) ((element >> bitOffsets[s]) & 0xff));
} }
} }
flushBuffer(buffer, stream); flushStream(stream);
if (stream instanceof DataOutputStream) {
DataOutputStream dataOutputStream = (DataOutputStream) stream;
dataOutputStream.flush();
}
} }
} }
} }
@ -699,11 +669,7 @@ public final class TIFFImageWriter extends ImageWriterBase {
} }
} }
// TODO: Need to flush/start new compression for each row, for proper LZW/PackBits/Deflate/ZLib flushStream(stream);
if (stream instanceof DataOutputStream) {
DataOutputStream dataOutputStream = (DataOutputStream) stream;
dataOutputStream.flush();
}
// TODO: Report better progress // TODO: Report better progress
processImageProgress((100f * (yTile + 1)) / maxYTiles); processImageProgress((100f * (yTile + 1)) / maxYTiles);
@ -717,12 +683,12 @@ public final class TIFFImageWriter extends ImageWriterBase {
processImageComplete(); processImageComplete();
} }
// TODO: Would be better to solve this on stream level... But writers would then have to explicitly flush the buffer before done. private void flushStream(DataOutput stream) throws IOException {
private void flushBuffer(final ByteBuffer buffer, final DataOutput stream) throws IOException { // Need to flush/start new compression for each row, for proper LZW/PackBits/Deflate/ZLib compression
buffer.flip(); if (stream instanceof DataOutputStream) {
stream.write(buffer.array(), buffer.arrayOffset(), buffer.remaining()); DataOutputStream dataOutputStream = (DataOutputStream) stream;
dataOutputStream.flush();
buffer.clear(); }
} }
// Metadata // Metadata
@ -902,14 +868,14 @@ public final class TIFFImageWriter extends ImageWriterBase {
case TIFF.TAG_ARTIST: case TIFF.TAG_ARTIST:
case TIFF.TAG_HOST_COMPUTER: case TIFF.TAG_HOST_COMPUTER:
case TIFF.TAG_COPYRIGHT: case TIFF.TAG_COPYRIGHT:
// Extension // Extension
case TIFF.TAG_DOCUMENT_NAME: case TIFF.TAG_DOCUMENT_NAME:
case TIFF.TAG_PAGE_NAME: case TIFF.TAG_PAGE_NAME:
case TIFF.TAG_X_POSITION: case TIFF.TAG_X_POSITION:
case TIFF.TAG_Y_POSITION: case TIFF.TAG_Y_POSITION:
case TIFF.TAG_PAGE_NUMBER: case TIFF.TAG_PAGE_NUMBER:
case TIFF.TAG_XMP: case TIFF.TAG_XMP:
// Private/Custom // Private/Custom
case TIFF.TAG_IPTC: case TIFF.TAG_IPTC:
case TIFF.TAG_PHOTOSHOP: case TIFF.TAG_PHOTOSHOP:
case TIFF.TAG_PHOTOSHOP_IMAGE_SOURCE_DATA: case TIFF.TAG_PHOTOSHOP_IMAGE_SOURCE_DATA: