summaryrefslogtreecommitdiff
path: root/png.c
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2010-04-29 09:22:01 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2010-04-29 09:22:01 -0500
commit97313e0aab3a8826599c24ac49d1812d1bed7bde (patch)
treef88fafe3d3fd85ab7e7c4f0e618ec3caa8321669 /png.c
parent8876e74e4391fcebe2f226af26e74c6432ed2137 (diff)
downloadlibpng-97313e0aab3a8826599c24ac49d1812d1bed7bde.tar.gz
[master] Include png_reset_zstream() in png.c only when PNG_READ_SUPPORTED
is defined.
Diffstat (limited to 'png.c')
-rw-r--r--png.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/png.c b/png.c
index d868a1cf0..7f3a67d61 100644
--- a/png.c
+++ b/png.c
@@ -551,13 +551,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.4.2rc04 - April 27, 2010" PNG_STRING_NEWLINE \
+ "libpng version 1.4.2rc04 - April 29, 2010" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE);
#else
- return ((png_charp) "libpng version 1.4.2rc04 - April 27, 2010\
+ return ((png_charp) "libpng version 1.4.2rc04 - April 29, 2010\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
@@ -622,7 +622,9 @@ png_handle_as_unknown(png_structp png_ptr, png_bytep chunk_name)
return 0;
}
#endif
+#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+#ifdef PNG_READ_SUPPORTED
/* This function, added to libpng-1.0.6g, is untested. */
int PNGAPI
png_reset_zstream(png_structp png_ptr)
@@ -631,7 +633,7 @@ png_reset_zstream(png_structp png_ptr)
return Z_STREAM_ERROR;
return (inflateReset(&png_ptr->zstream));
}
-#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */
+#endif /* PNG_READ_SUPPORTED */
/* This function was added to libpng-1.0.7 */
png_uint_32 PNGAPI