Select the entire spin control contents when changing its value.

[wxWidgets.git] / src / png / pngtest.c

diff --git a/src/png/pngtest.c b/src/png/pngtest.c
index 1125d1b7ac62f0f783f061b0cc6bb78d05496afa..c52aef3e6b53665c2729c1dd6eea8405e442f855 100644 (file)
--- a/src/png/pngtest.c
+++ b/src/png/pngtest.c
@@ -1,12 +1,15 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
 
 /* pngtest.c - a simple test program to test libpng
  *

- * Last changed in libpng 1.2.32 [September 18, 2008]
- * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 1998-2008 Glenn Randers-Pehrson
+ * Last changed in libpng 1.5.6 [November 3, 2011]
+ * Copyright (c) 1998-2011 Glenn Randers-Pehrson

  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
  *

+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *

  * This program reads in a PNG image, writes it out again, and then
  * compares the two files.  If the files are identical, this shows that
  * the basic chunk handling, filtering, and (de)compression code is working
  * This program reads in a PNG image, writes it out again, and then
  * compares the two files.  If the files are identical, this shows that
  * the basic chunk handling, filtering, and (de)compression code is working


@@ -28,51 +31,58 @@
  * of files at once by typing "pngtest -m file1.png file2.png ..."
  */
 
  * of files at once by typing "pngtest -m file1.png file2.png ..."
  */
 

-#include "png.h"
+#define _POSIX_SOURCE 1

 
 

-#if defined(_WIN32_WCE)
-#  if _WIN32_WCE < 211
-     __error__ (f|w)printf functions are not supported on old WindowsCE.;
-#  endif
-#  include <windows.h>
-#  include <stdlib.h>
-#  define READFILE(file, data, length, check) \
-     if (ReadFile(file, data, length, &check, NULL)) check = 0
-#  define WRITEFILE(file, data, length, check)) \
-     if (WriteFile(file, data, length, &check, NULL)) check = 0
-#  define FCLOSE(file) CloseHandle(file)
-#else
+#include "zlib.h"
+#include "png.h"
+/* Copied from pngpriv.h but only used in error messages below. */
+#ifndef PNG_ZBUF_SIZE
+#  define PNG_ZBUF_SIZE 8192
+#endif

 #  include <stdio.h>
 #  include <stdlib.h>
 #  include <stdio.h>
 #  include <stdlib.h>

-#  define READFILE(file, data, length, check) \
-     check=(png_size_t)fread(data, (png_size_t)1, length, file)
-#  define WRITEFILE(file, data, length, check) \
-     check=(png_size_t)fwrite(data, (png_size_t)1, length, file)
+#  include <string.h>

 #  define FCLOSE(file) fclose(file)
 #  define FCLOSE(file) fclose(file)

-#endif

 
 

-#if defined(PNG_NO_STDIO)
-#  if defined(_WIN32_WCE)
-     typedef HANDLE                png_FILE_p;
-#  else
-     typedef FILE                * png_FILE_p;
-#  endif
+#ifndef PNG_STDIO_SUPPORTED
+typedef FILE                * png_FILE_p;

 #endif
 
 #endif
 

-/* Makes pngtest verbose so we can find problems (needs to be before png.h) */
+/* Makes pngtest verbose so we can find problems. */

 #ifndef PNG_DEBUG
 #  define PNG_DEBUG 0
 #endif
 
 #ifndef PNG_DEBUG
 #  define PNG_DEBUG 0
 #endif
 

+#if PNG_DEBUG > 1
+#  define pngtest_debug(m)        ((void)fprintf(stderr, m "\n"))
+#  define pngtest_debug1(m,p1)    ((void)fprintf(stderr, m "\n", p1))
+#  define pngtest_debug2(m,p1,p2) ((void)fprintf(stderr, m "\n", p1, p2))
+#else
+#  define pngtest_debug(m)        ((void)0)
+#  define pngtest_debug1(m,p1)    ((void)0)
+#  define pngtest_debug2(m,p1,p2) ((void)0)
+#endif
+

 #if !PNG_DEBUG
 #if !PNG_DEBUG

-#  define SINGLE_ROWBUF_ALLOC  /* makes buffer overruns easier to nail */
+#  define SINGLE_ROWBUF_ALLOC  /* Makes buffer overruns easier to nail */

 #endif
 
 #endif
 

+/* The code uses memcmp and memcpy on large objects (typically row pointers) so
+ * it is necessary to do soemthing special on certain architectures, note that
+ * the actual support for this was effectively removed in 1.4, so only the
+ * memory remains in this program:
+ */
+#define CVT_PTR(ptr)         (ptr)
+#define CVT_PTR_NOCHECK(ptr) (ptr)
+#define png_memcmp  memcmp
+#define png_memcpy  memcpy
+#define png_memset  memset
+

 /* Turn on CPU timing
 #define PNGTEST_TIMING
 */
 
 /* Turn on CPU timing
 #define PNGTEST_TIMING
 */
 

-#ifdef PNG_NO_FLOATING_POINT_SUPPORTED
+#ifndef PNG_FLOATING_POINT_SUPPORTED

 #undef PNGTEST_TIMING
 #endif
 
 #undef PNGTEST_TIMING
 #endif
 


@@ -81,13 +91,14 @@ static float t_start, t_stop, t_decode, t_encode, t_misc;
 #include <time.h>
 #endif
 
 #include <time.h>
 #endif
 

-#if defined(PNG_TIME_RFC1123_SUPPORTED)
+#ifdef PNG_TIME_RFC1123_SUPPORTED

 #define PNG_tIME_STRING_LENGTH 29
 static int tIME_chunk_present = 0;
 static char tIME_string[PNG_tIME_STRING_LENGTH] = "tIME chunk is not present";
 #endif
 
 static int verbose = 0;
 #define PNG_tIME_STRING_LENGTH 29
 static int tIME_chunk_present = 0;
 static char tIME_string[PNG_tIME_STRING_LENGTH] = "tIME chunk is not present";
 #endif
 
 static int verbose = 0;

+static int strict = 0;

 
 int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
 
 
 int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
 


@@ -95,110 +106,91 @@ int test_one_file PNGARG((PNG_CONST char *inname, PNG_CONST char *outname));
 #include <mem.h>
 #endif
 
 #include <mem.h>
 #endif
 

-/* defined so I can write to a file on gui/windowing platforms */
+/* Defined so I can write to a file on gui/windowing platforms */

 /*  #define STDERR stderr  */
 /*  #define STDERR stderr  */

-#define STDERR stdout   /* for DOS */
-
-/* In case a system header (e.g., on AIX) defined jmpbuf */
-#ifdef jmpbuf
-#  undef jmpbuf
-#endif
+#define STDERR stdout   /* For DOS */

 
 /* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */
 #ifndef png_jmpbuf
 #  define png_jmpbuf(png_ptr) png_ptr->jmpbuf
 #endif
 
 
 /* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */
 #ifndef png_jmpbuf
 #  define png_jmpbuf(png_ptr) png_ptr->jmpbuf
 #endif
 

-/* example of using row callbacks to make a simple progress meter */
+/* Example of using row callbacks to make a simple progress meter */

 static int status_pass = 1;
 static int status_dots_requested = 0;
 static int status_dots = 1;
 
 static int status_pass = 1;
 static int status_dots_requested = 0;
 static int status_dots = 1;
 

-void
-#ifdef PNG_1_0_X
-PNGAPI
-#endif
+void PNGCBAPI

 read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
 read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);

-void
-#ifdef PNG_1_0_X
-PNGAPI
-#endif
+void PNGCBAPI

 read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
 {
 read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
 {

-    if (png_ptr == NULL || row_number > PNG_UINT_31_MAX) return;
-    if (status_pass != pass)
-    {
-       fprintf(stdout, "\n Pass %d: ", pass);
-       status_pass = pass;
-       status_dots = 31;
-    }
-    status_dots--;
-    if (status_dots == 0)
-    {
-       fprintf(stdout, "\n         ");
-       status_dots=30;
-    }
-    fprintf(stdout, "r");
+   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX)
+      return;
+
+   if (status_pass != pass)
+   {
+      fprintf(stdout, "\n Pass %d: ", pass);
+      status_pass = pass;
+      status_dots = 31;
+   }
+
+   status_dots--;
+
+   if (status_dots == 0)
+   {
+      fprintf(stdout, "\n         ");
+      status_dots=30;
+   }
+
+   fprintf(stdout, "r");

 }
 
 }
 

-void
-#ifdef PNG_1_0_X
-PNGAPI
-#endif
+void PNGCBAPI

 write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
 write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);

-void
-#ifdef PNG_1_0_X
-PNGAPI
-#endif
+void PNGCBAPI

 write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
 {
 write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
 {

-    if (png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return;
-    fprintf(stdout, "w");
+   if (png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7)
+      return;
+
+   fprintf(stdout, "w");

 }
 
 
 }
 
 

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

 /* Example of using user transform callback (we don't transform anything,
 /* Example of using user transform callback (we don't transform anything,

-   but merely examine the row filters.  We set this to 256 rather than
-   5 in case illegal filter values are present.) */
+ * but merely examine the row filters.  We set this to 256 rather than
+ * 5 in case illegal filter values are present.)
+ */

 static png_uint_32 filters_used[256];
 static png_uint_32 filters_used[256];

-void
-#ifdef PNG_1_0_X
-PNGAPI
-#endif
+void PNGCBAPI

 count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);
 count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);

-void
-#ifdef PNG_1_0_X
-PNGAPI
-#endif
+void PNGCBAPI

 count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
 {
 count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
 {

-    if (png_ptr != NULL && row_info != NULL)
+   if (png_ptr != NULL && row_info != NULL)

       ++filters_used[*(data - 1)];
 }
 #endif
 
       ++filters_used[*(data - 1)];
 }
 #endif
 

-#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-/* example of using user transform callback (we don't transform anything,
-   but merely count the zero samples) */
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED
+/* Example of using user transform callback (we don't transform anything,
+ * but merely count the zero samples)
+ */

 
 static png_uint_32 zero_samples;
 
 
 static png_uint_32 zero_samples;
 

-void
-#ifdef PNG_1_0_X
-PNGAPI
-#endif
+void PNGCBAPI

 count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);
 count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);

