[libpng12] Changed '"%s"m' to '"%s" m' in png_debug macros to improve

portability among compilers.
This commit is contained in:
Glenn Randers-Pehrson 2013-11-28 16:43:32 -06:00
parent b2459fbc18
commit 6ab9048ea5
3 changed files with 16 additions and 12 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.2.51beta03 - June 18, 2013
Libpng 1.2.51beta03 - November 28, 2013
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.
@ -52,7 +52,9 @@ version 1.2.51beta02 [June 13, 2013]
Avoid a possible memory leak in contrib/gregbook/readpng.c
Revised libpng.3 so that "doclifter" can process it.
version 1.2.51beta03 [June 18, 2013]
version 1.2.51beta03 [November 28, 2013]
Changed '"%s"m' to '"%s" m' in png_debug macros to improve portability
among compilers.
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

View File

@ -2788,7 +2788,9 @@ version 1.2.51beta02 [June 13, 2013]
Avoid a possible memory leak in contrib/gregbook/readpng.c
Revised libpng.3 so that "doclifter" can process it.
version 1.2.51beta03 [June 18, 2013]
version 1.2.51beta03 [November 28, 2013]
Changed '"%s"m' to '"%s" m' in png_debug macros to improve portability
among compilers.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

18
png.h
View File

@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.51beta03 - June 18, 2013
* libpng version 1.2.51beta03 - November 28, 2013
* Copyright (c) 1998-2013 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.)
@ -10,7 +10,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
* libpng versions 0.97, January 1998, through 1.2.51beta03 - June 18, 2013: Glenn
* libpng versions 0.97, January 1998, through 1.2.51beta03 - November 28, 2013: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -316,8 +316,8 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.2.51beta03, June 18, 2013, are
* Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
* libpng versions 1.2.6, August 15, 2004, through 1.2.51beta03, November 28, 2013, are
* Copyright (c) 2004, 2006-2013 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:
*
@ -428,7 +428,7 @@
* Y2K compliance in libpng:
* =========================
*
* June 18, 2013
* November 28, 2013
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@ -492,7 +492,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.51beta03"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.51beta03 - June 18, 2013\n"
" libpng version 1.2.51beta03 - November 28, 2013\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -2657,7 +2657,7 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
# define png_debug(l,m) \
{ \
int num_tabs=l; \
fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
(num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \
}
# endif
@ -2665,7 +2665,7 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
# define png_debug1(l,m,p1) \
{ \
int num_tabs=l; \
fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
(num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \
}
# endif
@ -2673,7 +2673,7 @@ extern PNG_EXPORT(void, png_write_png) PNGARG((png_structp png_ptr,
# define png_debug2(l,m,p1,p2) \
{ \
int num_tabs=l; \
fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
(num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \
}
# endif