[libpng16] Use png_get_libpng_ver(NULL), not PNG_LIBPNG_VER_STRING

21 files changed, 56 insertions, 50 deletions

diff --git a/ANNOUNCE b/ANNOUNCE
index 97b371cf2..5f1977a17 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.15beta05 - November 4, 2014
+Libpng 1.6.15beta05 - November 5, 2014
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -40,7 +40,9 @@ Version 1.6.15beta04 [November 4, 2014]
   Removed new PNG_USE_ARM_NEON configuration flag and made a one-line
     revision to configure.ac to support ARM on aarch64 instead (John Bowler).
 
-Version 1.6.15beta05 [November 4, 2014]
+Version 1.6.15beta05 [November 5, 2014]
+  Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
+    example.c, pngtest.c, and applications in the contrib directory.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 4adfd40c4..00933ce6b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5048,7 +5048,9 @@ Version 1.6.15beta04 [November 4, 2014]
   Removed new PNG_USE_ARM_NEON configuration flag and made a one-line
     revision to configure.ac to support ARM on aarch64 instead (John Bowler).
 
-Version 1.6.15beta05 [November 4, 2014]
+Version 1.6.15beta05 [November 5, 2014]
+  Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in
+    example.c, pngtest.c, and applications in the contrib directory.
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/contrib/examples/iccfrompng.c b/contrib/examples/iccfrompng.c
index 386e522a3..cfea086f5 100644
--- a/contrib/examples/iccfrompng.c
+++ b/contrib/examples/iccfrompng.c
@@ -32,7 +32,7 @@ static png_byte no_profile[] = "no profile";
 static png_bytep
 extract(FILE *fp, png_uint_32 *proflen)
 {
-   png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
+   png_structp png_ptr = png_create_read_struct(png_get_libpng_ver(NULL),0,0,0);
    png_infop info_ptr = NULL;
    png_bytep result = NULL;
 
diff --git a/contrib/examples/pngpixel.c b/contrib/examples/pngpixel.c
index e0d43e3f0..9880124da 100644
--- a/contrib/examples/pngpixel.c
+++ b/contrib/examples/pngpixel.c
@@ -161,7 +161,7 @@ int main(int argc, const char **argv)
           * writes error messages to stderr.  Creating the png_struct is a
           * little tricky; just copy the following code.
           */
-         png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+         png_structp png_ptr = png_create_read_struct(png_get_libpng_ver(NULL),
             NULL, NULL, NULL);
 
          if (png_ptr != NULL)
diff --git a/contrib/gregbook/readpng.c b/contrib/gregbook/readpng.c
index f5e1fb1a4..9167403e5 100644
--- a/contrib/gregbook/readpng.c
+++ b/contrib/gregbook/readpng.c
@@ -100,7 +100,8 @@ int readpng_init(FILE *infile, ulg *pWidth, ulg *pHeight)
 
     /* could pass pointers to user-defined error handlers instead of NULLs: */
 
-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+    png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), NULL, NULL,
+        NULL);
     if (!png_ptr)
         return 4;   /* out of memory */
 
diff --git a/contrib/gregbook/readpng2.c b/contrib/gregbook/readpng2.c
index 2e4c53627..4cf2600a4 100644
--- a/contrib/gregbook/readpng2.c
+++ b/contrib/gregbook/readpng2.c
@@ -104,7 +104,7 @@ int readpng2_init(mainprog_info *mainprog_ptr)
 
     /* could also replace libpng warning-handler (final NULL), but no need: */
 
-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, mainprog_ptr,
+    png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), mainprog_ptr,
       readpng2_error_handler, readpng2_warning_handler);
     if (!png_ptr)
         return 4;   /* out of memory */
diff --git a/contrib/gregbook/writepng.c b/contrib/gregbook/writepng.c
index 0dda62ea8..c5c953479 100644
--- a/contrib/gregbook/writepng.c
+++ b/contrib/gregbook/writepng.c
@@ -90,7 +90,7 @@ int writepng_init(mainprog_info *mainprog_ptr)
 
     /* could also replace libpng warning-handler (final NULL), but no need: */
 