-void
-#ifdef PNG_1_0_X
-PNGAPI
-#endif
+void PNGCBAPI

 count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
 {
    png_bytep dp = data;
 count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
 {
    png_bytep dp = data;

-   if (png_ptr == NULL)return;
+   if (png_ptr == NULL)
+      return;

 
 

-   /* contents of row_info:
+   /* Contents of row_info:

     *  png_uint_32 width      width of row
     *  png_uint_32 rowbytes   number of bytes in row
     *  png_byte color_type    color type of pixels
     *  png_uint_32 width      width of row
     *  png_uint_32 rowbytes   number of bytes in row
     *  png_byte color_type    color type of pixels


@@ -207,52 +199,64 @@ count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
     *  png_byte pixel_depth   bits per pixel (depth*channels)
     */
 
     *  png_byte pixel_depth   bits per pixel (depth*channels)
     */
 

-
-    /* counts the number of zero samples (or zero pixels if color_type is 3 */
+    /* Counts the number of zero samples (or zero pixels if color_type is 3 */

 
     if (row_info->color_type == 0 || row_info->color_type == 3)
     {
        int pos = 0;
        png_uint_32 n, nstop;
 
     if (row_info->color_type == 0 || row_info->color_type == 3)
     {
        int pos = 0;
        png_uint_32 n, nstop;

+

        for (n = 0, nstop=row_info->width; n<nstop; n++)
        {
           if (row_info->bit_depth == 1)
           {
        for (n = 0, nstop=row_info->width; n<nstop; n++)
        {
           if (row_info->bit_depth == 1)
           {

-             if (((*dp << pos++ ) & 0x80) == 0) zero_samples++;
+             if (((*dp << pos++ ) & 0x80) == 0)
+                zero_samples++;
+

              if (pos == 8)
              {
                 pos = 0;
                 dp++;
              }
           }
              if (pos == 8)
              {
                 pos = 0;
                 dp++;
              }
           }

+

           if (row_info->bit_depth == 2)
           {
           if (row_info->bit_depth == 2)
           {

-             if (((*dp << (pos+=2)) & 0xc0) == 0) zero_samples++;
+             if (((*dp << (pos+=2)) & 0xc0) == 0)
+                zero_samples++;
+

              if (pos == 8)
              {
                 pos = 0;
                 dp++;
              }
           }
              if (pos == 8)
              {
                 pos = 0;
                 dp++;
              }
           }

+

           if (row_info->bit_depth == 4)
           {
           if (row_info->bit_depth == 4)
           {

-             if (((*dp << (pos+=4)) & 0xf0) == 0) zero_samples++;
+             if (((*dp << (pos+=4)) & 0xf0) == 0)
+                zero_samples++;
+

              if (pos == 8)
              {
                 pos = 0;
                 dp++;
              }
           }
              if (pos == 8)
              {
                 pos = 0;
                 dp++;
              }
           }

+

           if (row_info->bit_depth == 8)
           if (row_info->bit_depth == 8)

-             if (*dp++ == 0) zero_samples++;
+             if (*dp++ == 0)
+                zero_samples++;
+

           if (row_info->bit_depth == 16)
           {
           if (row_info->bit_depth == 16)
           {

-             if ((*dp | *(dp+1)) == 0) zero_samples++;
+             if ((*dp | *(dp+1)) == 0)
+                zero_samples++;

              dp+=2;
           }
        }
     }
              dp+=2;
           }
        }
     }

-    else /* other color types */
+    else /* Other color types */

     {
        png_uint_32 n, nstop;
        int channel;
     {
        png_uint_32 n, nstop;
        int channel;


@@ -264,17 +268,22 @@ count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
           for (channel = 0; channel < color_channels; channel++)
           {
              if (row_info->bit_depth == 8)
           for (channel = 0; channel < color_channels; channel++)
           {
              if (row_info->bit_depth == 8)

-                if (*dp++ == 0) zero_samples++;
+                if (*dp++ == 0)
+                   zero_samples++;
+

              if (row_info->bit_depth == 16)
              {
              if (row_info->bit_depth == 16)
              {

-                if ((*dp | *(dp+1)) == 0) zero_samples++;
+                if ((*dp | *(dp+1)) == 0)
+                   zero_samples++;
+

                 dp+=2;
              }
           }
           if (row_info->color_type > 3)
           {
              dp++;
                 dp+=2;
              }
           }
           if (row_info->color_type > 3)
           {
              dp++;

-             if (row_info->bit_depth == 16)dp++;
+             if (row_info->bit_depth == 16)
+                dp++;

           }
        }
     }
           }
        }
     }


@@ -283,33 +292,85 @@ count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)
 
 static int wrote_question = 0;
 
 
 static int wrote_question = 0;
 

-#if defined(PNG_NO_STDIO)
+#ifndef PNG_STDIO_SUPPORTED

 /* START of code to validate stdio-free compilation */
 /* START of code to validate stdio-free compilation */

-/* These copies of the default read/write functions come from pngrio.c and */
-/* pngwio.c.  They allow "don't include stdio" testing of the library. */
-/* This is the function that does the actual reading of data.  If you are
-   not reading from a standard C stream, you should create a replacement
-   read_data function and use it at run time with png_set_read_fn(), rather
-   than changing the library. */
+/* These copies of the default read/write functions come from pngrio.c and
+ * pngwio.c.  They allow "don't include stdio" testing of the library.
+ * This is the function that does the actual reading of data.  If you are
+ * not reading from a standard C stream, you should create a replacement
+ * read_data function and use it at run time with png_set_read_fn(), rather
+ * than changing the library.
+ */
+
+#ifdef PNG_IO_STATE_SUPPORTED
+void
+pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
+   png_uint_32 io_op);
+void
+pngtest_check_io_state(png_structp png_ptr, png_size_t data_length,
+   png_uint_32 io_op)
+{
+   png_uint_32 io_state = png_get_io_state(png_ptr);
+   int err = 0;
+
+   /* Check if the current operation (reading / writing) is as expected. */
+   if ((io_state & PNG_IO_MASK_OP) != io_op)
+      png_error(png_ptr, "Incorrect operation in I/O state");
+
+   /* Check if the buffer size specific to the current location
+    * (file signature / header / data / crc) is as expected.
+    */
+   switch (io_state & PNG_IO_MASK_LOC)
+   {
+   case PNG_IO_SIGNATURE:
+      if (data_length > 8)
+         err = 1;
+      break;
+   case PNG_IO_CHUNK_HDR:
+      if (data_length != 8)
+         err = 1;
+      break;
+   case PNG_IO_CHUNK_DATA:
+      break;  /* no restrictions here */
+   case PNG_IO_CHUNK_CRC:
+      if (data_length != 4)
+         err = 1;
+      break;
+   default:
+      err = 1;  /* uninitialized */
+   }
+   if (err)
+      png_error(png_ptr, "Bad I/O state or buffer size");
+}
+#endif

 
 #ifndef USE_FAR_KEYWORD
 
 #ifndef USE_FAR_KEYWORD

-static void
+static void PNGCBAPI

 pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
 pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {

-   png_size_t check;
+   png_size_t check = 0;
+   png_voidp io_ptr;

 
    /* fread() returns 0 on error, so it is OK to store this in a png_size_t
     * instead of an int, which is what fread() actually returns.
     */
 
    /* fread() returns 0 on error, so it is OK to store this in a png_size_t
     * instead of an int, which is what fread() actually returns.
     */

-   READFILE((png_FILE_p)png_ptr->io_ptr, data, length, check);
+   io_ptr = png_get_io_ptr(png_ptr);
+   if (io_ptr != NULL)
+   {
+      check = fread(data, 1, length, (png_FILE_p)io_ptr);
+   }

 
    if (check != length)
    {
 
    if (check != length)
    {

-      png_error(png_ptr, "Read Error!");
+      png_error(png_ptr, "Read Error");

    }
    }

+
+#ifdef PNG_IO_STATE_SUPPORTED
+   pngtest_check_io_state(png_ptr, length, PNG_IO_READING);
+#endif

 }
 #else
 }
 #else

-/* this is the model-independent version. Since the standard I/O library
+/* This is the model-independent version. Since the standard I/O library

    can't handle far buffers in the medium and small models, we have to copy
    the data.
 */
    can't handle far buffers in the medium and small models, we have to copy
    the data.
 */


@@ -317,19 +378,19 @@ pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 #define NEAR_BUF_SIZE 1024
 #define MIN(a,b) (a <= b ? a : b)
 
 #define NEAR_BUF_SIZE 1024
 #define MIN(a,b) (a <= b ? a : b)
 

-static void
+static void PNGCBAPI

 pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
 pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {

-   int check;
+   png_size_t check;

    png_byte *n_data;
    png_FILE_p io_ptr;
 
    /* Check if data really is near. If so, use usual code. */
    n_data = (png_byte *)CVT_PTR_NOCHECK(data);
    png_byte *n_data;
    png_FILE_p io_ptr;
 
    /* Check if data really is near. If so, use usual code. */
    n_data = (png_byte *)CVT_PTR_NOCHECK(data);

-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   io_ptr = (png_FILE_p)CVT_PTR(png_get_io_ptr(png_ptr));

    if ((png_bytep)n_data == data)
    {
    if ((png_bytep)n_data == data)
    {

-      READFILE(io_ptr, n_data, length, check);
+      check = fread(n_data, 1, length, io_ptr);

    }
    else
    {
    }
    else
    {


@@ -337,11 +398,12 @@ pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
       png_size_t read, remaining, err;
       check = 0;
       remaining = length;
       png_size_t read, remaining, err;
       check = 0;
       remaining = length;

+

       do
       {
          read = MIN(NEAR_BUF_SIZE, remaining);
       do
       {
          read = MIN(NEAR_BUF_SIZE, remaining);

-         READFILE(io_ptr, buf, 1, err);
-         png_memcpy(data, buf, read); /* copy far buffer to near buffer */
+         err = fread(buf, 1, 1, io_ptr);
+         png_memcpy(data, buf, read); /* Copy far buffer to near buffer */

          if (err != read)
             break;
          else
          if (err != read)
             break;
          else


@@ -351,44 +413,49 @@ pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
       }
       while (remaining != 0);
    }
       }
       while (remaining != 0);
    }

+

    if (check != length)
    if (check != length)

-   {
-      png_error(png_ptr, "read Error");
-   }
+      png_error(png_ptr, "Read Error");
+
+#ifdef PNG_IO_STATE_SUPPORTED
+   pngtest_check_io_state(png_ptr, length, PNG_IO_READING);
+#endif

 }
 #endif /* USE_FAR_KEYWORD */
 
 }
 #endif /* USE_FAR_KEYWORD */
 

-#if defined(PNG_WRITE_FLUSH_SUPPORTED)
-static void
+#ifdef PNG_WRITE_FLUSH_SUPPORTED
+static void PNGCBAPI

 pngtest_flush(png_structp png_ptr)
 {
 pngtest_flush(png_structp png_ptr)
 {

-#if !defined(_WIN32_WCE)
-   png_FILE_p io_ptr;
-   io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr));
-   if (io_ptr != NULL)
-      fflush(io_ptr);
-#endif
+   /* Do nothing; fflush() is said to be just a waste of energy. */
+   PNG_UNUSED(png_ptr)   /* Stifle compiler warning */

 }
 #endif
 
 /* This is the function that does the actual writing of data.  If you are
 }
 #endif
 
 /* This is the function that does the actual writing of data.  If you are

-   not writing to a standard C stream, you should create a replacement
-   write_data function and use it at run time with png_set_write_fn(), rather
-   than changing the library. */
+ * not writing to a standard C stream, you should create a replacement
+ * write_data function and use it at run time with png_set_write_fn(), rather
+ * than changing the library.
+ */

 #ifndef USE_FAR_KEYWORD
 #ifndef USE_FAR_KEYWORD

-static void
+static void PNGCBAPI

 pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
 pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {

-   png_uint_32 check;
+   png_size_t check;
+
+   check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr));

 
 

