mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[master] Changed argument of png_get_io_ptr() back to png_struct

Browse Source 
because we promised not to change its signature, so it can be used
safely in configure scripts to detect libpng.
This commit is contained in:
Glenn Randers-Pehrson
2011-01-21 22:17:18 -06:00
parent 379d0160ea
commit b94d24eb25
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
png.c
View File

@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.4.6 [January 21, 2011]
* Last changed in libpng 1.4.6 [January 22, 2011]
* Copyright (c) 1998-2011 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.)
@@ -470,7 +470,7 @@ png_info_destroy(png_structp png_ptr, png_infop info_ptr)
* pointer before png_write_destroy() or png_read_destroy() are called.
*/
png_voidp PNGAPI
png_get_io_ptr(const_png_structp png_ptr)
png_get_io_ptr(png_structp png_ptr)
{
if (png_ptr == NULL)
return (NULL);
@@ -547,13 +547,13 @@ png_get_copyright(const_png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.4.6beta04 - January 21, 2011" PNG_STRING_NEWLINE \
"libpng version 1.4.6beta04 - January 22, 2011" 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.6beta04 - January 21, 2011\
return ((png_charp) "libpng version 1.4.6beta04 - January 22, 2011\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");