From d9d4cecaad5e38524c1d806e1e49b63ff05fd8a6 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Mon, 12 Jul 2010 07:12:09 -0500
Subject: [PATCH] [devel] Removed some newly-added TAB characters.

---
 ANNOUNCE   |  3 +++
 CHANGES    |  1 +
 pngconf.h  |  6 +++---
 pngpread.c | 50 +++++++++++++++++++++++++-------------------------
 pngrutil.c |  2 +-
 5 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 882088779..264fe069c 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -281,6 +281,9 @@ version 1.5.0beta33 [July 6, 2010]
 version 1.5.0beta34 [July 12, 2010]
   Put #ifndef PNG_EXTERN, #endif around the define PNG_EXTERN in pngpriv.h
 
+version 1.5.0beta35 [July 12, 2010]
+  Removed some newly-added TAB characters.
+
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
 (subscription required; visit
 https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/CHANGES b/CHANGES
index 808f23ca1..c4c73d51d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2764,6 +2764,7 @@ version 1.5.0beta34 [July 12, 2010]
   Put #ifndef PNG_EXTERN, #endif around the define PNG_EXTERN in pngpriv.h
 
 version 1.5.0beta35 [July 12, 2010]
+  Removed some newly-added TAB characters.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index bc8313f80..295eae865 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -242,9 +242,9 @@
 #  ifdef PNGLIB_BUILD
     /* Building the library */
 #    if (defined(DLL_EXPORT)/*from libtool*/ ||\
-	defined(_WINDLL) || defined(_DLL) || defined(__DLL__) ||\
-	defined(_USRDLL) ||\
-	defined(PNG_BUILD_DLL)) && defined(PNG_DLL_EXPORT)
+        defined(_WINDLL) || defined(_DLL) || defined(__DLL__) ||\
+        defined(_USRDLL) ||\
+        defined(PNG_BUILD_DLL)) && defined(PNG_DLL_EXPORT)
       /* Building a DLL. */
 #      define PNG_IMPEXP PNG_DLL_EXPORT
 #    endif /* DLL */
diff --git a/pngpread.c b/pngpread.c
index a8f7e2e96..20d76a42b 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -851,7 +851,7 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
     * or the stream marked as finished.
     */
    while (png_ptr->zstream.avail_in > 0 &&
-	  !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
+          !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
    {
       int ret;
 
@@ -881,51 +881,51 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
       /* Check for any failure before proceeding. */
       if (ret != Z_OK && ret != Z_STREAM_END)
       {
-	 /* Terminate the decompression. */
-	 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         /* Terminate the decompression. */
+         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
 
          /* This may be a truncated stream (missing or
-	  * damaged end code).  Treat that as a warning.
-	  */
+          * damaged end code).  Treat that as a warning.
+          */
          if (png_ptr->row_number >= png_ptr->num_rows ||
-	     png_ptr->pass > 6)
-	    png_warning(png_ptr, "Truncated compressed data in IDAT");
+             png_ptr->pass > 6)
+            png_warning(png_ptr, "Truncated compressed data in IDAT");
 
-	 else
-	    png_error(png_ptr, "Decompression error in IDAT");
+         else
+            png_error(png_ptr, "Decompression error in IDAT");
 
-	 /* Skip the check on unprocessed input */
+         /* Skip the check on unprocessed input */
          return;
       }
 
       /* Did inflate output any data? */
       if (png_ptr->zstream.next_out != png_ptr->row_buf)
       {
-	 /* Is this unexpected data after the last row?
-	  * If it is, artificially terminate the LZ output
-	  * here.
-	  */
+         /* Is this unexpected data after the last row?
+          * If it is, artificially terminate the LZ output
+          * here.
+          */
          if (png_ptr->row_number >= png_ptr->num_rows ||
-	     png_ptr->pass > 6)
+             png_ptr->pass > 6)
          {
-	    /* Extra data. */
-	    png_warning(png_ptr, "Extra compressed data in IDAT");
+            /* Extra data. */
+            png_warning(png_ptr, "Extra compressed data in IDAT");
             png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
 
-	    /* Do no more processing; skip the unprocessed
-	     * input check below.
-	     */
+            /* Do no more processing; skip the unprocessed
+             * input check below.
+             */
             return;
-	 }
+         }
 
-	 /* Do we have a complete row? */
-	 if (png_ptr->zstream.avail_out == 0)
-	    png_push_process_row(png_ptr);
+         /* Do we have a complete row? */
+         if (png_ptr->zstream.avail_out == 0)
+            png_push_process_row(png_ptr);
       }
 
       /* And check for the end of the stream. */
       if (ret == Z_STREAM_END)
-	 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
+         png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
    }
 
    /* All the data should have been processed, if anything
diff --git a/pngrutil.c b/pngrutil.c
index 32b1599eb..3de4cf08f 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -269,7 +269,7 @@ png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size,
       {
          PNG_CONST char *msg;
 #ifdef PNG_CONSOLE_IO_SUPPORTED
-	 char umsg[52];
+         char umsg[52];
 #endif
          if (png_ptr->zstream.msg != 0)
             msg = png_ptr->zstream.msg;