-   WRITEFILE((png_FILE_p)png_ptr->io_ptr,  data, length, check);

    if (check != length)
    {
       png_error(png_ptr, "Write Error");
    }
    if (check != length)
    {
       png_error(png_ptr, "Write Error");
    }

+
+#ifdef PNG_IO_STATE_SUPPORTED
+   pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);
+#endif

 }
 #else
 }
 #else

-/* this is the model-independent version. Since the standard I/O library
+/* This is the model-independent version. Since the standard I/O library

    can't handle far buffers in the medium and small models, we have to copy
    the data.
 */
    can't handle far buffers in the medium and small models, we have to copy
    the data.
 */


@@ -396,31 +463,34 @@ pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
 #define NEAR_BUF_SIZE 1024
 #define MIN(a,b) (a <= b ? a : b)
 
 #define NEAR_BUF_SIZE 1024
 #define MIN(a,b) (a <= b ? a : b)
 

-static void
+static void PNGCBAPI

 pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {
 pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
 {

-   png_uint_32 check;
+   png_size_t check;

    png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
    png_FILE_p io_ptr;
 
    /* Check if data really is near. If so, use usual code. */
    near_data = (png_byte *)CVT_PTR_NOCHECK(data);
    png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
    png_FILE_p io_ptr;
 
    /* Check if data really is near. If so, use usual code. */
    near_data = (png_byte *)CVT_PTR_NOCHECK(data);

-   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);
+   io_ptr = (png_FILE_p)CVT_PTR(png_get_io_ptr(png_ptr));
+

    if ((png_bytep)near_data == data)
    {
    if ((png_bytep)near_data == data)
    {

-      WRITEFILE(io_ptr, near_data, length, check);
+      check = fwrite(near_data, 1, length, io_ptr);

    }
    }

+

    else
    {
       png_byte buf[NEAR_BUF_SIZE];
       png_size_t written, remaining, err;
       check = 0;
       remaining = length;
    else
    {
       png_byte buf[NEAR_BUF_SIZE];
       png_size_t written, remaining, err;
       check = 0;
       remaining = length;

+

       do
       {
          written = MIN(NEAR_BUF_SIZE, remaining);
       do
       {
          written = MIN(NEAR_BUF_SIZE, remaining);

-         png_memcpy(buf, data, written); /* copy far buffer to near buffer */
-         WRITEFILE(io_ptr, buf, written, err);
+         png_memcpy(buf, data, written); /* Copy far buffer to near buffer */
+         err = fwrite(buf, 1, written, io_ptr);

          if (err != written)
             break;
          else
          if (err != written)
             break;
          else


@@ -430,10 +500,15 @@ pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
       }
       while (remaining != 0);
    }
       }
       while (remaining != 0);
    }

+

    if (check != length)
    {
       png_error(png_ptr, "Write Error");
    }
    if (check != length)
    {
       png_error(png_ptr, "Write Error");
    }

+
+#ifdef PNG_IO_STATE_SUPPORTED
+   pngtest_check_io_state(png_ptr, length, PNG_IO_WRITING);
+#endif

 }
 #endif /* USE_FAR_KEYWORD */
 
 }
 #endif /* USE_FAR_KEYWORD */
 


@@ -442,13 +517,18 @@ pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
  * here if you don't want to.  In the default configuration, png_ptr is
  * not used, but it is passed in case it may be useful.
  */
  * here if you don't want to.  In the default configuration, png_ptr is
  * not used, but it is passed in case it may be useful.
  */

-static void
+static void PNGCBAPI

 pngtest_warning(png_structp png_ptr, png_const_charp message)
 {
    PNG_CONST char *name = "UNKNOWN (ERROR!)";
 pngtest_warning(png_structp png_ptr, png_const_charp message)
 {
    PNG_CONST char *name = "UNKNOWN (ERROR!)";

-   if (png_ptr != NULL && png_ptr->error_ptr != NULL)
-      name = png_ptr->error_ptr;
-   fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
+   char *test;
+   test = png_get_error_ptr(png_ptr);
+
+   if (test == NULL)
+     fprintf(STDERR, "%s: libpng warning: %s\n", name, message);
+
+   else
+     fprintf(STDERR, "%s: libpng warning: %s\n", test, message);

 }
 
 /* This is the default error handling function.  Note that replacements for
 }
 
 /* This is the default error handling function.  Note that replacements for


@@ -456,30 +536,32 @@ pngtest_warning(png_structp png_ptr, png_const_charp message)
  * function is used by default, or if the program supplies NULL for the
  * error function pointer in png_set_error_fn().
  */
  * function is used by default, or if the program supplies NULL for the
  * error function pointer in png_set_error_fn().
  */

-static void
+static void PNGCBAPI

 pngtest_error(png_structp png_ptr, png_const_charp message)
 {
    pngtest_warning(png_ptr, message);
    /* We can return because png_error calls the default handler, which is
 pngtest_error(png_structp png_ptr, png_const_charp message)
 {
    pngtest_warning(png_ptr, message);
    /* We can return because png_error calls the default handler, which is

-    * actually OK in this case. */
+    * actually OK in this case.
+    */

 }
 }

-#endif /* PNG_NO_STDIO */
+#endif /* !PNG_STDIO_SUPPORTED */

 /* END of code to validate stdio-free compilation */
 
 /* START of code to validate memory allocation and deallocation */
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
 
 /* Allocate memory.  For reasonable files, size should never exceed
 /* END of code to validate stdio-free compilation */
 
 /* START of code to validate memory allocation and deallocation */
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
 
 /* Allocate memory.  For reasonable files, size should never exceed

-   64K.  However, zlib may allocate more then 64K if you don't tell
-   it not to.  See zconf.h and png.h for more information.  zlib does
-   need to allocate exactly 64K, so whatever you call here must
-   have the ability to do that.
-
-   This piece of code can be compiled to validate max 64K allocations
-   by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K. */
+ * 64K.  However, zlib may allocate more then 64K if you don't tell
+ * it not to.  See zconf.h and png.h for more information.  zlib does
+ * need to allocate exactly 64K, so whatever you call here must
+ * have the ability to do that.
+ *
+ * This piece of code can be compiled to validate max 64K allocations
+ * by setting MAXSEG_64K in zlib zconf.h *or* PNG_MAX_MALLOC_64K.
+ */

 typedef struct memory_information
 {
 typedef struct memory_information
 {

-   png_uint_32               size;
+   png_alloc_size_t          size;

    png_voidp                 pointer;
    struct memory_information FAR *next;
 } memory_information;
    png_voidp                 pointer;
    struct memory_information FAR *next;
 } memory_information;


@@ -491,15 +573,17 @@ static int maximum_allocation = 0;
 static int total_allocation = 0;
 static int num_allocations = 0;
 
 static int total_allocation = 0;
 static int num_allocations = 0;
 

-png_voidp png_debug_malloc PNGARG((png_structp png_ptr, png_uint_32 size));
-void png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));
+png_voidp PNGCBAPI png_debug_malloc PNGARG((png_structp png_ptr,
+    png_alloc_size_t size));
+void PNGCBAPI png_debug_free PNGARG((png_structp png_ptr, png_voidp ptr));

 
 png_voidp
 
 png_voidp

-png_debug_malloc(png_structp png_ptr, png_uint_32 size)
+PNGCBAPI png_debug_malloc(png_structp png_ptr, png_alloc_size_t size)

 {
 
    /* png_malloc has already tested for NULL; png_create_struct calls
 {
 
    /* png_malloc has already tested for NULL; png_create_struct calls

-      png_debug_malloc directly, with png_ptr == NULL which is OK */
+    * png_debug_malloc directly, with png_ptr == NULL which is OK
+    */

 
    if (size == 0)
       return (NULL);
 
    if (size == 0)
       return (NULL);


@@ -511,42 +595,49 @@ png_debug_malloc(png_structp png_ptr, png_uint_32 size)
       memory_infop pinfo;
       png_set_mem_fn(png_ptr, NULL, NULL, NULL);
       pinfo = (memory_infop)png_malloc(png_ptr,
       memory_infop pinfo;
       png_set_mem_fn(png_ptr, NULL, NULL, NULL);
       pinfo = (memory_infop)png_malloc(png_ptr,

-         (png_uint_32)png_sizeof(*pinfo));
+         png_sizeof(*pinfo));

       pinfo->size = size;
       current_allocation += size;
       total_allocation += size;
       num_allocations ++;
       pinfo->size = size;
       current_allocation += size;
       total_allocation += size;
       num_allocations ++;

+

       if (current_allocation > maximum_allocation)
          maximum_allocation = current_allocation;
       if (current_allocation > maximum_allocation)
          maximum_allocation = current_allocation;

-      pinfo->pointer = (png_voidp)png_malloc(png_ptr, size);
+
+      pinfo->pointer = png_malloc(png_ptr, size);

       /* Restore malloc_fn and free_fn */
       /* Restore malloc_fn and free_fn */

+

       png_set_mem_fn(png_ptr,
       png_set_mem_fn(png_ptr,

-          png_voidp_NULL, (png_malloc_ptr)png_debug_malloc,
-          (png_free_ptr)png_debug_free);
+          NULL, png_debug_malloc, png_debug_free);
+

       if (size != 0 && pinfo->pointer == NULL)
       {
          current_allocation -= size;
          total_allocation -= size;
          png_error(png_ptr,
       if (size != 0 && pinfo->pointer == NULL)
       {
          current_allocation -= size;
          total_allocation -= size;
          png_error(png_ptr,

-           "out of memory in pngtest->png_debug_malloc.");
+           "out of memory in pngtest->png_debug_malloc");

       }
       }

+

       pinfo->next = pinformation;
       pinformation = pinfo;
       /* Make sure the caller isn't assuming zeroed memory. */
       png_memset(pinfo->pointer, 0xdd, pinfo->size);
       pinfo->next = pinformation;
       pinformation = pinfo;
       /* Make sure the caller isn't assuming zeroed memory. */
       png_memset(pinfo->pointer, 0xdd, pinfo->size);

+

       if (verbose)
       if (verbose)

-         printf("png_malloc %lu bytes at %x\n", (unsigned long)size,
+         printf("png_malloc %lu bytes at %p\n", (unsigned long)size,

             pinfo->pointer);
             pinfo->pointer);

+

       return (png_voidp)(pinfo->pointer);
    }
 }
 
 /* Free a pointer.  It is removed from the list at the same time. */
       return (png_voidp)(pinfo->pointer);
    }
 }
 
 /* Free a pointer.  It is removed from the list at the same time. */

