Temporary fix for link error to ~wxZipOutputStream()

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

diff --git a/src/png/pngtest.c b/src/png/pngtest.c
index 9eae4795ea910e7d0d1960535ea6adad1f5ebd01..431c85dd35167f3f9973f7e56a2533d1d321d661 100644 (file)
--- a/src/png/pngtest.c
+++ b/src/png/pngtest.c
@@ -1,12 +1,11 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
 
 /* pngtest.c - a simple test program to test libpng
  *

- * libpng 1.0.1
+ * libpng 1.2.7 - September 12, 2004

  * For conditions of distribution and use, see copyright notice in png.h
  * For conditions of distribution and use, see copyright notice in png.h

- * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
- * Copyright (c) 1996, 1997 Andreas Dilger
- * Copyright (c) 1998, Glenn Randers-Pehrson
- * March 15, 1998
+ * Copyright (c) 1998-2004 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.)

  *
  * 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
  *
  * 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


@@ -14,28 +13,93 @@
  * properly.  It does not currently test all of the transforms, although
  * it probably should.
  *
  * properly.  It does not currently test all of the transforms, although
  * it probably should.
  *

- * The program will fail in certain legitimate cases:
+ * The program will report "FAIL" in certain legitimate cases:

  * 1) when the compression level or filter selection method is changed.
  * 1) when the compression level or filter selection method is changed.

- * 2) when the chunk size is smaller than 8K.
- * 3) unknown ancillary chunks exist in the input file.
+ * 2) when the maximum IDAT size (PNG_ZBUF_SIZE in pngconf.h) is not 8192.
+ * 3) unknown unsafe-to-copy ancillary chunks or unknown critical chunks
+ *    exist in the input file.

  * 4) others not listed here...
  * In these cases, it is best to check with another tool such as "pngcheck"
  * 4) others not listed here...
  * In these cases, it is best to check with another tool such as "pngcheck"

- * to see what the differences between the two images are.
+ * to see what the differences between the two files are.

  *
  * If a filename is given on the command-line, then this file is used
  * for the input, rather than the default "pngtest.png".  This allows
  *
  * If a filename is given on the command-line, then this file is used
  * for the input, rather than the default "pngtest.png".  This allows

- * testing a wide variety of files easily.
+ * testing a wide variety of files easily.  You can also test a number
+ * of files at once by typing "pngtest -m file1.png file2.png ..."

  */
 
  */
 

-#include <stdio.h>
-#include <stdlib.h>
+#include "png.h"
+
+#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 <stdio.h>
+#  include <stdlib.h>
+#  include <assert.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)
+#  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
+#endif

 
 /* Makes pngtest verbose so we can find problems (needs to be before png.h) */
 #ifndef PNG_DEBUG
 
 /* Makes pngtest verbose so we can find problems (needs to be before png.h) */
 #ifndef PNG_DEBUG

-#define PNG_DEBUG 0
+#  define PNG_DEBUG 0
+#endif
+
+#if !PNG_DEBUG
+#  define SINGLE_ROWBUF_ALLOC  /* makes buffer overruns easier to nail */
+#endif
+
+/* Turn on CPU timing
+#define PNGTEST_TIMING
+*/
+
+#ifdef PNG_NO_FLOATING_POINT_SUPPORTED
+#undef PNGTEST_TIMING
+#endif
+
+#ifdef PNGTEST_TIMING
+static float t_start, t_stop, t_decode, t_encode, t_misc;
+#include <time.h>
+#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
+
+#ifdef PNGTEST_TIMING
+static float t_start, t_stop, t_decode, t_encode, t_misc;
+#if !defined(PNG_tIME_SUPPORTED)
+#include <time.h>
+#endif

 #endif
 
 #endif
 

-#include "../png/png.h"
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+static int tIME_chunk_present=0;
+static char tIME_string[30] = "no tIME chunk present in file";
+#endif
+
+static int verbose = 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));
 


@@ -53,14 +117,22 @@ static int status_dots_requested=0;
 static int status_dots=1;
 
 void
 static int status_dots=1;
 
 void

+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif

 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 > 0x3fffffffL) return;
+    if(png_ptr == NULL || row_number > PNG_UINT_31_MAX) return;

     if(status_pass != pass)
     {
        fprintf(stdout,"\n Pass %d: ",pass);
        status_pass = pass;
     if(status_pass != pass)
     {
        fprintf(stdout,"\n Pass %d: ",pass);
        status_pass = pass;

-       status_dots = 30;
+       status_dots = 31;

     }
     status_dots--;
     if(status_dots == 0)
     }
     status_dots--;
     if(status_dots == 0)


@@ -72,24 +144,61 @@ read_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass)
 }
 
 void
 }
 
 void

+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+write_row_callback(png_structp png_ptr, png_uint_32 row_number, int pass);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif

 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 > 0x3fffffffL || pass > 7) return;
+    if(png_ptr == NULL || row_number > PNG_UINT_31_MAX || pass > 7) return;

     fprintf(stdout, "w");
 }
 
 
     fprintf(stdout, "w");
 }
 
 

+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+/* 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.) */
+static png_uint_32 filters_used[256];
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_filters(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+{
+    if(png_ptr != NULL && row_info != NULL)
+      ++filters_used[*(data-1)];
+}
+#endif
+

 #if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 /* example of using user transform callback (we don't transform anything,
 #if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 /* example of using user transform callback (we don't transform anything,

-   but merely count the black pixels) */
+   but merely count the zero samples) */

 
 

-static png_uint_32 black_pixels;
+static png_uint_32 zero_samples;

 
 void
 
 void

