From 2794a67c27ad39a3adb2c7295e139466315aec8c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 3 Jan 2016 10:01:25 +0000
Subject: [PATCH] * libtiff/tif_read.c, tif_dirread.c: fix indentation issues
 raised by GCC 6 -Wmisleading-indentation

---
 ChangeLog             |  5 +++++
 libtiff/tif_dirread.c |  6 +++---
 libtiff/tif_read.c    | 18 +++++++++---------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce3994fe..a4df617e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-01-03  Even Rouault <even.rouault at spatialys.com>
+
+	* libtiff/tif_read.c, tif_dirread.c: fix indentation issues raised
+	by GCC 6 -Wmisleading-indentation
+
 2015-12-27  Even Rouault <even.rouault at spatialys.com>
 
 	* libtiff/tif_pixarlog.c: avoid zlib error messages to pass a NULL
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
index 27a893c2..80d059b8 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -1,4 +1,4 @@
-/* $Id: tif_dirread.c,v 1.199 2015-12-20 23:18:51 erouault Exp $ */
+/* $Id: tif_dirread.c,v 1.200 2016-01-03 10:01:25 erouault Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -4281,8 +4281,8 @@ EstimateStripByteCounts(TIFF* tif, TIFFDirEntry* dir, uint16 dircount)
 	TIFFDirectory *td = &tif->tif_dir;
 	uint32 strip;
 
-    if( !_TIFFFillStriles( tif ) )
-        return -1;
+        if( !_TIFFFillStriles( tif ) )
+            return -1;
 
 	if (td->td_stripbytecount)
 		_TIFFfree(td->td_stripbytecount);
diff --git a/libtiff/tif_read.c b/libtiff/tif_read.c
index a81c5d43..9d67bf27 100644
--- a/libtiff/tif_read.c
+++ b/libtiff/tif_read.c
@@ -1,4 +1,4 @@
-/* $Id: tif_read.c,v 1.46 2015-11-22 15:31:03 erouault Exp $ */
+/* $Id: tif_read.c,v 1.47 2016-01-03 10:01:25 erouault Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
@@ -492,9 +492,9 @@ TIFFFillStrip(TIFF* tif, uint32 strip)
 	static const char module[] = "TIFFFillStrip";
 	TIFFDirectory *td = &tif->tif_dir;
 
-    if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount)
-        return 0;
-        
+        if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount)
+            return 0;
+
 	if ((tif->tif_flags&TIFF_NOREADRAW)==0)
 	{
 		uint64 bytecount = td->td_stripbytecount[strip];
@@ -795,9 +795,9 @@ TIFFFillTile(TIFF* tif, uint32 tile)
 	static const char module[] = "TIFFFillTile";
 	TIFFDirectory *td = &tif->tif_dir;
 
-    if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount)
-        return 0;
-        
+        if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount)
+            return 0;
+
 	if ((tif->tif_flags&TIFF_NOREADRAW)==0)
 	{
 		uint64 bytecount = td->td_stripbytecount[tile];
@@ -957,8 +957,8 @@ TIFFStartStrip(TIFF* tif, uint32 strip)
 {
 	TIFFDirectory *td = &tif->tif_dir;
 
-    if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount)
-        return 0;
+        if (!_TIFFFillStriles( tif ) || !tif->tif_dir.td_stripbytecount)
+            return 0;
 
 	if ((tif->tif_flags & TIFF_CODERSETUP) == 0) {
 		if (!(*tif->tif_setupdecode)(tif))