-void
+void PNGCBAPI

 png_debug_free(png_structp png_ptr, png_voidp ptr)
 {
    if (png_ptr == NULL)
       fprintf(STDERR, "NULL pointer to png_debug_free.\n");
 png_debug_free(png_structp png_ptr, png_voidp ptr)
 {
    if (png_ptr == NULL)
       fprintf(STDERR, "NULL pointer to png_debug_free.\n");

+

    if (ptr == 0)
    {
 #if 0 /* This happens all the time. */
    if (ptr == 0)
    {
 #if 0 /* This happens all the time. */


@@ -558,9 +649,11 @@ png_debug_free(png_structp png_ptr, png_voidp ptr)
    /* Unlink the element from the list. */
    {
       memory_infop FAR *ppinfo = &pinformation;
    /* Unlink the element from the list. */
    {
       memory_infop FAR *ppinfo = &pinformation;

+

       for (;;)
       {
          memory_infop pinfo = *ppinfo;
       for (;;)
       {
          memory_infop pinfo = *ppinfo;

+

          if (pinfo->pointer == ptr)
          {
             *ppinfo = pinfo->next;
          if (pinfo->pointer == ptr)
          {
             *ppinfo = pinfo->next;


@@ -574,18 +667,21 @@ png_debug_free(png_structp png_ptr, png_voidp ptr)
             pinfo = NULL;
             break;
          }
             pinfo = NULL;
             break;
          }

+

          if (pinfo->next == NULL)
          {
             fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr);
             break;
          }
          if (pinfo->next == NULL)
          {
             fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr);
             break;
          }

+

          ppinfo = &pinfo->next;
       }
    }
 
    /* Finally free the data. */
    if (verbose)
          ppinfo = &pinfo->next;
       }
    }
 
    /* Finally free the data. */
    if (verbose)

-      printf("Freeing %x\n", ptr);
+      printf("Freeing %p\n", ptr);
+

    png_free_default(png_ptr, ptr);
    ptr = NULL;
 }
    png_free_default(png_ptr, ptr);
    ptr = NULL;
 }


@@ -594,9 +690,9 @@ png_debug_free(png_structp png_ptr, png_voidp ptr)
 
 
 /* Demonstration of user chunk support of the sTER and vpAg chunks */
 
 
 /* Demonstration of user chunk support of the sTER and vpAg chunks */

-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED

 
 

-/* (sTER is a public chunk not yet understood by libpng.  vpAg is a private
+/* (sTER is a public chunk not yet known by libpng.  vpAg is a private

 chunk used in ImageMagick to store "virtual page" size).  */
 
 static png_uint_32 user_chunk_data[4];
 chunk used in ImageMagick to store "virtual page" size).  */
 
 static png_uint_32 user_chunk_data[4];


@@ -607,53 +703,56 @@ static png_uint_32 user_chunk_data[4];
      * 3: vpAg units
      */
 
      * 3: vpAg units
      */
 

-static int read_user_chunk_callback(png_struct *png_ptr,
+static int PNGCBAPI read_user_chunk_callback(png_struct *png_ptr,

    png_unknown_chunkp chunk)
 {
    png_unknown_chunkp chunk)
 {

-  png_uint_32
-    *user_chunk_data;
-
-  /* Return one of the following: */
-     /* return (-n);  chunk had an error */
-     /* return (0);  did not recognize */
-     /* return (n);  success */
-
-  /* The unknown chunk structure contains the chunk data:
-   * png_byte name[5];
-   * png_byte *data;
-   * png_size_t size;
-   *
-   *  Note that libpng has already taken care of the CRC handling.
-   */
-
-  if (chunk->name[0] == 115 && chunk->name[1] ==  84 &&     /* s  T */
-      chunk->name[2] ==  69 && chunk->name[3] ==  82)       /* E  R */
-     {
-       /* Found sTER chunk */
-       if (chunk->size != 1)
-         return (-1); /* Error return */
-       if (chunk->data[0] != 0 && chunk->data[0] != 1)
-          return (-1);  /* Invalid mode */
-       user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
-       user_chunk_data[0]=chunk->data[0]+1;
-       return (1);
-     }
-  if (chunk->name[0] != 118 || chunk->name[1] != 112 ||    /* v  p */
-      chunk->name[2] !=  65 || chunk->name[3] != 103)      /* A  g */
-    return (0); /* Did not recognize */
-
-  /* Found ImageMagick vpAg chunk */
-
-  if (chunk->size != 9)
-    return (-1); /* Error return */
-
-  user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
-
-  user_chunk_data[1]=png_get_uint_31(png_ptr, chunk->data);
-  user_chunk_data[2]=png_get_uint_31(png_ptr, chunk->data + 4);
-  user_chunk_data[3]=(png_uint_32)chunk->data[8];
-
-  return (1);
+   png_uint_32
+     *my_user_chunk_data;
+
+   /* Return one of the following:
+    *    return (-n);  chunk had an error
+    *    return (0);  did not recognize
+    *    return (n);  success
+    *
+    * The unknown chunk structure contains the chunk data:
+    * png_byte name[5];
+    * png_byte *data;
+    * png_size_t size;
+    *
+    * Note that libpng has already taken care of the CRC handling.
+    */
+
+   if (chunk->name[0] == 115 && chunk->name[1] ==  84 &&     /* s  T */
+       chunk->name[2] ==  69 && chunk->name[3] ==  82)       /* E  R */
+      {
+         /* Found sTER chunk */
+         if (chunk->size != 1)
+            return (-1); /* Error return */
+
+         if (chunk->data[0] != 0 && chunk->data[0] != 1)
+            return (-1);  /* Invalid mode */
+
+         my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
+         my_user_chunk_data[0]=chunk->data[0]+1;
+         return (1);
+      }
+
+   if (chunk->name[0] != 118 || chunk->name[1] != 112 ||    /* v  p */
+       chunk->name[2] !=  65 || chunk->name[3] != 103)      /* A  g */
+      return (0); /* Did not recognize */
+
+   /* Found ImageMagick vpAg chunk */
+
+   if (chunk->size != 9)
+      return (-1); /* Error return */
+
+   my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
+
+   my_user_chunk_data[1]=png_get_uint_31(png_ptr, chunk->data);
+   my_user_chunk_data[2]=png_get_uint_31(png_ptr, chunk->data + 4);
+   my_user_chunk_data[3]=(png_uint_32)chunk->data[8];
+
+   return (1);

 
 }
 #endif
 
 }
 #endif


@@ -683,82 +782,65 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
    int bit_depth, color_type;
 #ifdef PNG_SETJMP_SUPPORTED
 #ifdef USE_FAR_KEYWORD
    int bit_depth, color_type;
 #ifdef PNG_SETJMP_SUPPORTED
 #ifdef USE_FAR_KEYWORD

-   jmp_buf jmpbuf;
+   jmp_buf tmp_jmpbuf;

 #endif
 #endif
 
 #endif
 #endif
 

-#if defined(_WIN32_WCE)
-   TCHAR path[MAX_PATH];
-#endif

    char inbuf[256], outbuf[256];
 
    row_buf = NULL;
 
    char inbuf[256], outbuf[256];
 
    row_buf = NULL;
 

-#if defined(_WIN32_WCE)
-   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
-   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
-#else

    if ((fpin = fopen(inname, "rb")) == NULL)
    if ((fpin = fopen(inname, "rb")) == NULL)

-#endif

    {
       fprintf(STDERR, "Could not find input file %s\n", inname);
       return (1);
    }
 
    {
       fprintf(STDERR, "Could not find input file %s\n", inname);
       return (1);
    }
 

-#if defined(_WIN32_WCE)
-   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
-   if ((fpout = CreateFile(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL)) == INVALID_HANDLE_VALUE)
-#else

    if ((fpout = fopen(outname, "wb")) == NULL)
    if ((fpout = fopen(outname, "wb")) == NULL)

-#endif

    {
       fprintf(STDERR, "Could not open output file %s\n", outname);
       FCLOSE(fpin);
       return (1);
    }
 
    {
       fprintf(STDERR, "Could not open output file %s\n", outname);
       FCLOSE(fpin);
       return (1);
    }
 

-   png_debug(0, "Allocating read and write structures");
+   pngtest_debug("Allocating read and write structures");

 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
    read_ptr =
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
    read_ptr =

-      png_create_read_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
-      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+      png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,
+      NULL, NULL, NULL, png_debug_malloc, png_debug_free);

 #else
    read_ptr =
 #else
    read_ptr =

-      png_create_read_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-      png_error_ptr_NULL, png_error_ptr_NULL);
+      png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);

 #endif
 #endif

-#if defined(PNG_NO_STDIO)
+#ifndef PNG_STDIO_SUPPORTED

    png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
        pngtest_warning);
 #endif
 
    png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
        pngtest_warning);
 #endif
 

-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
-  user_chunk_data[0] = 0;
-  user_chunk_data[1] = 0;
-  user_chunk_data[2] = 0;
-  user_chunk_data[3] = 0;
-  png_set_read_user_chunk_fn(read_ptr, user_chunk_data,
-    read_user_chunk_callback);
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
+   user_chunk_data[0] = 0;
+   user_chunk_data[1] = 0;
+   user_chunk_data[2] = 0;
+   user_chunk_data[3] = 0;
+   png_set_read_user_chunk_fn(read_ptr, user_chunk_data,
+     read_user_chunk_callback);

 
 #endif
 #ifdef PNG_WRITE_SUPPORTED
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
    write_ptr =
 
 #endif
 #ifdef PNG_WRITE_SUPPORTED
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
    write_ptr =

-      png_create_write_struct_2(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-      png_error_ptr_NULL, png_error_ptr_NULL, png_voidp_NULL,
-      (png_malloc_ptr)png_debug_malloc, (png_free_ptr)png_debug_free);
+      png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL,
+      NULL, NULL, NULL, png_debug_malloc, png_debug_free);

 #else
    write_ptr =
 #else
    write_ptr =

-      png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
-      png_error_ptr_NULL, png_error_ptr_NULL);
+      png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);

 #endif
 #endif

-#if defined(PNG_NO_STDIO)
+#ifndef PNG_STDIO_SUPPORTED

    png_set_error_fn(write_ptr, (png_voidp)inname, pngtest_error,
        pngtest_warning);
 #endif
 #endif
    png_set_error_fn(write_ptr, (png_voidp)inname, pngtest_error,
        pngtest_warning);
 #endif
 #endif

-   png_debug(0, "Allocating read_info, write_info and end_info structures");
+   pngtest_debug("Allocating read_info, write_info and end_info structures");

    read_info_ptr = png_create_info_struct(read_ptr);
    end_info_ptr = png_create_info_struct(read_ptr);
 #ifdef PNG_WRITE_SUPPORTED
    read_info_ptr = png_create_info_struct(read_ptr);
    end_info_ptr = png_create_info_struct(read_ptr);
 #ifdef PNG_WRITE_SUPPORTED


@@ -767,9 +849,9 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 #endif
 
 #ifdef PNG_SETJMP_SUPPORTED
 #endif
 
 #ifdef PNG_SETJMP_SUPPORTED

-   png_debug(0, "Setting jmpbuf for read struct");
+   pngtest_debug("Setting jmpbuf for read struct");

 #ifdef USE_FAR_KEYWORD
 #ifdef USE_FAR_KEYWORD

-   if (setjmp(jmpbuf))
+   if (setjmp(tmp_jmpbuf))

 #else
    if (setjmp(png_jmpbuf(read_ptr)))
 #endif
 #else
    if (setjmp(png_jmpbuf(read_ptr)))
 #endif


@@ -787,13 +869,14 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       return (1);
    }
 #ifdef USE_FAR_KEYWORD
       return (1);
    }
 #ifdef USE_FAR_KEYWORD

-   png_memcpy(png_jmpbuf(read_ptr), jmpbuf, png_sizeof(jmp_buf));
+   png_memcpy(png_jmpbuf(read_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));

 #endif
 
 #ifdef PNG_WRITE_SUPPORTED
 #endif
 
 #ifdef PNG_WRITE_SUPPORTED