-count_black_pixels(png_structp png_ptr, png_row_infop row_info, png_bytep data)
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data);
+void
+#ifdef PNG_1_0_X
+PNGAPI
+#endif
+count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data)

 {
    png_bytep dp = data;
 {
    png_bytep dp = data;

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

 
    /* contents of row_info:
     *  png_uint_32 width      width of row
 
    /* contents of row_info:
     *  png_uint_32 width      width of row


@@ -100,60 +209,67 @@ count_black_pixels(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 black pixels (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;
 
     if(row_info->color_type == 0 || row_info->color_type == 3)
     {
        int pos=0;

-       png_uint_32 n;
-       for (n=0; n<row_info->width; n++)
+       png_uint_32 n, nstop;
+       for (n=0, nstop=row_info->width; n<nstop; n++)

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

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

              if(pos == 8)
              {
              if(pos == 8)
              {

-                pos=0;
+                pos = 0;

                 dp++;
              }
                 dp++;
              }

+          }

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

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

              if(pos == 8)
              {
              if(pos == 8)
              {

-                pos=0;
+                pos = 0;

                 dp++;
              }
                 dp++;
              }

+          }

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

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

              if(pos == 8)
              {
              if(pos == 8)
              {

-                pos=0;
+                pos = 0;

                 dp++;
              }
                 dp++;
              }

+          }

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

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

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

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

              dp+=2;
           }
        }
     }
     else /* other color types */
     {
              dp+=2;
           }
        }
     }
     else /* other color types */
     {

-       png_uint_32 n;
+       png_uint_32 n, nstop;

        int channel;
        int color_channels = row_info->channels;
        if(row_info->color_type > 3)color_channels--;
 
        int channel;
        int color_channels = row_info->channels;
        if(row_info->color_type > 3)color_channels--;
 

-       for (n=0; n<row_info->width; n++)
+       for (n=0, nstop=row_info->width; n<nstop; n++)

        {
           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) black_pixels++;
+                if(*dp++ == 0) zero_samples++;

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

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

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


@@ -167,32 +283,31 @@ count_black_pixels(png_structp png_ptr, png_row_infop row_info, png_bytep data)
 }
 #endif /* PNG_WRITE_USER_TRANSFORM_SUPPORTED */
 
 }
 #endif /* PNG_WRITE_USER_TRANSFORM_SUPPORTED */
 

-static int verbose = 0;

 static int wrote_question = 0;
 
 #if defined(PNG_NO_STDIO)
 /* 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. */
 static int wrote_question = 0;
 
 #if defined(PNG_NO_STDIO)
 /* 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 which does the actual reading of data.  If you are
+/* 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. */
    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. */

+

 #ifndef USE_FAR_KEYWORD
 static void
 #ifndef USE_FAR_KEYWORD
 static void

-png_default_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;
 
    /* 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.
     */
 {
    png_size_t check;
 
    /* 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.
     */

-   check = (png_size_t)fread(data, (png_size_t)1, length,
-      (FILE *)png_ptr->io_ptr);
+   READFILE((png_FILE_p)png_ptr->io_ptr, data, length, check);

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

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

    }
 }
 #else
    }
 }
 #else


@@ -200,23 +315,23 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
    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.
 */

- 
+

 #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

