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

TMI-26: TIFF write support clean up.

Browse Source
This commit is contained in:
Harald Kuhr 2015-04-10 11:24:46 +02:00
parent 037e0d5473
commit 791be3d0cc
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,22 +65,18 @@ import java.util.zip.DeflaterOutputStream;
* @version $Id: TIFFImageWriter.java,v 1.0 18.09.13 12:46 haraldk Exp$ * @version $Id: TIFFImageWriter.java,v 1.0 18.09.13 12:46 haraldk Exp$
*/ */
public final class TIFFImageWriter extends ImageWriterBase { public final class TIFFImageWriter extends ImageWriterBase {
// Short term
// TODO: Support JPEG compression (7) - might need extra input to allow multiple images with single DQT
// TODO: Use sensible defaults for compression based on input? None is sensible... :-)
// Long term // Long term
// TODO: Support tiling // TODO: Support tiling
// TODO: Support thumbnails // TODO: Support thumbnails
// TODO: Support ImageIO metadata // TODO: Support ImageIO metadata
// TODO: Support CCITT Modified Huffman compression (2) // TODO: Support CCITT Modified Huffman compression (2)
// TODO: Full "Baseline TIFF" support // TODO: Full "Baseline TIFF" support (pending CCITT compression 2)
// TODO: Support LZW compression (5)? // TODO: CCITT compressions T.4 and T.6
// ---- // ----
// TODO: Support storing multiple images in one stream (multi-page TIFF) // TODO: Support storing multiple images in one stream (multi-page TIFF)
// TODO: Support use-case: Transcode multi-layer PSD to multi-page TIFF with metadata // TODO: Support use-case: Transcode multi-layer PSD to multi-page TIFF with metadata
// TODO: Support use-case: Transcode multi-page TIFF to multiple single-page TIFFs with metadata // TODO: Support use-case: Transcode multi-page TIFF to multiple single-page TIFFs with metadata
// TODO: Support use-case: Losslessly transcode JPEG to JPEG in TIFF with (EXIF) metadata (and back) // TODO: Support use-case: Losslessly transcode JPEG to JPEG-in-TIFF with (EXIF) metadata (and back)
// Very long term... // Very long term...
// TODO: Support JBIG compression via ImageIO plugin/delegate? Pending support in Reader // TODO: Support JBIG compression via ImageIO plugin/delegate? Pending support in Reader
@ -92,6 +88,9 @@ public final class TIFFImageWriter extends ImageWriterBase {
// Support predictor. See TIFF 6.0 Specification, Section 14: "Differencing Predictor", page 64. // Support predictor. See TIFF 6.0 Specification, Section 14: "Differencing Predictor", page 64.
// Support PackBits compression (32773) - easy - BASELINE // Support PackBits compression (32773) - easy - BASELINE
// Support ZLIB (/Deflate) compression (8) - easy // Support ZLIB (/Deflate) compression (8) - easy
// Support LZW compression (5)
// Support JPEG compression (7) - might need extra input to allow multiple images with single DQT
// Use sensible defaults for compression based on input? None is sensible... :-)
public static final Rational STANDARD_DPI = new Rational(72); public static final Rational STANDARD_DPI = new Rational(72);
@ -127,12 +126,10 @@ public final class TIFFImageWriter extends ImageWriterBase {
int[] bitOffsets; int[] bitOffsets;
if (sampleModel instanceof ComponentSampleModel) { if (sampleModel instanceof ComponentSampleModel) {
bandOffsets = ((ComponentSampleModel) sampleModel).getBandOffsets(); bandOffsets = ((ComponentSampleModel) sampleModel).getBandOffsets();
// System.err.println("bandOffsets: " + Arrays.toString(bandOffsets));
bitOffsets = null; bitOffsets = null;
} }
else if (sampleModel instanceof SinglePixelPackedSampleModel) { else if (sampleModel instanceof SinglePixelPackedSampleModel) {
bitOffsets = ((SinglePixelPackedSampleModel) sampleModel).getBitOffsets(); bitOffsets = ((SinglePixelPackedSampleModel) sampleModel).getBitOffsets();
// System.err.println("bitOffsets: " + Arrays.toString(bitOffsets));
bandOffsets = null; bandOffsets = null;
} }
else if (sampleModel instanceof MultiPixelPackedSampleModel) { else if (sampleModel instanceof MultiPixelPackedSampleModel) {
@ -143,7 +140,7 @@ public final class TIFFImageWriter extends ImageWriterBase {
throw new IllegalArgumentException("Unknown bit/bandOffsets for sample model: " + sampleModel); throw new IllegalArgumentException("Unknown bit/bandOffsets for sample model: " + sampleModel);
} }
List<Entry> entries = new ArrayList<Entry>(); List<Entry> entries = new ArrayList<>();
entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, renderedImage.getWidth())); entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, renderedImage.getWidth()));
entries.add(new TIFFEntry(TIFF.TAG_IMAGE_HEIGHT, renderedImage.getHeight())); entries.add(new TIFFEntry(TIFF.TAG_IMAGE_HEIGHT, renderedImage.getHeight()));
// entries.add(new TIFFEntry(TIFF.TAG_ORIENTATION, 1)); // (optional) // entries.add(new TIFFEntry(TIFF.TAG_ORIENTATION, 1)); // (optional)
@ -162,7 +159,8 @@ public final class TIFFImageWriter extends ImageWriterBase {
// Write compression field from param or metadata // Write compression field from param or metadata
int compression = TIFFImageWriteParam.getCompressionType(param); int compression = TIFFImageWriteParam.getCompressionType(param);
entries.add(new TIFFEntry(TIFF.TAG_COMPRESSION, compression)); entries.add(new TIFFEntry(TIFF.TAG_COMPRESSION, compression));
// TODO: Let param control predictor
// TODO: Let param/metadata control predictor
switch (compression) { switch (compression) {
case TIFFExtension.COMPRESSION_ZLIB: case TIFFExtension.COMPRESSION_ZLIB:
case TIFFExtension.COMPRESSION_DEFLATE: case TIFFExtension.COMPRESSION_DEFLATE:
@ -253,7 +251,7 @@ public final class TIFFImageWriter extends ImageWriterBase {
writeImageData(createCompressorStream(renderedImage, param), renderedImage, numComponents, bandOffsets, bitOffsets); writeImageData(createCompressorStream(renderedImage, param), renderedImage, numComponents, bandOffsets, bitOffsets);
} }
// TODO: Update IFD0-pointer, and write IFD // Update IFD0-pointer, and write IFD
if (compression != TIFFBaseline.COMPRESSION_NONE) { if (compression != TIFFBaseline.COMPRESSION_NONE) {
long streamPosition = imageOutput.getStreamPosition(); long streamPosition = imageOutput.getStreamPosition();