-   png_debug(0, "Setting jmpbuf for write struct");
+   pngtest_debug("Setting jmpbuf for write struct");

 #ifdef USE_FAR_KEYWORD
 #ifdef USE_FAR_KEYWORD

-   if (setjmp(jmpbuf))
+
+   if (setjmp(tmp_jmpbuf))

 #else
    if (setjmp(png_jmpbuf(write_ptr)))
 #endif
 #else
    if (setjmp(png_jmpbuf(write_ptr)))
 #endif


@@ -808,14 +891,15 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       FCLOSE(fpout);
       return (1);
    }
       FCLOSE(fpout);
       return (1);
    }

+

 #ifdef USE_FAR_KEYWORD
 #ifdef USE_FAR_KEYWORD

-   png_memcpy(png_jmpbuf(write_ptr), jmpbuf, png_sizeof(jmp_buf));
+   png_memcpy(png_jmpbuf(write_ptr), tmp_jmpbuf, png_sizeof(jmp_buf));

 #endif
 #endif
 #endif
 
 #endif
 #endif
 #endif
 

-   png_debug(0, "Initializing input and output streams");
-#if !defined(PNG_NO_STDIO)
+   pngtest_debug("Initializing input and output streams");
+#ifdef PNG_STDIO_SUPPORTED

    png_init_io(read_ptr, fpin);
 #  ifdef PNG_WRITE_SUPPORTED
    png_init_io(write_ptr, fpout);
    png_init_io(read_ptr, fpin);
 #  ifdef PNG_WRITE_SUPPORTED
    png_init_io(write_ptr, fpout);


@@ -824,13 +908,22 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
    png_set_read_fn(read_ptr, (png_voidp)fpin, pngtest_read_data);
 #  ifdef PNG_WRITE_SUPPORTED
    png_set_write_fn(write_ptr, (png_voidp)fpout,  pngtest_write_data,
    png_set_read_fn(read_ptr, (png_voidp)fpin, pngtest_read_data);
 #  ifdef PNG_WRITE_SUPPORTED
    png_set_write_fn(write_ptr, (png_voidp)fpout,  pngtest_write_data,

-#    if defined(PNG_WRITE_FLUSH_SUPPORTED)
+#    ifdef PNG_WRITE_FLUSH_SUPPORTED

       pngtest_flush);
 #    else
       NULL);
 #    endif
 #  endif
 #endif
       pngtest_flush);
 #    else
       NULL);
 #    endif
 #  endif
 #endif

+
+#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
+   /* Normally one would use Z_DEFAULT_STRATEGY for text compression.
+    * This is here just to make pngtest replicate the results from libpng
+    * versions prior to 1.5.4, and to test this new API.
+    */
+   png_set_text_compression_strategy(write_ptr, Z_FILTERED);
+#endif
+

    if (status_dots_requested == 1)
    {
 #ifdef PNG_WRITE_SUPPORTED
    if (status_dots_requested == 1)
    {
 #ifdef PNG_WRITE_SUPPORTED


@@ -838,46 +931,49 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 #endif
       png_set_read_status_fn(read_ptr, read_row_callback);
    }
 #endif
       png_set_read_status_fn(read_ptr, read_row_callback);
    }

+

    else
    {
 #ifdef PNG_WRITE_SUPPORTED
    else
    {
 #ifdef PNG_WRITE_SUPPORTED

-      png_set_write_status_fn(write_ptr, png_write_status_ptr_NULL);
+      png_set_write_status_fn(write_ptr, NULL);

 #endif
 #endif

-      png_set_read_status_fn(read_ptr, png_read_status_ptr_NULL);
+      png_set_read_status_fn(read_ptr, NULL);

    }
 
    }
 

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

    {
    {

-     int i;
-     for (i = 0; i<256; i++)
-        filters_used[i] = 0;
-     png_set_read_user_transform_fn(read_ptr, count_filters);
+      int i;
+
+      for (i = 0; i<256; i++)
+         filters_used[i] = 0;
+
+      png_set_read_user_transform_fn(read_ptr, count_filters);

    }
 #endif
    }
 #endif

-#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

    zero_samples = 0;
    png_set_write_user_transform_fn(write_ptr, count_zero_samples);
 #endif
 
    zero_samples = 0;
    png_set_write_user_transform_fn(write_ptr, count_zero_samples);
 #endif
 

-#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED

 #  ifndef PNG_HANDLE_CHUNK_ALWAYS
 #    define PNG_HANDLE_CHUNK_ALWAYS       3
 #  endif
    png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
 #  ifndef PNG_HANDLE_CHUNK_ALWAYS
 #    define PNG_HANDLE_CHUNK_ALWAYS       3
 #  endif
    png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,

-      png_bytep_NULL, 0);
+      NULL, 0);

 #endif
 #endif

-#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

 #  ifndef PNG_HANDLE_CHUNK_IF_SAFE
 #    define PNG_HANDLE_CHUNK_IF_SAFE      2
 #  endif
    png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_IF_SAFE,
 #  ifndef PNG_HANDLE_CHUNK_IF_SAFE
 #    define PNG_HANDLE_CHUNK_IF_SAFE      2
 #  endif
    png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_IF_SAFE,

-      png_bytep_NULL, 0);
+      NULL, 0);

 #endif
 
 #endif
 

-   png_debug(0, "Reading info struct");
+   pngtest_debug("Reading info struct");

    png_read_info(read_ptr, read_info_ptr);
 
    png_read_info(read_ptr, read_info_ptr);
 

-   png_debug(0, "Transferring info struct");
+   pngtest_debug("Transferring info struct");

    {
       int interlace_type, compression_type, filter_type;
 
    {
       int interlace_type, compression_type, filter_type;
 


@@ -885,42 +981,42 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
           &color_type, &interlace_type, &compression_type, &filter_type))
       {
          png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,
           &color_type, &interlace_type, &compression_type, &filter_type))
       {
          png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth,

-#if defined(PNG_WRITE_INTERLACING_SUPPORTED)
+#ifdef PNG_WRITE_INTERLACING_SUPPORTED

             color_type, interlace_type, compression_type, filter_type);
 #else
             color_type, PNG_INTERLACE_NONE, compression_type, filter_type);
 #endif
       }
    }
             color_type, interlace_type, compression_type, filter_type);
 #else
             color_type, PNG_INTERLACE_NONE, compression_type, filter_type);
 #endif
       }
    }

-#if defined(PNG_FIXED_POINT_SUPPORTED)
-#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FIXED_POINT_SUPPORTED
+#ifdef PNG_cHRM_SUPPORTED

    {
       png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
          blue_y;
    {
       png_fixed_point white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
          blue_y;

-      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
-         &red_y, &green_x, &green_y, &blue_x, &blue_y))
+
+      if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y,
+         &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y))

       {
          png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
             red_y, green_x, green_y, blue_x, blue_y);
       }
    }
 #endif
       {
          png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x,
             red_y, green_x, green_y, blue_x, blue_y);
       }
    }
 #endif

-#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_gAMA_SUPPORTED

    {
       png_fixed_point gamma;
 
       if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma))
    {
       png_fixed_point gamma;
 
       if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma))

-      {

          png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);
          png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma);

-      }

    }
 #endif
 #else /* Use floating point versions */
    }
 #endif
 #else /* Use floating point versions */

-#if defined(PNG_FLOATING_POINT_SUPPORTED)
-#if defined(PNG_cHRM_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED
+#ifdef PNG_cHRM_SUPPORTED

    {
       double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
          blue_y;
    {
       double white_x, white_y, red_x, red_y, green_x, green_y, blue_x,
          blue_y;

+

       if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
          &red_y, &green_x, &green_y, &blue_x, &blue_y))
       {
       if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x,
          &red_y, &green_x, &green_y, &blue_x, &blue_y))
       {


@@ -929,22 +1025,20 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_gAMA_SUPPORTED)
+#ifdef PNG_gAMA_SUPPORTED

    {
       double gamma;
 
       if (png_get_gAMA(read_ptr, read_info_ptr, &gamma))
    {
       double gamma;
 
       if (png_get_gAMA(read_ptr, read_info_ptr, &gamma))

-      {

          png_set_gAMA(write_ptr, write_info_ptr, gamma);
          png_set_gAMA(write_ptr, write_info_ptr, gamma);

-      }

    }
 #endif
    }
 #endif

-#endif /* floating point */
-#endif /* fixed point */
-#if defined(PNG_iCCP_SUPPORTED)
+#endif /* Floating point */
+#endif /* Fixed point */
+#ifdef PNG_iCCP_SUPPORTED

    {
       png_charp name;
    {
       png_charp name;

-      png_charp profile;
+      png_bytep profile;

       png_uint_32 proflen;
       int compression_type;
 
       png_uint_32 proflen;
       int compression_type;
 


@@ -956,14 +1050,12 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_sRGB_SUPPORTED)
+#ifdef PNG_sRGB_SUPPORTED

    {
       int intent;
 
       if (png_get_sRGB(read_ptr, read_info_ptr, &intent))
    {
       int intent;
 
       if (png_get_sRGB(read_ptr, read_info_ptr, &intent))

-      {

          png_set_sRGB(write_ptr, write_info_ptr, intent);
          png_set_sRGB(write_ptr, write_info_ptr, intent);

-      }

    }
 #endif
    {
    }
 #endif
    {


@@ -971,11 +1063,9 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       int num_palette;
 
       if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))
       int num_palette;
 
       if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))

-      {

          png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
          png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);

-      }

    }
    }

-#if defined(PNG_bKGD_SUPPORTED)
+#ifdef PNG_bKGD_SUPPORTED

    {
       png_color_16p background;
 
    {
       png_color_16p background;
 


@@ -985,29 +1075,27 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_hIST_SUPPORTED)
+#ifdef PNG_hIST_SUPPORTED

    {
       png_uint_16p hist;
 
       if (png_get_hIST(read_ptr, read_info_ptr, &hist))
    {
       png_uint_16p hist;
 
       if (png_get_hIST(read_ptr, read_info_ptr, &hist))

-      {

          png_set_hIST(write_ptr, write_info_ptr, hist);
          png_set_hIST(write_ptr, write_info_ptr, hist);

-      }

    }
 #endif
    }
 #endif

-#if defined(PNG_oFFs_SUPPORTED)
+#ifdef PNG_oFFs_SUPPORTED

    {
       png_int_32 offset_x, offset_y;
       int unit_type;
 
       if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y,
    {
       png_int_32 offset_x, offset_y;
       int unit_type;
 
       if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y,

-         &unit_type))
+          &unit_type))

       {
          png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
       }
    }
 #endif
       {
          png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type);
       }
    }
 #endif

-#if defined(PNG_pCAL_SUPPORTED)
+#ifdef PNG_pCAL_SUPPORTED

    {
       png_charp purpose, units;
       png_charpp params;
    {
       png_charp purpose, units;
       png_charpp params;


@@ -1022,28 +1110,24 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_pHYs_SUPPORTED)
+#ifdef PNG_pHYs_SUPPORTED

    {
       png_uint_32 res_x, res_y;
       int unit_type;
 
       if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type))
    {
       png_uint_32 res_x, res_y;
       int unit_type;
 
       if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type))

