From 41ffb1c950ad71b57f457c9664f31b48b47cbf1e Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Mon, 23 Aug 2010 16:54:35 -0500
Subject: [PATCH] [master] Eliminated a deprecated reference to png_ptr->io_ptr
 in pngtest.c

---
 ANNOUNCE  | 1 +
 CHANGES   | 1 +
 pngconf.h | 4 ++--
 pngtest.c | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 8e32687b7..589476c26 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -67,6 +67,7 @@ version 1.4.4beta07 [August 23, 2010]
   Revised CMakeLists.txt to make symlinks instead of copies when installing.
   Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman)
   Moved "#include pngusr.h" ahead of PNG_USER_PRIVATEBUILD test in pngconf.h
+  Eliminated a deprecated reference to png_ptr->io_ptr in pngtest.c
 
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 66cb5158f..3aa9c3271 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2651,6 +2651,7 @@ version 1.4.4beta07 [August 23, 2010]
   Revised CMakeLists.txt to make symlinks instead of copies when installing.
   Changed PNG_LIB_NAME from pngNN to libpngNN in CMakeLists.txt (Philip Lowman)
   Moved "#include pngusr.h" ahead of PNG_USER_PRIVATEBUILD test in pngconf.h
+  Eliminated a deprecated reference to png_ptr->io_ptr in pngtest.c
 
 Send comments/corrections/commendations to glennrp at users.sourceforge.net
 or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index ea33695f7..c3f4ce175 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -51,7 +51,7 @@
 #endif
 
 /*
- * If you create a private DLL you need to define in "pngusr.h" the following:
+ * If you create a private DLL you should define in "pngusr.h" the following:
  * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
  *        the DLL was built>
  *  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
@@ -59,7 +59,7 @@
  *        distinguish your DLL from those of the official release. These
  *        correspond to the trailing letters that come after the version
  *        number and must match your private DLL name>
- *  e.g. // private DLL "libpng13gx.dll"
+ *  e.g. // private DLL "libpng14gx.dll"
  *       #define PNG_USER_DLLFNAME_POSTFIX "gx"
  *
  * The following macros are also at your disposal if you want to complete the
diff --git a/pngtest.c b/pngtest.c
index 3937dfe92..50be2d8d4 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -302,7 +302,7 @@ pngtest_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
 
    /* 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)
    {
       check = fread(n_data, 1, length, io_ptr);