-png_default_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_byte *n_data;
 {
    int check;
    png_byte *n_data;

-   FILE *io_ptr;
+   png_FILE_p io_ptr;

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

-   io_ptr = (FILE *)CVT_PTR(png_ptr->io_ptr);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);

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

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

    }
    else
    {
    }
    else
    {


@@ -227,7 +342,7 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
       do
       {
          read = MIN(NEAR_BUF_SIZE, remaining);
       do
       {
          read = MIN(NEAR_BUF_SIZE, remaining);

-         err = fread(buf, (png_size_t)1, read, io_ptr);
+         READFILE(io_ptr, buf, 1, err);

          png_memcpy(data, buf, read); /* copy far buffer to near buffer */
          if(err != read)
             break;
          png_memcpy(data, buf, read); /* copy far buffer to near buffer */
          if(err != read)
             break;


@@ -247,26 +362,28 @@ png_default_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 
 #if defined(PNG_WRITE_FLUSH_SUPPORTED)
 static void
 
 #if defined(PNG_WRITE_FLUSH_SUPPORTED)
 static void

-png_default_flush(png_structp png_ptr)
+pngtest_flush(png_structp png_ptr)

 {
 {

-   FILE *io_ptr;
-   io_ptr = (FILE *)CVT_PTR((png_ptr->io_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);
    if (io_ptr != NULL)
       fflush(io_ptr);

+#endif

 }
 #endif
 
 }
 #endif
 

-/* This is the function which does the actual writing of data.  If you are
+/* 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. */
 #ifndef USE_FAR_KEYWORD
 static void
    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
 static void

-png_default_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_uint_32 check;
 

-   check = fwrite(data, 1, length, (FILE *)(png_ptr->io_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");


@@ -282,18 +399,18 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
 #define MIN(a,b) (a <= b ? a : b)
 
 static void
 #define MIN(a,b) (a <= b ? a : b)
 
 static void

-png_default_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_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */
 {
    png_uint_32 check;
    png_byte *near_data;  /* Needs to be "png_byte *" instead of "png_bytep" */

-   FILE *io_ptr;
+   png_FILE_p io_ptr;

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

-   io_ptr = (FILE *)CVT_PTR(png_ptr->io_ptr);
+   io_ptr = (png_FILE_p)CVT_PTR(png_ptr->io_ptr);

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

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

    }
    else
    {
    }
    else
    {


@@ -305,7 +422,7 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
       {
          written = MIN(NEAR_BUF_SIZE, remaining);
          png_memcpy(buf, data, written); /* copy far buffer to near buffer */
       {
          written = MIN(NEAR_BUF_SIZE, remaining);
          png_memcpy(buf, data, written); /* copy far buffer to near buffer */

-         err = fwrite(buf, 1, written, io_ptr);
+         WRITEFILE(io_ptr, buf, written, err);

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


@@ -329,7 +446,7 @@ png_default_write_data(png_structp png_ptr, png_bytep data, png_size_t length)
  * not used, but it is passed in case it may be useful.
  */
 static void
  * not used, but it is passed in case it may be useful.
  */
 static void

-png_default_warning(png_structp png_ptr, png_const_charp message)
+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)
 {
    PNG_CONST char *name = "UNKNOWN (ERROR!)";
    if (png_ptr != NULL && png_ptr->error_ptr != NULL)


@@ -343,21 +460,17 @@ png_default_warning(png_structp png_ptr, png_const_charp message)
  * error function pointer in png_set_error_fn().
  */
 static void
  * error function pointer in png_set_error_fn().
  */
 static void

-png_default_error(png_structp png_ptr, png_const_charp message)
+pngtest_error(png_structp png_ptr, png_const_charp message)

 {
 {

-   png_default_warning(png_ptr, message);
-   /* We can return because png_error calls the default handler which is
-    * actually ok in this case. */
+   pngtest_warning(png_ptr, message);
+   /* We can return because png_error calls the default handler, which is
+    * actually OK in this case. */

 }
 #endif /* PNG_NO_STDIO */
 /* END of code to validate stdio-free compilation */
 
 /* START of code to validate memory allocation and deallocation */
 }
 #endif /* PNG_NO_STDIO */
 /* END of code to validate stdio-free compilation */
 
 /* START of code to validate memory allocation and deallocation */

-#ifdef PNGTEST_MEMORY_DEBUG
-/* Borland DOS special memory handler */
-#if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__)
-ERROR - memory debugging is not supported on this platform
-#else
+#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
 
 /* Allocate memory.  For reasonable files, size should never exceed
    64K.  However, zlib may allocate more then 64K if you don't tell


@@ -367,9 +480,10 @@ ERROR - memory debugging is not supported on this platform
 
    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. */
 
    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 {
-   png_uint_32                    size;
-   png_voidp                      pointer;
+typedef struct memory_information
+{
+   png_uint_32               size;
+   png_voidp                 pointer;

    struct memory_information FAR *next;
 } memory_information;
 typedef memory_information FAR *memory_infop;
    struct memory_information FAR *next;
 } memory_information;
 typedef memory_information FAR *memory_infop;


@@ -377,45 +491,66 @@ typedef memory_information FAR *memory_infop;
 static memory_infop pinformation = NULL;
 static int current_allocation = 0;
 static int maximum_allocation = 0;
 static memory_infop pinformation = NULL;
 static int current_allocation = 0;
 static int maximum_allocation = 0;

+static int total_allocation = 0;
+static int num_allocations = 0;

 
 

-extern PNG_EXPORT(png_voidp,png_debug_malloc) PNGARG((png_structp png_ptr,
-   png_uint_32 size));
-extern PNG_EXPORT(void,png_debug_free) PNGARG((png_structp png_ptr,
-   png_voidp ptr));
+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
 
 png_voidp

-png_malloc(png_structp png_ptr, png_uint_32 size) {
-   if (png_ptr == NULL) {
-      fprintf(STDERR, "NULL pointer to memory allocator\n");
-      return (NULL);
-   }
+png_debug_malloc(png_structp png_ptr, png_uint_32 size)
+{
+
+   /* png_malloc has already tested for NULL; png_create_struct calls
+      png_debug_malloc directly, with png_ptr == NULL which is OK */
+

    if (size == 0)
    if (size == 0)

-      return (png_voidp)(NULL);
+      return (NULL);

 
    /* This calls the library allocator twice, once to get the requested
       buffer and once to get a new free list entry. */
    {
 
    /* This calls the library allocator twice, once to get the requested
       buffer and once to get a new free list entry. */
    {

-      memory_infop pinfo = png_debug_malloc(png_ptr, sizeof *pinfo);
+      /* Disable malloc_fn and free_fn */
+      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));

       pinfo->size = size;
       current_allocation += size;
       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_debug_malloc(png_ptr, size);
+      pinfo->pointer = (png_voidp)png_malloc(png_ptr, size);
+      /* Restore malloc_fn and free_fn */
+      png_set_mem_fn(png_ptr, png_voidp_NULL, (png_malloc_ptr)png_debug_malloc,
+         (png_free_ptr)png_debug_free);
+      if (size != 0 && pinfo->pointer == NULL)
+      {
+         current_allocation -= size;
+         total_allocation -= size;
+         png_error(png_ptr,
+           "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)
+         printf("png_malloc %lu bytes at %x\n",size,pinfo->pointer);
+      assert(pinfo->size != 12345678);

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

-png_free(png_structp png_ptr, png_voidp ptr)
+png_debug_free(png_structp png_ptr, png_voidp ptr)

 {
    if (png_ptr == NULL)
 {
    if (png_ptr == NULL)

-      fprintf(STDERR, "NULL pointer to memory allocator\n");
-   if (ptr == 0) {
+      fprintf(STDERR, "NULL pointer to png_debug_free.\n");
+   if (ptr == 0)
+   {

 #if 0 /* This happens all the time. */
       fprintf(STDERR, "WARNING: freeing NULL pointer\n");
 #endif
 #if 0 /* This happens all the time. */
       fprintf(STDERR, "WARNING: freeing NULL pointer\n");
 #endif


@@ -425,21 +560,25 @@ png_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 (;;) {
+      for (;;)
+      {

          memory_infop pinfo = *ppinfo;
          memory_infop pinfo = *ppinfo;

-         if (pinfo->pointer == ptr) {
+         if (pinfo->pointer == ptr)
+         {

             *ppinfo = pinfo->next;
             current_allocation -= pinfo->size;
             if (current_allocation < 0)
                fprintf(STDERR, "Duplicate free of memory\n");
             /* We must free the list element too, but first kill
             *ppinfo = pinfo->next;
             current_allocation -= pinfo->size;
             if (current_allocation < 0)
                fprintf(STDERR, "Duplicate free of memory\n");
             /* We must free the list element too, but first kill

-               the memory which is to be freed. */
-            memset(ptr, 0x55, pinfo->size);
-            png_debug_free(png_ptr, pinfo);
+               the memory that is to be freed. */
+            png_memset(ptr, 0x55, pinfo->size);
+            png_free_default(png_ptr, pinfo);
+            pinfo=NULL;

             break;
          }
             break;
          }

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

             break;
          }
          ppinfo = &pinfo->next;
             break;
          }
          ppinfo = &pinfo->next;


@@ -447,125 +586,214 @@ png_free(png_structp png_ptr, png_voidp ptr)
    }
 
    /* Finally free the data. */
    }
 
    /* Finally free the data. */

-   png_debug_free(png_ptr, ptr);
+   if(verbose)
+      printf("Freeing %x\n",ptr);
+   png_free_default(png_ptr, ptr);
+   ptr=NULL;

 }
 }

-#endif /* Not Borland DOS special memory handler */
-#endif
+#endif /* PNG_USER_MEM_SUPPORTED && PNG_DEBUG */

 /* END of code to test memory allocation/deallocation */
 
 /* Test one file */
 int
 test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 {
 /* END of code to test memory allocation/deallocation */
 
 /* Test one file */
 int
 test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 {

-   static FILE *fpin, *fpout;  /* "static" prevents setjmp corruption */
-   png_structp read_ptr, write_ptr;
-   png_infop read_info_ptr, write_info_ptr, end_info_ptr;
+   static png_FILE_p fpin;
+   static png_FILE_p fpout;  /* "static" prevents setjmp corruption */
+   png_structp read_ptr;
+   png_infop read_info_ptr, end_info_ptr;
+#ifdef PNG_WRITE_SUPPORTED
+   png_structp write_ptr;
+   png_infop write_info_ptr;
+   png_infop write_end_info_ptr;
+#else
+   png_structp write_ptr = NULL;
+   png_infop write_info_ptr = NULL;
+   png_infop write_end_info_ptr = NULL;
+#endif

    png_bytep row_buf;
    png_uint_32 y;
    png_uint_32 width, height;
    int num_pass, pass;
    int bit_depth, color_type;
    png_bytep row_buf;
    png_uint_32 y;
    png_uint_32 width, height;
    int num_pass, pass;
    int bit_depth, color_type;

+#ifdef PNG_SETJMP_SUPPORTED

 #ifdef USE_FAR_KEYWORD
    jmp_buf jmpbuf;
 #ifdef USE_FAR_KEYWORD
    jmp_buf jmpbuf;

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

    char inbuf[256], outbuf[256];
 
    char inbuf[256], outbuf[256];
 

-   row_buf = (png_bytep)NULL;
+   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);
    {
       fprintf(STDERR, "Could not open output file %s\n", outname);

-      fclose(fpin);
+      FCLOSE(fpin);

       return (1);
    }
 
    png_debug(0, "Allocating read and write structures\n");
       return (1);
    }
 
    png_debug(0, "Allocating read and write structures\n");

-   read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
-      (png_error_ptr)NULL, (png_error_ptr)NULL);
+#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);
+#else
+   read_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);
+#endif

 #if defined(PNG_NO_STDIO)
 #if defined(PNG_NO_STDIO)

-   png_set_error_fn(read_ptr, (png_voidp)inname, png_default_error,
-       png_default_warning);
+   png_set_error_fn(read_ptr, (png_voidp)inname, pngtest_error,
+       pngtest_warning);
+#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);
+#else
+   write_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, png_voidp_NULL,
+      png_error_ptr_NULL, png_error_ptr_NULL);

 #endif
 #endif

-   write_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL,
-      (png_error_ptr)NULL, (png_error_ptr)NULL);

 #if defined(PNG_NO_STDIO)
 #if defined(PNG_NO_STDIO)

-   png_set_error_fn(write_ptr, (png_voidp)inname, png_default_error,
-       png_default_warning);
+   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\n");
    read_info_ptr = png_create_info_struct(read_ptr);
 #endif
    png_debug(0, "Allocating read_info, write_info and end_info structures\n");
    read_info_ptr = png_create_info_struct(read_ptr);

-   write_info_ptr = png_create_info_struct(write_ptr);

    end_info_ptr = png_create_info_struct(read_ptr);
    end_info_ptr = png_create_info_struct(read_ptr);

+#ifdef PNG_WRITE_SUPPORTED
+   write_info_ptr = png_create_info_struct(write_ptr);
+   write_end_info_ptr = png_create_info_struct(write_ptr);
+#endif

 
 

+#ifdef PNG_SETJMP_SUPPORTED

    png_debug(0, "Setting jmpbuf for read struct\n");
 #ifdef USE_FAR_KEYWORD
    if (setjmp(jmpbuf))
 #else
    png_debug(0, "Setting jmpbuf for read struct\n");
 #ifdef USE_FAR_KEYWORD
    if (setjmp(jmpbuf))
 #else

-   if (setjmp(read_ptr->jmpbuf))
+   if (setjmp(png_jmpbuf(read_ptr)))

 #endif
    {
       fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);
 #endif
    {
       fprintf(STDERR, "%s -> %s: libpng read error\n", inname, outname);

+      if (row_buf)
+         png_free(read_ptr, row_buf);

       png_destroy_read_struct(&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_info_struct(write_ptr, &write_end_info_ptr);

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

-      fclose(fpin);
-      fclose(fpout);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);

       return (1);
    }
       return (1);
    }

+#ifdef USE_FAR_KEYWORD
+   png_memcpy(png_jmpbuf(read_ptr),jmpbuf,png_sizeof(jmp_buf));
+#endif

 
 

+#ifdef PNG_WRITE_SUPPORTED

    png_debug(0, "Setting jmpbuf for write struct\n");
 #ifdef USE_FAR_KEYWORD
    png_debug(0, "Setting jmpbuf for write struct\n");
 #ifdef USE_FAR_KEYWORD

-   png_memcpy(read_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));

    if (setjmp(jmpbuf))
 #else
    if (setjmp(jmpbuf))
 #else

-   if (setjmp(write_ptr->jmpbuf))
+   if (setjmp(png_jmpbuf(write_ptr)))

 #endif
    {
       fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
       png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
 #endif
    {
       fprintf(STDERR, "%s -> %s: libpng write error\n", inname, outname);
       png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);

+      png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+#ifdef PNG_WRITE_SUPPORTED

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

-      fclose(fpin);
-      fclose(fpout);
+#endif
+      FCLOSE(fpin);
+      FCLOSE(fpout);

       return (1);
    }
       return (1);
    }

-

 #ifdef USE_FAR_KEYWORD
 #ifdef USE_FAR_KEYWORD

-   png_memcpy(write_ptr->jmpbuf,jmpbuf,sizeof(jmp_buf));
+   png_memcpy(png_jmpbuf(write_ptr),jmpbuf,png_sizeof(jmp_buf));
+#endif

 #endif
 #endif

+#endif
+

    png_debug(0, "Initializing input and output streams\n");
 #if !defined(PNG_NO_STDIO)
    png_init_io(read_ptr, fpin);
    png_debug(0, "Initializing input and output streams\n");
 #if !defined(PNG_NO_STDIO)
    png_init_io(read_ptr, fpin);

+#  ifdef PNG_WRITE_SUPPORTED

    png_init_io(write_ptr, fpout);
    png_init_io(write_ptr, fpout);

+#  endif

 #else
 #else

-   png_set_read_fn(read_ptr, (png_voidp)fpin, png_default_read_data);
-   png_set_write_fn(write_ptr, (png_voidp)fpout,  png_default_write_data,
-#if defined(PNG_WRITE_FLUSH_SUPPORTED)
-      png_default_flush);
-#else
+   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)
+      pngtest_flush);
+#    else

       NULL);
       NULL);

-#endif
+#    endif
+#  endif

 #endif
    if(status_dots_requested == 1)
    {
 #endif
    if(status_dots_requested == 1)
    {

+#ifdef PNG_WRITE_SUPPORTED

       png_set_write_status_fn(write_ptr, write_row_callback);
       png_set_write_status_fn(write_ptr, write_row_callback);

+#endif

       png_set_read_status_fn(read_ptr, read_row_callback);
    }
    else
    {
       png_set_read_status_fn(read_ptr, read_row_callback);
    }
    else
    {

-      png_set_write_status_fn(write_ptr, NULL);
-      png_set_read_status_fn(read_ptr, NULL);
+#ifdef PNG_WRITE_SUPPORTED
+      png_set_write_status_fn(write_ptr, png_write_status_ptr_NULL);
+#endif
+      png_set_read_status_fn(read_ptr, png_read_status_ptr_NULL);

    }
 
    }
 

-#  if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
-     black_pixels=0;
-     png_set_write_user_transform_fn(write_ptr, count_black_pixels);
+#if defined(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);
+   }
+#endif
+#if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
+   zero_samples=0;
+   png_set_write_user_transform_fn(write_ptr, count_zero_samples);
+#endif
+
+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+#  ifndef PNG_HANDLE_CHUNK_ALWAYS
+#    define PNG_HANDLE_CHUNK_ALWAYS       3

 #  endif
 #  endif

+   png_set_keep_unknown_chunks(read_ptr, PNG_HANDLE_CHUNK_ALWAYS,
+      png_bytep_NULL, 0);
+#endif
+#if defined(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,
+      png_bytep_NULL, 0);
+#endif

 
    png_debug(0, "Reading info struct\n");
    png_read_info(read_ptr, read_info_ptr);
 
    png_debug(0, "Reading info struct\n");
    png_read_info(read_ptr, read_info_ptr);