-      {

          png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);
          png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type);

-      }

    }
 #endif
    }
 #endif

-#if defined(PNG_sBIT_SUPPORTED)
+#ifdef PNG_sBIT_SUPPORTED

    {
       png_color_8p sig_bit;
 
       if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))
    {
       png_color_8p sig_bit;
 
       if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))

-      {

          png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
          png_set_sBIT(write_ptr, write_info_ptr, sig_bit);

-      }

    }
 #endif
    }
 #endif

-#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_sCAL_SUPPORTED

 #ifdef PNG_FLOATING_POINT_SUPPORTED
    {
       int unit;
 #ifdef PNG_FLOATING_POINT_SUPPORTED
    {
       int unit;


@@ -1064,80 +1148,89 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
           &scal_height))
       {
       if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width,
           &scal_height))
       {

-         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width, scal_height);
+         png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width,
+             scal_height);

       }
    }
 #endif
 #endif
 #endif
       }
    }
 #endif
 #endif
 #endif

-#if defined(PNG_TEXT_SUPPORTED)
+#ifdef PNG_TEXT_SUPPORTED

    {
       png_textp text_ptr;
       int num_text;
 
       if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
       {
    {
       png_textp text_ptr;
       int num_text;
 
       if (png_get_text(read_ptr, read_info_ptr, &text_ptr, &num_text) > 0)
       {

-         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks", num_text);
+         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);
+
+         if (verbose)
+            printf("\nText compression=%d\n", text_ptr->compression);
+

          png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
       }
    }
 #endif
          png_set_text(write_ptr, write_info_ptr, text_ptr, num_text);
       }
    }
 #endif

-#if defined(PNG_tIME_SUPPORTED)
+#ifdef PNG_tIME_SUPPORTED

    {
       png_timep mod_time;
 
       if (png_get_tIME(read_ptr, read_info_ptr, &mod_time))
       {
          png_set_tIME(write_ptr, write_info_ptr, mod_time);
    {
       png_timep mod_time;
 
       if (png_get_tIME(read_ptr, read_info_ptr, &mod_time))
       {
          png_set_tIME(write_ptr, write_info_ptr, mod_time);

-#if defined(PNG_TIME_RFC1123_SUPPORTED)
-         /* we have to use png_memcpy instead of "=" because the string
-            pointed to by png_convert_to_rfc1123() gets free'ed before
-            we use it */
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+         /* We have to use png_memcpy instead of "=" because the string
+          * pointed to by png_convert_to_rfc1123() gets free'ed before
+          * we use it.
+          */

          png_memcpy(tIME_string,
                     png_convert_to_rfc1123(read_ptr, mod_time),
                     png_sizeof(tIME_string));
          png_memcpy(tIME_string,
                     png_convert_to_rfc1123(read_ptr, mod_time),
                     png_sizeof(tIME_string));

+

          tIME_string[png_sizeof(tIME_string) - 1] = '\0';
          tIME_chunk_present++;
 #endif /* PNG_TIME_RFC1123_SUPPORTED */
       }
    }
 #endif
          tIME_string[png_sizeof(tIME_string) - 1] = '\0';
          tIME_chunk_present++;
 #endif /* PNG_TIME_RFC1123_SUPPORTED */
       }
    }
 #endif

-#if defined(PNG_tRNS_SUPPORTED)
+#ifdef PNG_tRNS_SUPPORTED

    {
    {

-      png_bytep trans;
+      png_bytep trans_alpha;

       int num_trans;
       int num_trans;

-      png_color_16p trans_values;
+      png_color_16p trans_color;

 
 

-      if (png_get_tRNS(read_ptr, read_info_ptr, &trans, &num_trans,
-         &trans_values))
+      if (png_get_tRNS(read_ptr, read_info_ptr, &trans_alpha, &num_trans,
+         &trans_color))

       {
       {

-         int sample_max = (1 << read_info_ptr->bit_depth);
+         int sample_max = (1 << bit_depth);

          /* libpng doesn't reject a tRNS chunk with out-of-range samples */
          /* libpng doesn't reject a tRNS chunk with out-of-range samples */

-         if (!((read_info_ptr->color_type == PNG_COLOR_TYPE_GRAY &&
-            (int)trans_values->gray > sample_max) ||
-            (read_info_ptr->color_type == PNG_COLOR_TYPE_RGB &&
-            ((int)trans_values->red > sample_max ||
-            (int)trans_values->green > sample_max ||
-            (int)trans_values->blue > sample_max))))
-           png_set_tRNS(write_ptr, write_info_ptr, trans, num_trans,
-              trans_values);
+         if (!((color_type == PNG_COLOR_TYPE_GRAY &&
+             (int)trans_color->gray > sample_max) ||
+             (color_type == PNG_COLOR_TYPE_RGB &&
+             ((int)trans_color->red > sample_max ||
+             (int)trans_color->green > sample_max ||
+             (int)trans_color->blue > sample_max))))
+            png_set_tRNS(write_ptr, write_info_ptr, trans_alpha, num_trans,
+               trans_color);

       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

    {
       png_unknown_chunkp unknowns;
    {
       png_unknown_chunkp unknowns;

-      int num_unknowns = (int)png_get_unknown_chunks(read_ptr, read_info_ptr,
+      int num_unknowns = png_get_unknown_chunks(read_ptr, read_info_ptr,

          &unknowns);
          &unknowns);

+

       if (num_unknowns)
       {
       if (num_unknowns)
       {

-         png_size_t i;
+         int i;

          png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
            num_unknowns);
          png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns,
            num_unknowns);

-         /* copy the locations from the read_info_ptr.  The automatically
-            generated locations in write_info_ptr are wrong because we
-            haven't written anything yet */
-         for (i = 0; i < (png_size_t)num_unknowns; i++)
+         /* Copy the locations from the read_info_ptr.  The automatically
+          * generated locations in write_info_ptr are wrong because we
+          * haven't written anything yet.
+          */
+         for (i = 0; i < num_unknowns; i++)

            png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
              unknowns[i].location);
       }
            png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
              unknowns[i].location);
       }


@@ -1145,55 +1238,59 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 #endif
 
 #ifdef PNG_WRITE_SUPPORTED
 #endif
 
 #ifdef PNG_WRITE_SUPPORTED

-   png_debug(0, "Writing info struct");
+   pngtest_debug("Writing info struct");

 
 /* If we wanted, we could write info in two steps:
 
 /* If we wanted, we could write info in two steps:

-   png_write_info_before_PLTE(write_ptr, write_info_ptr);
+ * png_write_info_before_PLTE(write_ptr, write_info_ptr);

  */
    png_write_info(write_ptr, write_info_ptr);
 
  */
    png_write_info(write_ptr, write_info_ptr);
 

-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED

    if (user_chunk_data[0] != 0)
    {
    if (user_chunk_data[0] != 0)
    {

-     png_byte png_sTER[5] = {115,  84,  69,  82, '\0'};
+      png_byte png_sTER[5] = {115,  84,  69,  82, '\0'};
+
+      unsigned char
+        ster_chunk_data[1];

 
 

-     unsigned char
-       ster_chunk_data[1];
+      if (verbose)
+         fprintf(STDERR, "\n stereo mode = %lu\n",
+           (unsigned long)(user_chunk_data[0] - 1));

 
 

-     if (verbose)
-        fprintf(STDERR, "stereo mode = %lu\n",
-          (unsigned long)(user_chunk_data[0] - 1));
-     ster_chunk_data[0]=(unsigned char)(user_chunk_data[0] - 1);
-     png_write_chunk(write_ptr, png_sTER, ster_chunk_data, 1);
+      ster_chunk_data[0]=(unsigned char)(user_chunk_data[0] - 1);
+      png_write_chunk(write_ptr, png_sTER, ster_chunk_data, 1);

    }
    }

+

    if (user_chunk_data[1] != 0 || user_chunk_data[2] != 0)
    {
    if (user_chunk_data[1] != 0 || user_chunk_data[2] != 0)
    {

-     png_byte png_vpAg[5] = {118, 112,  65, 103, '\0'};
-
-     unsigned char
-       vpag_chunk_data[9];
-
-     if (verbose)
-        fprintf(STDERR, "vpAg = %lu x %lu, units=%lu\n",
-          (unsigned long)user_chunk_data[1],
-          (unsigned long)user_chunk_data[2],
-          (unsigned long)user_chunk_data[3]);
-     png_save_uint_32(vpag_chunk_data, user_chunk_data[1]);
-     png_save_uint_32(vpag_chunk_data + 4, user_chunk_data[2]);
-     vpag_chunk_data[8] = (unsigned char)(user_chunk_data[3] & 0xff);
-     png_write_chunk(write_ptr, png_vpAg, vpag_chunk_data, 9);
+      png_byte png_vpAg[5] = {118, 112,  65, 103, '\0'};
+
+      unsigned char
+        vpag_chunk_data[9];
+
+      if (verbose)
+         fprintf(STDERR, " vpAg = %lu x %lu, units = %lu\n",
+           (unsigned long)user_chunk_data[1],
+           (unsigned long)user_chunk_data[2],
+           (unsigned long)user_chunk_data[3]);
+
+      png_save_uint_32(vpag_chunk_data, user_chunk_data[1]);
+      png_save_uint_32(vpag_chunk_data + 4, user_chunk_data[2]);
+      vpag_chunk_data[8] = (unsigned char)(user_chunk_data[3] & 0xff);
+      png_write_chunk(write_ptr, png_vpAg, vpag_chunk_data, 9);

    }
 
 #endif
 #endif
 
 #ifdef SINGLE_ROWBUF_ALLOC
    }
 
 #endif
 #endif
 
 #ifdef SINGLE_ROWBUF_ALLOC

-   png_debug(0, "Allocating row buffer...");
+   pngtest_debug("Allocating row buffer...");

    row_buf = (png_bytep)png_malloc(read_ptr,
       png_get_rowbytes(read_ptr, read_info_ptr));
    row_buf = (png_bytep)png_malloc(read_ptr,
       png_get_rowbytes(read_ptr, read_info_ptr));

-   png_debug1(0, "0x%08lx", (unsigned long)row_buf);
+
+   pngtest_debug1("\t0x%08lx", (unsigned long)row_buf);

 #endif /* SINGLE_ROWBUF_ALLOC */
 #endif /* SINGLE_ROWBUF_ALLOC */

-   png_debug(0, "Writing row data");
+   pngtest_debug("Writing row data");

 
 #if defined(PNG_READ_INTERLACING_SUPPORTED) || \
   defined(PNG_WRITE_INTERLACING_SUPPORTED)
 
 #if defined(PNG_READ_INTERLACING_SUPPORTED) || \
   defined(PNG_WRITE_INTERLACING_SUPPORTED)


@@ -1212,17 +1309,19 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 #endif
    for (pass = 0; pass < num_pass; pass++)
    {
 #endif
    for (pass = 0; pass < num_pass; pass++)
    {

-      png_debug1(0, "Writing row data for pass %d", pass);
+      pngtest_debug1("Writing row data for pass %d", pass);

       for (y = 0; y < height; y++)
       {
 #ifndef SINGLE_ROWBUF_ALLOC
       for (y = 0; y < height; y++)
       {
 #ifndef SINGLE_ROWBUF_ALLOC

-         png_debug2(0, "\nAllocating row buffer (pass %d, y = %ld)...", pass, y);
+         pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y);

          row_buf = (png_bytep)png_malloc(read_ptr,
             png_get_rowbytes(read_ptr, read_info_ptr));
          row_buf = (png_bytep)png_malloc(read_ptr,
             png_get_rowbytes(read_ptr, read_info_ptr));

-         png_debug2(0, "0x%08lx (%ld bytes)", (unsigned long)row_buf,
+
+         pngtest_debug2("\t0x%08lx (%u bytes)", (unsigned long)row_buf,

             png_get_rowbytes(read_ptr, read_info_ptr));
             png_get_rowbytes(read_ptr, read_info_ptr));

+

 #endif /* !SINGLE_ROWBUF_ALLOC */
 #endif /* !SINGLE_ROWBUF_ALLOC */

-         png_read_rows(read_ptr, (png_bytepp)&row_buf, png_bytepp_NULL, 1);
+         png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1);

 
 #ifdef PNG_WRITE_SUPPORTED
 #ifdef PNGTEST_TIMING
 
 #ifdef PNG_WRITE_SUPPORTED
 #ifdef PNGTEST_TIMING


@@ -1239,70 +1338,72 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 #endif /* PNG_WRITE_SUPPORTED */
 
 #ifndef SINGLE_ROWBUF_ALLOC
 #endif /* PNG_WRITE_SUPPORTED */
 
 #ifndef SINGLE_ROWBUF_ALLOC

-         png_debug2(0, "Freeing row buffer (pass %d, y = %ld)", pass, y);
+         pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y);

          png_free(read_ptr, row_buf);
          row_buf = NULL;
 #endif /* !SINGLE_ROWBUF_ALLOC */
       }
    }
 
          png_free(read_ptr, row_buf);
          row_buf = NULL;
 #endif /* !SINGLE_ROWBUF_ALLOC */
       }
    }
 