-    png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, mainprog_ptr,
+    png_ptr = png_create_write_struct(png_get_libpng_ver(NULL), mainprog_ptr,
       writepng_error_handler, NULL);
     if (!png_ptr)
         return 4;   /* out of memory */
diff --git a/contrib/libtests/makepng.c b/contrib/libtests/makepng.c
index 9f11b2964..6bfd8e630 100644
--- a/contrib/libtests/makepng.c
+++ b/contrib/libtests/makepng.c
@@ -556,7 +556,7 @@ write_png(const char **name, FILE *fp, int color_type, int bit_depth,
    volatile png_fixed_point gamma, chunk_insert * volatile insert,
    unsigned int filters, unsigned int *colors)
 {
-   png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+   png_structp png_ptr = png_create_write_struct(png_get_libpng_ver(NULL),
       name, makepng_error, makepng_warning);
    volatile png_infop info_ptr = NULL;
    volatile png_bytep row = NULL;
diff --git a/contrib/libtests/pngimage.c b/contrib/libtests/pngimage.c
index 372845ead..e8fad1687 100644
--- a/contrib/libtests/pngimage.c
+++ b/contrib/libtests/pngimage.c
@@ -795,7 +795,7 @@ read_png(struct display *dp, struct buffer *bp, const char *operation,
       dp->transforms = transforms;
    }
 
-   dp->read_pp = pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, dp,
+   dp->read_pp = pp = png_create_read_struct(png_get_libpng_ver(NULL), dp,
       display_error, display_warning);
    if (pp == NULL)
       display_log(dp, LIBPNG_ERROR, "failed to create read struct");
@@ -1240,7 +1240,7 @@ write_png(struct display *dp, png_infop ip, int transforms)
    dp->operation = "write";
    dp->transforms = transforms;
 
-   dp->write_pp = png_create_write_struct(PNG_LIBPNG_VER_STRING, dp,
+   dp->write_pp = png_create_write_struct(png_get_libpng_ver(NULL), dp,
       display_error, display_warning);
 
    if (dp->write_pp == NULL)
diff --git a/contrib/libtests/pngunknown.c b/contrib/libtests/pngunknown.c
index b8c4899de..ada0fb54c 100644
--- a/contrib/libtests/pngunknown.c
+++ b/contrib/libtests/pngunknown.c
@@ -651,7 +651,7 @@ check(FILE *fp, int argc, const char **argv, png_uint_32p flags/*out*/,
    /* Some of these errors are permanently fatal and cause an exit here, others
     * are per-test and cause an error return.
     */
-   d->png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, d, error,
+   d->png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), d, error,
       warning);
    if (d->png_ptr == NULL)
    {
diff --git a/contrib/libtests/pngvalid.c b/contrib/libtests/pngvalid.c
index ca6f85188..c3fe7b8c2 100644
--- a/contrib/libtests/pngvalid.c
+++ b/contrib/libtests/pngvalid.c
@@ -1552,13 +1552,13 @@ set_store_for_write(png_store *ps, png_infopp ppi,
        */
 #     ifdef PNG_USER_MEM_SUPPORTED
          if (!ps->speed)
-            ps->pwrite = png_create_write_struct_2(PNG_LIBPNG_VER_STRING,
+            ps->pwrite = png_create_write_struct_2(png_get_libpng_ver(NULL),
                ps, store_error, store_warning, &ps->write_memory_pool,
                store_malloc, store_free);
 
          else
 #     endif
-         ps->pwrite = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+         ps->pwrite = png_create_write_struct(png_get_libpng_ver(NULL),
             ps, store_error, store_warning);
 
       png_set_write_fn(ps->pwrite, ps, store_write, store_flush);
@@ -1673,13 +1673,13 @@ set_store_for_read(png_store *ps, png_infopp ppi, png_uint_32 id,
     */
 #  ifdef PNG_USER_MEM_SUPPORTED
       if (!ps->speed)
-         ps->pread = png_create_read_struct_2(PNG_LIBPNG_VER_STRING, ps,
+         ps->pread = png_create_read_struct_2(png_get_libpng_ver(NULL), ps,
              store_error, store_warning, &ps->read_memory_pool, store_malloc,
              store_free);
 
       else
 #  endif
-   ps->pread = png_create_read_struct(PNG_LIBPNG_VER_STRING, ps, store_error,
+   ps->pread = png_create_read_struct(png_get_libpng_ver(NULL), ps, store_error,
       store_warning);
 
    if (ps->pread == NULL)
diff --git a/contrib/libtests/readpng.c b/contrib/libtests/readpng.c
index 7ba46d0b9..66855136f 100644
--- a/contrib/libtests/readpng.c
+++ b/contrib/libtests/readpng.c
@@ -34,7 +34,7 @@
 static int
 read_png(FILE *fp)
 {
-   png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
+   png_structp png_ptr = png_create_read_struct(png_get_libpng_ver(NULL),0,0,0);
    png_infop info_ptr = NULL;
    png_bytep row = NULL, display = NULL;
 
diff --git a/contrib/libtests/timepng.c b/contrib/libtests/timepng.c
index 7c937971c..b85818453 100644
--- a/contrib/libtests/timepng.c
+++ b/contrib/libtests/timepng.c
@@ -37,7 +37,7 @@
 
 static int read_png(FILE *fp)
 {
-   png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,0,0,0);
+   png_structp png_ptr = png_create_read_struct(png_get_libpng_ver(NULL),0,0,0);
    png_infop info_ptr = NULL;
    png_bytep row = NULL, display = NULL;
 
diff --git a/contrib/pngminus/png2pnm.c b/contrib/pngminus/png2pnm.c
index 83d9565a3..dff4d0b3d 100644
--- a/contrib/pngminus/png2pnm.c
+++ b/contrib/pngminus/png2pnm.c
@@ -223,7 +223,7 @@ BOOL png2pnm (FILE *png_file, FILE *pnm_file, FILE *alpha_file,
 
   /* create png and info structures */
 
-  png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
+  png_ptr = png_create_read_struct (png_get_libpng_ver(NULL),
     NULL, NULL, NULL);
   if (!png_ptr)
     return FALSE;   /* out of memory */
diff --git a/contrib/pngminus/pnm2png.c b/contrib/pngminus/pnm2png.c
index b073414ff..7bf720f68 100644
--- a/contrib/pngminus/pnm2png.c
+++ b/contrib/pngminus/pnm2png.c
@@ -425,7 +425,8 @@ BOOL pnm2png (FILE *pnm_file, FILE *png_file, FILE *alpha_file, BOOL interlace,
   } /* end for row */
 
   /* prepare the standard PNG structures */
-  png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+  png_ptr = png_create_write_struct (png_get_libpng_ver(NULL), NULL, NULL,
+      NULL);
   if (!png_ptr)
   {
     return FALSE;
diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c
index 28d47979e..92600bb86 100644
--- a/contrib/tools/pngfix.c
+++ b/contrib/tools/pngfix.c
@@ -3580,7 +3580,7 @@ read_png(struct control *control)
    volatile png_bytep row = NULL, display = NULL;
    volatile int rc;
 
-   png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, control,
+   png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), control,
       error_handler, warning_handler);
 
    if (png_ptr == NULL)
diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c
index dcde18a3a..e563e9292 100644
--- a/contrib/visupng/PngFile.c
+++ b/contrib/visupng/PngFile.c
@@ -136,7 +136,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData,
 
     /* create the two png(-info) structures */
 
-    png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL,
+    png_ptr = png_create_read_struct(png_get_libpng_ver(NULL), NULL,
       (png_error_ptr)png_cexcept_error, (png_error_ptr)NULL);
     if (!png_ptr)
     {
@@ -313,7 +313,7 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
 
     /* prepare the standard PNG structures */
 
-    png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL,
+    png_ptr = png_create_write_struct(png_get_libpng_ver(NULL), NULL,
       (png_error_ptr)png_cexcept_error, (png_error_ptr)NULL);
     if (!png_ptr)
     {
diff --git a/example.c b/example.c
index f8067b936..aeb373514 100644
--- a/example.c
+++ b/example.c
@@ -294,7 +294,7 @@ void read_png(FILE *fp, unsigned int sig_read)  /* File is already open */
     * the compiler header file version, so that we know if the application
     * was compiled with a compatible version of the library.  REQUIRED
     */
-   png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+   png_ptr = png_create_read_struct(png_get_libpng_ver(NULL),
       png_voidp user_error_ptr, user_error_fn, user_warning_fn);
 
    if (png_ptr == NULL)
@@ -613,7 +613,7 @@ initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr)
     * the library version is compatible in case we are using dynamically
     * linked libraries.
     */
-   *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+   *png_ptr = png_create_read_struct(png_get_libpng_ver(NULL),
        png_voidp user_error_ptr, user_error_fn, user_warning_fn);
 
    if (*png_ptr == NULL)
@@ -779,7 +779,7 @@ void write_png(char *file_name /* , ... other image information ... */)
     * the library version is compatible with the one used at compile time,
     * in case we are using dynamically linked libraries.  REQUIRED.
     */
-   png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+   png_ptr = png_create_write_struct(png_get_libpng_ver(NULL),
       png_voidp user_error_ptr, user_error_fn, user_warning_fn);
 
    if (png_ptr == NULL)
diff --git a/libpng-manual.txt b/libpng-manual.txt
index e4a860b0a..f9347c9e6 100644
--- a/libpng-manual.txt
+++ b/libpng-manual.txt
@@ -1,6 +1,6 @@
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.15beta05 - November 4, 2014
+ libpng version 1.6.15beta05 - November 5, 2014
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.15beta05 - November 4, 2014
+ libpng versions 0.97, January 1998, through 1.6.15beta05 - November 5, 2014
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2014 Glenn Randers-Pehrson
 
@@ -372,7 +372,7 @@ The structure allocation functions quietly return NULL if they fail to
 create the structure, so your application should check for that.
 
     png_structp png_ptr = png_create_read_struct
-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
         user_error_fn, user_warning_fn);
 
     if (!png_ptr)
@@ -392,7 +392,7 @@ use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use
 png_create_read_struct_2() instead of png_create_read_struct():
 
     png_structp png_ptr = png_create_read_struct_2
-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
         user_error_fn, user_warning_fn, (png_voidp)
         user_mem_ptr, user_malloc_fn, user_free_fn);
 
@@ -2486,7 +2486,7 @@ png_infop info_ptr;
  initialize_png_reader()
  {
     png_ptr = png_create_read_struct
-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
          user_error_fn, user_warning_fn);
 
     if (!png_ptr)
@@ -2694,7 +2694,7 @@ both "png_ptr"; you can call them anything you like, such as
 "read_ptr" and "write_ptr".  Look at pngtest.c, for example.
 
     png_structp png_ptr = png_create_write_struct
-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+       (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
         user_error_fn, user_warning_fn);
 
     if (!png_ptr)
@@ -2713,7 +2713,7 @@ define PNG_USER_MEM_SUPPORTED and use
 png_create_write_struct_2() instead of png_create_write_struct():
 
     png_structp png_ptr = png_create_write_struct_2
-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+       (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
         user_error_fn, user_warning_fn, (png_voidp)
         user_mem_ptr, user_malloc_fn, user_free_fn);
 
@@ -5277,7 +5277,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 XVI. Y2K Compliance in libpng
 
-November 4, 2014
+November 5, 2014
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
diff --git a/libpng.3 b/libpng.3
index 33191f9e2..135804893 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "November 4, 2014"
+.TH LIBPNG 3 "November 5, 2014"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15beta05
 .SH SYNOPSIS
@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng-manual.txt - A description on how to use and modify libpng
 
- libpng version 1.6.15beta05 - November 4, 2014
+ libpng version 1.6.15beta05 - November 5, 2014
  Updated and distributed by Glenn Randers-Pehrson
  <glennrp at users.sourceforge.net>
  Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 
  Based on:
 
- libpng versions 0.97, January 1998, through 1.6.15beta05 - November 4, 2014
+ libpng versions 0.97, January 1998, through 1.6.15beta05 - November 5, 2014
  Updated and distributed by Glenn Randers-Pehrson
  Copyright (c) 1998-2014 Glenn Randers-Pehrson
 
@@ -876,7 +876,7 @@ The structure allocation functions quietly return NULL if they fail to
 create the structure, so your application should check for that.
 
     png_structp png_ptr = png_create_read_struct
-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
         user_error_fn, user_warning_fn);
 
     if (!png_ptr)
@@ -896,7 +896,7 @@ use a libpng that was built with PNG_USER_MEM_SUPPORTED defined, and use
 png_create_read_struct_2() instead of png_create_read_struct():
 
     png_structp png_ptr = png_create_read_struct_2
-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
         user_error_fn, user_warning_fn, (png_voidp)
         user_mem_ptr, user_malloc_fn, user_free_fn);
 
@@ -2990,7 +2990,7 @@ png_infop info_ptr;
  initialize_png_reader()
  {
     png_ptr = png_create_read_struct
-        (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+        (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
          user_error_fn, user_warning_fn);
 
     if (!png_ptr)
@@ -3198,7 +3198,7 @@ both "png_ptr"; you can call them anything you like, such as
 "read_ptr" and "write_ptr".  Look at pngtest.c, for example.
 
     png_structp png_ptr = png_create_write_struct
-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+       (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
         user_error_fn, user_warning_fn);
 
     if (!png_ptr)
@@ -3217,7 +3217,7 @@ define PNG_USER_MEM_SUPPORTED and use
 png_create_write_struct_2() instead of png_create_write_struct():
 
     png_structp png_ptr = png_create_write_struct_2
-       (PNG_LIBPNG_VER_STRING, (png_voidp)user_error_ptr,
+       (png_get_libpng_ver(NULL), (png_voidp)user_error_ptr,
         user_error_fn, user_warning_fn, (png_voidp)
         user_mem_ptr, user_malloc_fn, user_free_fn);
 
@@ -5781,7 +5781,7 @@ Other rules can be inferred by inspecting the libpng source.
 
 .SH XVI. Y2K Compliance in libpng
 
-November 4, 2014
+November 5, 2014
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
@@ -6090,7 +6090,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.6.15beta05 - November 4, 2014:
+Libpng version 1.6.15beta05 - November 5, 2014:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
 
@@ -6113,7 +6113,7 @@ this sentence.
 
 This code is released under the libpng license.
 
-libpng versions 1.2.6, August 15, 2004, through 1.6.15beta05, November 4, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.15beta05, November 5, 2014, are
 Copyright (c) 2004,2006-2014 Glenn Randers-Pehrson, and are
 distributed according to the same disclaimer and license as libpng-1.2.5
 with the following individual added to the list of Contributing Authors
@@ -6212,7 +6212,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-November 4, 2014
+November 5, 2014
 
 .\" end of man page
 
diff --git a/pngtest.c b/pngtest.c
index 0db55668b..dc48714c3 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -869,11 +869,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
    pngtest_debug("Allocating read and write structures");
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
    read_ptr =
-      png_create_read_struct_2(PNG_LIBPNG_VER_STRING, NULL,
+      png_create_read_struct_2(png_get_libpng_ver(NULL), NULL,
       NULL, NULL, NULL, png_debug_malloc, png_debug_free);
 #else
    read_ptr =
-      png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+      png_create_read_struct(png_get_libpng_ver(NULL), NULL, NULL, NULL);
 #endif
    png_set_error_fn(read_ptr, &error_parameters, pngtest_error,
       pngtest_warning);
@@ -881,11 +881,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 #ifdef PNG_WRITE_SUPPORTED
 #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG
    write_ptr =
-      png_create_write_struct_2(PNG_LIBPNG_VER_STRING, NULL,
+      png_create_write_struct_2(png_get_libpng_ver(NULL), NULL,
       NULL, NULL, NULL, png_debug_malloc, png_debug_free);
 #else
    write_ptr =
-      png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+      png_create_write_struct(png_get_libpng_ver(NULL), NULL, NULL, NULL);
 #endif
    png_set_error_fn(write_ptr, &error_parameters, pngtest_error,
       pngtest_warning);