From a64ecdfa5b951685681b051a0e0925b256878d62 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 13 Sep 2010 10:19:20 -0500 Subject: [PATCH] [master] Eliminated another deprecated reference to png_ptr->io_ptr in pngtest.c --- ANNOUNCE | 1 + CHANGES | 1 + pngtest.c | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 30de78fa4..dc86cd06a 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -82,6 +82,7 @@ version 1.4.4rc02 [September 13, 2010] version 1.4.4rc03 [September 13, 2010] Removed an extraneous close-double-quote from CMakeLists.txt + Eliminated another 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 ba20418d3..e64fbc96f 100644 --- a/CHANGES +++ b/CHANGES @@ -2666,6 +2666,7 @@ version 1.4.4rc02 [September 13, 2010] version 1.4.4rc03 [September 13, 2010] Removed an extraneous close-double-quote from CMakeLists.txt + Eliminated another 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/pngtest.c b/pngtest.c index eeb7df75c..7a475161b 100644 --- a/pngtest.c +++ b/pngtest.c @@ -351,8 +351,10 @@ static void pngtest_write_data(png_structp png_ptr, png_bytep data, png_size_t length) { png_size_t check; + png_FILE_p io_ptr; + io_ptr = (png_FILE_p)CVT_PTR(png_get_io_ptr(png_ptr)); - check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr); + check = fwrite(data, 1, length, io_ptr); if (check != length) { png_error(png_ptr, "Write Error"); @@ -1627,4 +1629,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_4rc02 your_png_h_is_not_version_1_4_4rc02; +typedef version_1_4_4rc03 your_png_h_is_not_version_1_4_4rc03;