-#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED

    png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
 #endif
    png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
 #endif

-#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

    png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
 #endif
 
    png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
 #endif
 

-   png_debug(0, "Reading and writing end_info data");
+   pngtest_debug("Reading and writing end_info data");

 
    png_read_end(read_ptr, end_info_ptr);
 
    png_read_end(read_ptr, end_info_ptr);

-#if defined(PNG_TEXT_SUPPORTED)
+#ifdef PNG_TEXT_SUPPORTED

    {
       png_textp text_ptr;
       int num_text;
 
       if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)
       {
    {
       png_textp text_ptr;
       int num_text;
 
       if (png_get_text(read_ptr, end_info_ptr, &text_ptr, &num_text) > 0)
       {

-         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks", num_text);
+         pngtest_debug1("Handling %d iTXt/tEXt/zTXt chunks", num_text);

          png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
       }
    }
 #endif
          png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
       }
    }
 #endif

-#if defined(PNG_tIME_SUPPORTED)
+#ifdef PNG_tIME_SUPPORTED

    {
       png_timep mod_time;
 
       if (png_get_tIME(read_ptr, end_info_ptr, &mod_time))
       {
          png_set_tIME(write_ptr, write_end_info_ptr, mod_time);
    {
       png_timep mod_time;
 
       if (png_get_tIME(read_ptr, end_info_ptr, &mod_time))
       {
          png_set_tIME(write_ptr, write_end_info_ptr, mod_time);

-#if defined(PNG_TIME_RFC1123_SUPPORTED)
-         /* we have to use png_memcpy instead of "=" because the string
+#ifdef PNG_TIME_RFC1123_SUPPORTED
+         /* We have to use png_memcpy instead of "=" because the string

             pointed to by png_convert_to_rfc1123() gets free'ed before
             we use it */
          png_memcpy(tIME_string,
                     png_convert_to_rfc1123(read_ptr, mod_time),
                     png_sizeof(tIME_string));
             pointed to by png_convert_to_rfc1123() gets free'ed before
             we use it */
          png_memcpy(tIME_string,
                     png_convert_to_rfc1123(read_ptr, mod_time),
                     png_sizeof(tIME_string));

+

          tIME_string[png_sizeof(tIME_string) - 1] = '\0';
          tIME_chunk_present++;
 #endif /* PNG_TIME_RFC1123_SUPPORTED */
       }
    }
 #endif
          tIME_string[png_sizeof(tIME_string) - 1] = '\0';
          tIME_chunk_present++;
 #endif /* PNG_TIME_RFC1123_SUPPORTED */
       }
    }
 #endif

-#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

    {
       png_unknown_chunkp unknowns;
    {
       png_unknown_chunkp unknowns;

-      int num_unknowns;
-      num_unknowns = (int)png_get_unknown_chunks(read_ptr, end_info_ptr,
+      int num_unknowns = png_get_unknown_chunks(read_ptr, end_info_ptr,

          &unknowns);
          &unknowns);

+

       if (num_unknowns)
       {
       if (num_unknowns)
       {

-         png_size_t i;
+         int i;

          png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
            num_unknowns);
          png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns,
            num_unknowns);

-         /* copy the locations from the read_info_ptr.  The automatically
-            generated locations in write_end_info_ptr are wrong because we
-            haven't written the end_info yet */
-         for (i = 0; i < (png_size_t)num_unknowns; i++)
+         /* Copy the locations from the read_info_ptr.  The automatically
+          * generated locations in write_end_info_ptr are wrong because we
+          * haven't written the end_info yet.
+          */
+         for (i = 0; i < num_unknowns; i++)

            png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
              unknowns[i].location);
       }
            png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
              unknowns[i].location);
       }


@@ -1318,48 +1419,38 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       png_uint_32 iwidth, iheight;
       iwidth = png_get_image_width(write_ptr, write_info_ptr);
       iheight = png_get_image_height(write_ptr, write_info_ptr);
       png_uint_32 iwidth, iheight;
       iwidth = png_get_image_width(write_ptr, write_info_ptr);
       iheight = png_get_image_height(write_ptr, write_info_ptr);

-      fprintf(STDERR, "Image width = %lu, height = %lu\n",
+      fprintf(STDERR, "\n Image width = %lu, height = %lu\n",

          (unsigned long)iwidth, (unsigned long)iheight);
    }
 #endif
 
          (unsigned long)iwidth, (unsigned long)iheight);
    }
 #endif
 

-   png_debug(0, "Destroying data structs");
+   pngtest_debug("Destroying data structs");

 #ifdef SINGLE_ROWBUF_ALLOC
 #ifdef SINGLE_ROWBUF_ALLOC

-   png_debug(1, "destroying row_buf for read_ptr");
+   pngtest_debug("destroying row_buf for read_ptr");

    png_free(read_ptr, row_buf);
    row_buf = NULL;
 #endif /* SINGLE_ROWBUF_ALLOC */
    png_free(read_ptr, row_buf);
    row_buf = NULL;
 #endif /* SINGLE_ROWBUF_ALLOC */

-   png_debug(1, "destroying read_ptr, read_info_ptr, end_info_ptr");
+   pngtest_debug("destroying read_ptr, read_info_ptr, end_info_ptr");

    png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
 #ifdef PNG_WRITE_SUPPORTED
    png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
 #ifdef PNG_WRITE_SUPPORTED

-   png_debug(1, "destroying write_end_info_ptr");
+   pngtest_debug("destroying write_end_info_ptr");

    png_destroy_info_struct(write_ptr, &write_end_info_ptr);
    png_destroy_info_struct(write_ptr, &write_end_info_ptr);

-   png_debug(1, "destroying write_ptr, write_info_ptr");
+   pngtest_debug("destroying write_ptr, write_info_ptr");

    png_destroy_write_struct(&write_ptr, &write_info_ptr);
 #endif
    png_destroy_write_struct(&write_ptr, &write_info_ptr);
 #endif

-   png_debug(0, "Destruction complete.");
+   pngtest_debug("Destruction complete.");

 
    FCLOSE(fpin);
    FCLOSE(fpout);
 
 
    FCLOSE(fpin);
    FCLOSE(fpout);
 

-   png_debug(0, "Opening files for comparison");
-#if defined(_WIN32_WCE)
-   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
-   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
-#else
+   pngtest_debug("Opening files for comparison");

    if ((fpin = fopen(inname, "rb")) == NULL)
    if ((fpin = fopen(inname, "rb")) == NULL)

-#endif

    {
       fprintf(STDERR, "Could not find file %s\n", inname);
       return (1);
    }
 
    {
       fprintf(STDERR, "Could not find file %s\n", inname);
       return (1);
    }
 

-#if defined(_WIN32_WCE)
-   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
-   if ((fpout = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
-#else

    if ((fpout = fopen(outname, "rb")) == NULL)
    if ((fpout = fopen(outname, "rb")) == NULL)

-#endif

    {
       fprintf(STDERR, "Could not find file %s\n", outname);
       FCLOSE(fpin);
    {
       fprintf(STDERR, "Could not find file %s\n", outname);
       FCLOSE(fpin);


@@ -1370,13 +1461,14 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
    {
       png_size_t num_in, num_out;
 
    {
       png_size_t num_in, num_out;
 

-         READFILE(fpin, inbuf, 1, num_in);
-         READFILE(fpout, outbuf, 1, num_out);
+         num_in = fread(inbuf, 1, 1, fpin);
+         num_out = fread(outbuf, 1, 1, fpout);

 
       if (num_in != num_out)
       {
          fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
                  inname, outname);
 
       if (num_in != num_out)
       {
          fprintf(STDERR, "\nFiles %s and %s are of a different size\n",
                  inname, outname);

+

          if (wrote_question == 0)
          {
             fprintf(STDERR,
          if (wrote_question == 0)
          {
             fprintf(STDERR,


@@ -1389,9 +1481,15 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
               ZLIB_VERSION);
             wrote_question = 1;
          }
               ZLIB_VERSION);
             wrote_question = 1;
          }

+

          FCLOSE(fpin);
          FCLOSE(fpout);
          FCLOSE(fpin);
          FCLOSE(fpout);

-         return (0);
+
+         if (strict != 0)
+           return (1);
+
+         else
+           return (0);

       }
 
       if (!num_in)
       }
 
       if (!num_in)


@@ -1400,6 +1498,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       if (png_memcmp(inbuf, outbuf, num_in))
       {
          fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);
       if (png_memcmp(inbuf, outbuf, num_in))
       {
          fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);

+

          if (wrote_question == 0)
          {
             fprintf(STDERR,
          if (wrote_question == 0)
          {
             fprintf(STDERR,


@@ -1412,9 +1511,15 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
               ZLIB_VERSION);
             wrote_question = 1;
          }
               ZLIB_VERSION);
             wrote_question = 1;
          }

+

          FCLOSE(fpin);
          FCLOSE(fpout);
          FCLOSE(fpin);
          FCLOSE(fpout);

-         return (0);
+
+         if (strict != 0)
+           return (1);
+
+         else
+           return (0);

       }
    }
 
       }
    }
 


@@ -1424,7 +1529,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
    return (0);
 }
 
    return (0);
 }
 