@@ -585,20 +813,35 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 #endif
       }
    }
 #endif
       }
    }

-#if defined(PNG_READ_bKGD_SUPPORTED) && defined(PNG_WRITE_bKGD_SUPPORTED)
+#if defined(PNG_FIXED_POINT_SUPPORTED)
+#if defined(PNG_cHRM_SUPPORTED)

    {
    {

-      png_color_16p background;
-
-      if (png_get_bKGD(read_ptr, read_info_ptr, &background))
+      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))

       {
       {

-         png_set_bKGD(write_ptr, write_info_ptr, background);
+         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
       }
    }
 #endif

-#if defined(PNG_READ_cHRM_SUPPORTED) && defined(PNG_WRITE_cHRM_SUPPORTED)
+#if defined(PNG_gAMA_SUPPORTED)

    {
    {

-      double white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y;
+      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);
+      }
+   }
+#endif
+#else /* Use floating point versions */
+#if defined(PNG_FLOATING_POINT_SUPPORTED)
+#if defined(PNG_cHRM_SUPPORTED)
+   {
+      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))
       {


@@ -607,7 +850,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_READ_gAMA_SUPPORTED) && defined(PNG_WRITE_gAMA_SUPPORTED)
+#if defined(PNG_gAMA_SUPPORTED)

    {
       double gamma;
 
    {
       double gamma;
 


@@ -617,7 +860,24 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_READ_sRGB_SUPPORTED) && defined(PNG_WRITE_sRGB_SUPPORTED)
+#endif /* floating point */
+#endif /* fixed point */
+#if defined(PNG_iCCP_SUPPORTED)
+   {
+      png_charp name;
+      png_charp profile;
+      png_uint_32 proflen;
+      int compression_type;
+
+      if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type,
+                      &profile, &proflen))
+      {
+         png_set_iCCP(write_ptr, write_info_ptr, name, compression_type,
+                      profile, proflen);
+      }
+   }
+#endif
+#if defined(PNG_sRGB_SUPPORTED)

    {
       int intent;
 
    {
       int intent;
 


@@ -627,7 +887,26 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_READ_hIST_SUPPORTED) && defined(PNG_WRITE_hIST_SUPPORTED)
+   {
+      png_colorp 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);
+      }
+   }
+#if defined(PNG_bKGD_SUPPORTED)
+   {
+      png_color_16p background;
+
+      if (png_get_bKGD(read_ptr, read_info_ptr, &background))
+      {
+         png_set_bKGD(write_ptr, write_info_ptr, background);
+      }
+   }
+#endif
+#if defined(PNG_hIST_SUPPORTED)

    {
       png_uint_16p hist;
 
    {
       png_uint_16p hist;
 


@@ -637,9 +916,9 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_READ_oFFs_SUPPORTED) && defined(PNG_WRITE_oFFs_SUPPORTED)
+#if defined(PNG_oFFs_SUPPORTED)

    {
    {

-      png_uint_32 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))
       int unit_type;
 
       if (png_get_oFFs(read_ptr, read_info_ptr,&offset_x,&offset_y,&unit_type))


@@ -648,7 +927,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_READ_pCAL_SUPPORTED) && defined(PNG_WRITE_pCAL_SUPPORTED)
+#if defined(PNG_pCAL_SUPPORTED)

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


