From 8379f08d78bce02b94cd2d3ae58b7a80a113a338 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Thu, 15 Oct 2015 22:21:49 +0200
Subject: [PATCH] #183: Fix failing tests after merge.

---
 .../twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java
index a5cfa189..591e80f1 100644
--- a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java
+++ b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java
@@ -72,6 +72,7 @@ public final class TIFFImageWriter extends ImageWriterBase {
     // TODO: Support more of the ImageIO metadata (ie. compression from metadata, etc)
 
     // Long term
+    // TODO: Support writing multipage TIFFs using canWriteSequence/prepareWriteSequence/writeToSequence/endWriteSequence
     // TODO: Support tiling
     // TODO: Support thumbnails
     // TODO: Support CCITT Modified Huffman compression (2)
@@ -244,7 +245,7 @@ public final class TIFFImageWriter extends ImageWriterBase {
         // Write compression field from param or metadata
         int compression;
         if ((param == null || param.getCompressionMode() == TIFFImageWriteParam.MODE_COPY_FROM_METADATA)
-                && image.getMetadata() != null) {
+                && image.getMetadata() != null && metadata.getIFD().getEntryById(TIFF.TAG_COMPRESSION) != null) {
             compression = (int) metadata.getIFD().getEntryById(TIFF.TAG_COMPRESSION).getValue();
         }
         else {