-/* input and output filenames */
+/* Input and output filenames */

 #ifdef RISCOS
 static PNG_CONST char *inname = "pngtest/png";
 static PNG_CONST char *outname = "pngout/png";
 #ifdef RISCOS
 static PNG_CONST char *inname = "pngtest/png";
 static PNG_CONST char *outname = "pngout/png";


@@ -1439,23 +1544,23 @@ main(int argc, char *argv[])
    int multiple = 0;
    int ierror = 0;
 
    int multiple = 0;
    int ierror = 0;
 

-   fprintf(STDERR, "Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);
+   fprintf(STDERR, "\n Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);

    fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);
    fprintf(STDERR, "%s", png_get_copyright(NULL));
    /* Show the version of libpng used in building the library */
    fprintf(STDERR, " library (%lu):%s",
       (unsigned long)png_access_version_number(),
       png_get_header_version(NULL));
    fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);
    fprintf(STDERR, "%s", png_get_copyright(NULL));
    /* Show the version of libpng used in building the library */
    fprintf(STDERR, " library (%lu):%s",
       (unsigned long)png_access_version_number(),
       png_get_header_version(NULL));

+

    /* Show the version of libpng used in building the application */
    fprintf(STDERR, " pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,
       PNG_HEADER_VERSION_STRING);
    /* Show the version of libpng used in building the application */
    fprintf(STDERR, " pngtest (%lu):%s", (unsigned long)PNG_LIBPNG_VER,
       PNG_HEADER_VERSION_STRING);

-   fprintf(STDERR, " sizeof(png_struct)=%ld, sizeof(png_info)=%ld\n",
-                    (long)png_sizeof(png_struct), (long)png_sizeof(png_info));

 
    /* Do some consistency checking on the memory allocation settings, I'm
 
    /* Do some consistency checking on the memory allocation settings, I'm

-      not sure this matters, but it is nice to know, the first of these
-      tests should be impossible because of the way the macros are set
-      in pngconf.h */
+    * not sure this matters, but it is nice to know, the first of these
+    * tests should be impossible because of the way the macros are set
+    * in pngconf.h
+    */

 #if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
       fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
 #endif
 #if defined(MAXSEG_64K) && !defined(PNG_MAX_MALLOC_64K)
       fprintf(STDERR, " NOTE: Zlib compiled for max 64k, libpng not\n");
 #endif


@@ -1480,6 +1585,7 @@ main(int argc, char *argv[])
          multiple = 1;
          status_dots_requested = 0;
       }
          multiple = 1;
          status_dots_requested = 0;
       }

+

       else if (strcmp(argv[1], "-mv") == 0 ||
                strcmp(argv[1], "-vm") == 0 )
       {
       else if (strcmp(argv[1], "-mv") == 0 ||
                strcmp(argv[1], "-vm") == 0 )
       {


@@ -1487,12 +1593,22 @@ main(int argc, char *argv[])
          verbose = 1;
          status_dots_requested = 1;
       }
          verbose = 1;
          status_dots_requested = 1;
       }

+

       else if (strcmp(argv[1], "-v") == 0)
       {
          verbose = 1;
          status_dots_requested = 1;
          inname = argv[2];
       }
       else if (strcmp(argv[1], "-v") == 0)
       {
          verbose = 1;
          status_dots_requested = 1;
          inname = argv[2];
       }

+
+      else if (strcmp(argv[1], "--strict") == 0)
+      {
+         status_dots_requested = 0;
+         verbose = 1;
+         inname = argv[2];
+         strict++;
+      }
+

       else
       {
          inname = argv[1];
       else
       {
          inname = argv[1];


@@ -1523,32 +1639,34 @@ main(int argc, char *argv[])
 #endif
       for (i=2; i<argc; ++i)
       {
 #endif
       for (i=2; i<argc; ++i)
       {

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
-         int k;
-#endif

          int kerror;
          int kerror;

-         fprintf(STDERR, "Testing %s:", argv[i]);
+         fprintf(STDERR, "\n Testing %s:", argv[i]);

          kerror = test_one_file(argv[i], outname);
          if (kerror == 0)
          {
          kerror = test_one_file(argv[i], outname);
          if (kerror == 0)
          {

-#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED
+            int k;
+#endif
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

             fprintf(STDERR, "\n PASS (%lu zero samples)\n",
                (unsigned long)zero_samples);
 #else
             fprintf(STDERR, " PASS\n");
 #endif
             fprintf(STDERR, "\n PASS (%lu zero samples)\n",
                (unsigned long)zero_samples);
 #else
             fprintf(STDERR, " PASS\n");
 #endif

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

             for (k = 0; k<256; k++)
                if (filters_used[k])
                   fprintf(STDERR, " Filter %d was used %lu times\n",
                      k, (unsigned long)filters_used[k]);
 #endif
             for (k = 0; k<256; k++)
                if (filters_used[k])
                   fprintf(STDERR, " Filter %d was used %lu times\n",
                      k, (unsigned long)filters_used[k]);
 #endif

-#if defined(PNG_TIME_RFC1123_SUPPORTED)
+#ifdef PNG_TIME_RFC1123_SUPPORTED

          if (tIME_chunk_present != 0)
             fprintf(STDERR, " tIME = %s\n", tIME_string);
          if (tIME_chunk_present != 0)
             fprintf(STDERR, " tIME = %s\n", tIME_string);

+

          tIME_chunk_present = 0;
 #endif /* PNG_TIME_RFC1123_SUPPORTED */
          }
          tIME_chunk_present = 0;
 #endif /* PNG_TIME_RFC1123_SUPPORTED */
          }

+

          else
          {
             fprintf(STDERR, " FAIL\n");
          else
          {
             fprintf(STDERR, " FAIL\n");


@@ -1558,17 +1676,19 @@ main(int argc, char *argv[])
          if (allocation_now != current_allocation)
             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
                current_allocation - allocation_now);
          if (allocation_now != current_allocation)
             fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
                current_allocation - allocation_now);

+

          if (current_allocation != 0)
          {
             memory_infop pinfo = pinformation;
 
             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
                current_allocation);
          if (current_allocation != 0)
          {
             memory_infop pinfo = pinformation;
 
             fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
                current_allocation);

+

             while (pinfo != NULL)
             {
                fprintf(STDERR, " %lu bytes at %x\n",
                  (unsigned long)pinfo->size,
             while (pinfo != NULL)
             {
                fprintf(STDERR, " %lu bytes at %x\n",
                  (unsigned long)pinfo->size,

-                 (unsigned int) pinfo->pointer);
+                 (unsigned int)pinfo->pointer);

                pinfo = pinfo->next;
             }
          }
                pinfo = pinfo->next;
             }
          }


@@ -1585,6 +1705,7 @@ main(int argc, char *argv[])
             num_allocations);
 #endif
    }
             num_allocations);
 #endif
    }

+

    else
    {
       int i;
    else
    {
       int i;


@@ -1594,41 +1715,48 @@ main(int argc, char *argv[])
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
          int allocation_now = current_allocation;
 #endif
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
          int allocation_now = current_allocation;
 #endif

-         if (i == 1) status_dots_requested = 1;
-         else if (verbose == 0)status_dots_requested = 0;
+         if (i == 1)
+            status_dots_requested = 1;
+
+         else if (verbose == 0)
+            status_dots_requested = 0;
+

          if (i == 0 || verbose == 1 || ierror != 0)
          if (i == 0 || verbose == 1 || ierror != 0)

-            fprintf(STDERR, "Testing %s:", inname);
+            fprintf(STDERR, "\n Testing %s:", inname);
+

          kerror = test_one_file(inname, outname);
          kerror = test_one_file(inname, outname);

+

          if (kerror == 0)
          {
             if (verbose == 1 || i == 2)
             {
          if (kerror == 0)
          {
             if (verbose == 1 || i == 2)
             {

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

                 int k;
 #endif
                 int k;
 #endif

-#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED

                 fprintf(STDERR, "\n PASS (%lu zero samples)\n",
                    (unsigned long)zero_samples);
 #else
                 fprintf(STDERR, " PASS\n");
 #endif
                 fprintf(STDERR, "\n PASS (%lu zero samples)\n",
                    (unsigned long)zero_samples);
 #else
                 fprintf(STDERR, " PASS\n");
 #endif

-#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED

                 for (k = 0; k<256; k++)
                    if (filters_used[k])
                       fprintf(STDERR, " Filter %d was used %lu times\n",
                 for (k = 0; k<256; k++)
                    if (filters_used[k])
                       fprintf(STDERR, " Filter %d was used %lu times\n",

-                         k,
-                         (unsigned long)filters_used[k]);
+                         k, (unsigned long)filters_used[k]);

 #endif
 #endif

-#if defined(PNG_TIME_RFC1123_SUPPORTED)
+#ifdef PNG_TIME_RFC1123_SUPPORTED

              if (tIME_chunk_present != 0)
                 fprintf(STDERR, " tIME = %s\n", tIME_string);
 #endif /* PNG_TIME_RFC1123_SUPPORTED */
             }
          }
              if (tIME_chunk_present != 0)
                 fprintf(STDERR, " tIME = %s\n", tIME_string);
 #endif /* PNG_TIME_RFC1123_SUPPORTED */
             }
          }

+

          else
          {
             if (verbose == 0 && i != 2)
          else
          {
             if (verbose == 0 && i != 2)

-               fprintf(STDERR, "Testing %s:", inname);
+               fprintf(STDERR, "\n Testing %s:", inname);
+

             fprintf(STDERR, " FAIL\n");
             ierror += kerror;
          }
             fprintf(STDERR, " FAIL\n");
             ierror += kerror;
          }


@@ -1636,12 +1764,14 @@ main(int argc, char *argv[])
          if (allocation_now != current_allocation)
              fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
                current_allocation - allocation_now);
          if (allocation_now != current_allocation)
              fprintf(STDERR, "MEMORY ERROR: %d bytes lost\n",
                current_allocation - allocation_now);

+

          if (current_allocation != 0)
          {
              memory_infop pinfo = pinformation;
 
              fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
                 current_allocation);
          if (current_allocation != 0)
          {
              memory_infop pinfo = pinformation;
 
              fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
                 current_allocation);

+

              while (pinfo != NULL)
              {
                 fprintf(STDERR, " %lu bytes at %x\n",
              while (pinfo != NULL)
              {
                 fprintf(STDERR, " %lu bytes at %x\n",


@@ -1678,11 +1808,13 @@ main(int argc, char *argv[])
 #endif
 
    if (ierror == 0)
 #endif
 
    if (ierror == 0)

-      fprintf(STDERR, "libpng passes test\n");
+      fprintf(STDERR, " libpng passes test\n");
+

    else
    else

-      fprintf(STDERR, "libpng FAILS test\n");
+      fprintf(STDERR, " libpng FAILS test\n");
+

    return (int)(ierror != 0);
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
    return (int)(ierror != 0);
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */

-typedef version_1_2_34 your_png_h_is_not_version_1_2_34;
+typedef png_libpng_version_1_5_7 Your_png_h_is_not_version_1_5_7;