@@ -663,7 +942,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_READ_pHYs_SUPPORTED) && defined(PNG_WRITE_pHYs_SUPPORTED)
+#if defined(PNG_pHYs_SUPPORTED)

    {
       png_uint_32 res_x, res_y;
       int unit_type;
    {
       png_uint_32 res_x, res_y;
       int unit_type;


@@ -674,49 +953,73 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

+#if defined(PNG_sBIT_SUPPORTED)

    {
    {

-      png_colorp palette;
-      int num_palette;
+      png_color_8p sig_bit;

 
 

-      if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette))
+      if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))

       {
       {

-         png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette);
+         png_set_sBIT(write_ptr, write_info_ptr, sig_bit);

       }
    }
       }
    }

-#if defined(PNG_READ_sBIT_SUPPORTED) && defined(PNG_WRITE_sBIT_SUPPORTED)
+#endif
+#if defined(PNG_sCAL_SUPPORTED)
+#ifdef PNG_FLOATING_POINT_SUPPORTED

    {
    {

-      png_color_8p sig_bit;
+      int unit;
+      double scal_width, scal_height;

 
 

-      if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit))
+      if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width,
+         &scal_height))

       {
       {

-         png_set_sBIT(write_ptr, write_info_ptr, sig_bit);
+         png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height);
+      }
+   }
+#else
+#ifdef PNG_FIXED_POINT_SUPPORTED
+   {
+      int unit;
+      png_charp 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);

       }
    }
 #endif
       }
    }
 #endif

