From 41b920344d6a5ee69b4c758196236a19baf6d352 Mon Sep 17 00:00:00 2001
From: Eric Sommerlade <es0m@users.noreply.github.com>
Date: Mon, 23 Feb 2015 06:12:42 -0700
Subject: [PATCH] added support for uncompressed parameters to tiff image
 format as described here:
 expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html

Conflicts:
	modules/imgcodecs/src/grfmt_tiff.cpp
---
 modules/highgui/src/grfmt_tiff.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/highgui/src/grfmt_tiff.cpp b/modules/highgui/src/grfmt_tiff.cpp
index 9b05b364e..eeee318c7 100644
--- a/modules/highgui/src/grfmt_tiff.cpp
+++ b/modules/highgui/src/grfmt_tiff.cpp
@@ -491,13 +491,18 @@ bool  TiffEncoder::writeLibTiff( const Mat& img, const vector<int>& params)
       || !TIFFSetField(pTiffHandle, TIFFTAG_SAMPLESPERPIXEL, channels)
       || !TIFFSetField(pTiffHandle, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG)
       || !TIFFSetField(pTiffHandle, TIFFTAG_ROWSPERSTRIP, rowsPerStrip)
-      || !TIFFSetField(pTiffHandle, TIFFTAG_PREDICTOR, predictor)
        )
     {
         TIFFClose(pTiffHandle);
         return false;
     }
 
+    if (compression != COMPRESSION_NONE && !TIFFSetField(pTiffHandle, TIFFTAG_PREDICTOR, predictor) )
+    {
+        TIFFClose(pTiffHandle);
+        return false;
+    }
+
     // row buffer, because TIFFWriteScanline modifies the original data!
     size_t scanlineSize = TIFFScanlineSize(pTiffHandle);
     AutoBuffer<uchar> _buffer(scanlineSize+32);