-#if (defined(PNG_READ_tEXt_SUPPORTED) && defined(PNG_WRITE_tEXt_SUPPORTED)) || \
-    (defined(PNG_READ_zTXt_SUPPORTED) && defined(PNG_WRITE_zTXt_SUPPORTED))
+#endif
+#endif
+#if defined(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 tEXt/zTXt chunks\n", num_text);
+         png_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks\n", num_text);

          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_READ_tIME_SUPPORTED) && defined(PNG_WRITE_tIME_SUPPORTED)
+#if defined(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_strcpy instead of "=" because the string
+            pointed to by png_convert_to_rfc1123() gets free'ed before
+            we use it */
+         png_strcpy(tIME_string,png_convert_to_rfc1123(read_ptr, mod_time));
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */

       }
    }
 #endif
       }
    }
 #endif

-#if defined(PNG_READ_tRNS_SUPPORTED) && defined(PNG_WRITE_tRNS_SUPPORTED)
+#if defined(PNG_tRNS_SUPPORTED)

    {
       png_bytep trans;
       int num_trans;
    {
       png_bytep trans;
       int num_trans;


@@ -730,41 +1033,156 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       }
    }
 #endif
       }
    }
 #endif

+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns = (int)png_get_unknown_chunks(read_ptr, read_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         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++)
+           png_set_unknown_chunk_location(write_ptr, write_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif

 
 

+#ifdef PNG_WRITE_SUPPORTED

    png_debug(0, "\nWriting info struct\n");
    png_debug(0, "\nWriting info struct\n");

+
+/* If we wanted, we could write info in two steps:
+   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);

+#endif

 
 

-   png_debug(0, "\nAllocating row buffer \n");
-   row_buf = (png_bytep)png_malloc(read_ptr, 
+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(0, "\nAllocating row buffer...");
+   row_buf = (png_bytep)png_malloc(read_ptr,

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

-   if (row_buf == NULL)
-   {
-      fprintf(STDERR, "No memory to allocate row buffer\n");
-      png_destroy_read_struct(&read_ptr, &read_info_ptr, (png_infopp)NULL);
-      png_destroy_write_struct(&write_ptr, &write_info_ptr);
-      fclose(fpin);
-      fclose(fpout);
-      return (1);
-   }
+   png_debug1(0, "0x%08lx\n\n", (unsigned long)row_buf);
+#endif /* SINGLE_ROWBUF_ALLOC */

    png_debug(0, "Writing row data\n");
 
    png_debug(0, "Writing row data\n");
 

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

    num_pass = png_set_interlace_handling(read_ptr);
    num_pass = png_set_interlace_handling(read_ptr);

+#  ifdef PNG_WRITE_SUPPORTED

    png_set_interlace_handling(write_ptr);
    png_set_interlace_handling(write_ptr);

+#  endif
+#else
+   num_pass=1;
+#endif

 
 

+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+#endif

    for (pass = 0; pass < num_pass; pass++)
    {
       png_debug1(0, "Writing row data for pass %d\n",pass);
       for (y = 0; y < height; y++)
       {
    for (pass = 0; pass < num_pass; pass++)
    {
       png_debug1(0, "Writing row data for pass %d\n",pass);
       for (y = 0; y < height; y++)
       {

-         png_read_rows(read_ptr, (png_bytepp)&row_buf, (png_bytepp)NULL, 1);
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "\nAllocating row buffer (pass %d, y = %ld)...", pass,y);
+         row_buf = (png_bytep)png_malloc(read_ptr,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+         png_debug2(0, "0x%08lx (%ld bytes)\n", (unsigned long)row_buf,
+            png_get_rowbytes(read_ptr, read_info_ptr));
+#endif /* !SINGLE_ROWBUF_ALLOC */
+         png_read_rows(read_ptr, (png_bytepp)&row_buf, png_bytepp_NULL, 1);
+
+#ifdef PNG_WRITE_SUPPORTED
+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_decode += (t_stop - t_start);
+         t_start = t_stop;
+#endif

          png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
          png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);

+#ifdef PNGTEST_TIMING
+         t_stop = (float)clock();
+         t_encode += (t_stop - t_start);
+         t_start = t_stop;
+#endif
+#endif /* PNG_WRITE_SUPPORTED */
+
+#ifndef SINGLE_ROWBUF_ALLOC
+         png_debug2(0, "Freeing row buffer (pass %d, y = %ld)\n\n", pass, y);
+         png_free(read_ptr, row_buf);
+#endif /* !SINGLE_ROWBUF_ALLOC */

       }
    }
 
       }
    }
 

+#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
+   png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1);
+#endif
+

    png_debug(0, "Reading and writing end_info data\n");
    png_debug(0, "Reading and writing end_info data\n");

+

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

-   png_write_end(write_ptr, end_info_ptr);
- 
+#if defined(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_debug1(0, "Handling %d iTXt/tEXt/zTXt chunks\n", num_text);
+         png_set_text(write_ptr, write_end_info_ptr, text_ptr, num_text);
+      }
+   }
+#endif
+#if defined(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);
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         /* we have to use png_strcpy instead of "=" because the string
+            pointed to by png_convert_to_rfc1123() gets free'ed before
+            we use it */
+         png_strcpy(tIME_string,png_convert_to_rfc1123(read_ptr, mod_time));
+         tIME_chunk_present++;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+      }
+   }
+#endif
+#if defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED)
+   {
+      png_unknown_chunkp unknowns;
+      int num_unknowns;
+      num_unknowns = (int)png_get_unknown_chunks(read_ptr, end_info_ptr,
+         &unknowns);
+      if (num_unknowns)
+      {
+         png_size_t i;
+         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++)
+           png_set_unknown_chunk_location(write_ptr, write_end_info_ptr, i,
+             unknowns[i].location);
+      }
+   }
+#endif
+#ifdef PNG_WRITE_SUPPORTED
+   png_write_end(write_ptr, write_end_info_ptr);
+#endif
+

 #ifdef PNG_EASY_ACCESS_SUPPORTED
    if(verbose)
    {
 #ifdef PNG_EASY_ACCESS_SUPPORTED
    if(verbose)
    {


@@ -777,24 +1195,45 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 #endif
 
    png_debug(0, "Destroying data structs\n");
 #endif
 
    png_debug(0, "Destroying data structs\n");

+#ifdef SINGLE_ROWBUF_ALLOC
+   png_debug(1, "destroying row_buf for read_ptr\n");

    png_free(read_ptr, row_buf);
    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\n");

    png_destroy_read_struct(&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_debug(1, "destroying write_end_info_ptr\n");
+   png_destroy_info_struct(write_ptr, &write_end_info_ptr);
+   png_debug(1, "destroying write_ptr, write_info_ptr\n");

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

+#endif
+   png_debug(0, "Destruction complete.\n");

 
 

-   fclose(fpin);
-   fclose(fpout);
+   FCLOSE(fpin);
+   FCLOSE(fpout);

 
    png_debug(0, "Opening files for comparison\n");
 
    png_debug(0, "Opening files for comparison\n");

+#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 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);
    {
       fprintf(STDERR, "Could not find file %s\n", outname);

-      fclose(fpin);
+      FCLOSE(fpin);

       return (1);
    }
 
       return (1);
    }
 


@@ -802,26 +1241,27 @@ 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;
 

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

 
       if (num_in != num_out)
       {
 
       if (num_in != num_out)
       {

-         fprintf(STDERR, "Files %s and %s are of a different size\n",
+         fprintf(STDERR, "\nFiles %s and %s are of a different size\n",

                  inname, outname);
          if(wrote_question == 0)
          {
             fprintf(STDERR,
                  inname, outname);
          if(wrote_question == 0)
          {
             fprintf(STDERR,

-              "   Was %s written with the same chunk size (8k),",inname);
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+              inname,PNG_ZBUF_SIZE);

             fprintf(STDERR,
             fprintf(STDERR,

-              " filtering\n   heuristic (libpng default), compression");
+              "\n   filtering heuristic (libpng default), compression");

             fprintf(STDERR,
             fprintf(STDERR,

-              " level (zlib default)\n   and zlib version (%s)?\n\n",
+              " level (zlib default),\n   and zlib version (%s)?\n\n",

               ZLIB_VERSION);
             wrote_question=1;
          }
               ZLIB_VERSION);
             wrote_question=1;
          }

-         fclose(fpin);
-         fclose(fpout);
+         FCLOSE(fpin);
+         FCLOSE(fpout);

          return (0);
       }
 
          return (0);
       }
 


@@ -830,34 +1270,35 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 
       if (png_memcmp(inbuf, outbuf, num_in))
       {
 
       if (png_memcmp(inbuf, outbuf, num_in))
       {

-         fprintf(STDERR, "Files %s and %s are different\n", inname, outname);
+         fprintf(STDERR, "\nFiles %s and %s are different\n", inname, outname);

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

-              "   Was %s written with the same chunk size (8k),",inname);
+         "   Was %s written with the same maximum IDAT chunk size (%d bytes),",
+                 inname,PNG_ZBUF_SIZE);

             fprintf(STDERR,
             fprintf(STDERR,

-              " filtering\n   heuristic (libpng default), compression");
+              "\n   filtering heuristic (libpng default), compression");

             fprintf(STDERR,
             fprintf(STDERR,

-              " level (zlib default)\n   and zlib version (%s)?\n\n",
+              " level (zlib default),\n   and zlib version (%s)?\n\n",

               ZLIB_VERSION);
             wrote_question=1;
          }
               ZLIB_VERSION);
             wrote_question=1;
          }

-         fclose(fpin);
-         fclose(fpout);
+         FCLOSE(fpin);
+         FCLOSE(fpout);

          return (0);
       }
    }
 
          return (0);
       }
    }
 

-   fclose(fpin);
-   fclose(fpout);
+   FCLOSE(fpin);
+   FCLOSE(fpout);

 
    return (0);
 }
 
 /* input and output filenames */
 #ifdef RISCOS
 
    return (0);
 }
 
 /* input and output filenames */
 #ifdef RISCOS

-PNG_CONST char *inname = "pngtest/png";
-PNG_CONST char *outname = "pngout/png";
+static PNG_CONST char *inname = "pngtest/png";
+static PNG_CONST char *outname = "pngout/png";

 #else
 static PNG_CONST char *inname = "pngtest.png";
 static PNG_CONST char *outname = "pngout.png";
 #else
 static PNG_CONST char *inname = "pngtest.png";
 static PNG_CONST char *outname = "pngout.png";


@@ -871,6 +1312,15 @@ main(int argc, char *argv[])
 
    fprintf(STDERR, "Testing libpng version %s\n", PNG_LIBPNG_VER_STRING);
    fprintf(STDERR, "   with zlib   version %s\n", ZLIB_VERSION);
 
    fprintf(STDERR, "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", 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);
+   fprintf(STDERR," png_sizeof(png_struct)=%ld, png_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
       not sure this matters, but it is nice to know, the first of these
 
    /* 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


@@ -938,51 +1388,78 @@ main(int argc, char *argv[])
    if (multiple)
    {
       int i;
    if (multiple)
    {
       int i;

-#ifdef PNGTEST_MEMORY_DEBUG
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

       int allocation_now = current_allocation;
 #endif
       for (i=2; i<argc; ++i)
       {
       int allocation_now = current_allocation;
 #endif
       for (i=2; i<argc; ++i)
       {

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

          int kerror;
          fprintf(STDERR, "Testing %s:",argv[i]);
          kerror = test_one_file(argv[i], outname);
          int kerror;
          fprintf(STDERR, "Testing %s:",argv[i]);
          kerror = test_one_file(argv[i], outname);

-         if (kerror == 0) 
+         if (kerror == 0)
+         {

 #if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 #if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)

-            fprintf(STDERR, " PASS (%lu black pixels)\n",black_pixels);
+            fprintf(STDERR, "\n PASS (%lu zero samples)\n",zero_samples);

 #else
             fprintf(STDERR, " PASS\n");
 #endif
 #else
             fprintf(STDERR, " PASS\n");
 #endif

-         else {
+#if defined(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,filters_used[k]);
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+         if(tIME_chunk_present != 0)
+            fprintf(STDERR, " tIME = %s\n",tIME_string);
+         tIME_chunk_present = 0;
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+         }
+         else
+         {

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

-            }
-#ifdef PNGTEST_MEMORY_DEBUG
+         }
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

          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) {
+         if (current_allocation != 0)
+         {

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

-            while (pinfo != NULL) {
-               fprintf(STDERR, " %d bytes at %x\n", pinfo->size, pinfo->pointer);
+            while (pinfo != NULL)
+            {
+               fprintf(STDERR, " %lu bytes at %x\n", pinfo->size, 
+                 (unsigned int) pinfo->pointer);

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

-               }
+            }

          }
 #endif
       }
          }
 #endif
       }

-#ifdef PNGTEST_MEMORY_DEBUG
-         fprintf(STDERR, "Maximum memory allocation: %d bytes\n",
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+         fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+            current_allocation);
+         fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",

             maximum_allocation);
             maximum_allocation);

+         fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+            total_allocation);
+         fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);

 #endif
    }
    else
    {
       int i;
 #endif
    }
    else
    {
       int i;

-      for (i=0; i<3; ++i) {
+      for (i=0; i<3; ++i)
+      {

          int kerror;
          int kerror;

-#ifdef PNGTEST_MEMORY_DEBUG
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

          int allocation_now = current_allocation;
 #endif
          if (i == 1) status_dots_requested = 1;
          int allocation_now = current_allocation;
 #endif
          if (i == 1) status_dots_requested = 1;


@@ -993,11 +1470,26 @@ main(int argc, char *argv[])
          if(kerror == 0)
          {
             if(verbose == 1 || i == 2)
          if(kerror == 0)
          {
             if(verbose == 1 || i == 2)

+            {
+#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED)
+                int k;
+#endif

 #if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 #if defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)

-                fprintf(STDERR, " PASS (%lu black pixels)\n",black_pixels);
+                fprintf(STDERR, "\n PASS (%lu zero samples)\n",zero_samples);

 #else
                 fprintf(STDERR, " PASS\n");
 #endif
 #else
                 fprintf(STDERR, " PASS\n");
 #endif

+#if defined(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,filters_used[k]);
+#endif
+#if defined(PNG_TIME_RFC1123_SUPPORTED)
+             if(tIME_chunk_present != 0)
+                fprintf(STDERR, " tIME = %s\n",tIME_string);
+#endif /* PNG_TIME_RFC1123_SUPPORTED */
+            }

          }
          else
          {
          }
          else
          {


@@ -1006,31 +1498,57 @@ main(int argc, char *argv[])
             fprintf(STDERR, " FAIL\n");
             ierror += kerror;
          }
             fprintf(STDERR, " FAIL\n");
             ierror += kerror;
          }

-#ifdef PNGTEST_MEMORY_DEBUG
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG

          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) {
+         if (current_allocation != 0)
+         {

              memory_infop pinfo = pinformation;
              memory_infop pinfo = pinformation;

-   
+

              fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
                 current_allocation);
              fprintf(STDERR, "MEMORY ERROR: %d bytes still allocated\n",
                 current_allocation);

-             while (pinfo != NULL) {
-                fprintf(STDERR, " %d bytes at %x\n", pinfo->size, pinfo->pointer);
+             while (pinfo != NULL)
+             {
+                fprintf(STDERR," %lu bytes at %x\n",
+                   pinfo->size, (unsigned int)pinfo->pointer);

                 pinfo = pinfo->next;
              }
           }
 #endif
        }
                 pinfo = pinfo->next;
              }
           }
 #endif
        }

-#ifdef PNGTEST_MEMORY_DEBUG
-       fprintf(STDERR, "Maximum memory allocation: %d bytes\n",
+#if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
+       fprintf(STDERR, " Current memory allocation: %10d bytes\n",
+          current_allocation);
+       fprintf(STDERR, " Maximum memory allocation: %10d bytes\n",

           maximum_allocation);
           maximum_allocation);

+       fprintf(STDERR, " Total   memory allocation: %10d bytes\n",
+          total_allocation);
+       fprintf(STDERR, "     Number of allocations: %10d\n",
+            num_allocations);

 #endif
    }
 
 #endif
    }
 

+#ifdef PNGTEST_TIMING
+   t_stop = (float)clock();
+   t_misc += (t_stop - t_start);
+   t_start = t_stop;
+   fprintf(STDERR," CPU time used = %.3f seconds",
+      (t_misc+t_decode+t_encode)/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR," (decoding %.3f,\n",
+      t_decode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR,"        encoding %.3f ,",
+      t_encode/(float)CLOCKS_PER_SEC);
+   fprintf(STDERR," other %.3f seconds)\n\n",
+      t_misc/(float)CLOCKS_PER_SEC);
+#endif
+

    if (ierror == 0)
       fprintf(STDERR, "libpng passes test\n");
    else
       fprintf(STDERR, "libpng FAILS test\n");
    return (int)(ierror != 0);
 }
    if (ierror == 0)
       fprintf(STDERR, "libpng passes test\n");
    else
       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. */
+typedef version_1_2_7 your_png_h_is_not_version_1_2_7;