From 96a0c6a8c261308898e1ba2030fcbced1e355eac Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 13 Mar 2013 08:35:34 -0500 Subject: [PATCH] [libpng15] Imported from libpng-1.5.15beta09.tar --- LICENSE | 4 ++-- README | 2 +- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- pngrutil.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/pnglibconf.h.prebuilt | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/LICENSE b/LICENSE index 22f3e26f6..7ddc46608 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.15beta09, March 5, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.5.15beta09, March 13, 2013, are Copyright (c) 2004, 2006-2012 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 5, 2013 +March 13, 2013 diff --git a/README b/README index 5a3014f38..b2dcec5f6 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.5.15beta09 - March 5, 2013 (shared library 15.0) +README for libpng version 1.5.15beta09 - March 13, 2013 (shared library 15.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/libpng-manual.txt b/libpng-manual.txt index fa9d93e53..60719a04b 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ Libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.15beta09 - March 5, 2013 + libpng version 1.5.15beta09 - March 13, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.15beta09 - March 5, 2013 + libpng versions 0.97, January 1998, through 1.5.15beta09 - March 13, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -4625,7 +4625,7 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -March 5, 2013 +March 13, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. diff --git a/libpng.3 b/libpng.3 index ed192f21e..0e64b1381 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,4 +1,4 @@ -.TH LIBPNG 3 "March 5, 2013" +.TH LIBPNG 3 "March 13, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15beta09 .SH SYNOPSIS @@ -492,7 +492,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT Libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.15beta09 - March 5, 2013 + libpng version 1.5.15beta09 - March 13, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.15beta09 - March 5, 2013 + libpng versions 0.97, January 1998, through 1.5.15beta09 - March 13, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5118,7 +5118,7 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -March 5, 2013 +March 13, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. @@ -5404,7 +5404,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.15beta09 - March 5, 2013: +Libpng version 1.5.15beta09 - March 13, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5427,7 +5427,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.15beta09, March 5, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.5.15beta09, March 13, 2013, are Copyright (c) 2004,2006-2007 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 @@ -5526,7 +5526,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 5, 2013 +March 13, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e21c0fe95..4bda46f13 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "March 5, 2013" +.TH LIBPNGPF 3 "March 13, 2013" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.5.15beta09 (private functions) diff --git a/png.5 b/png.5 index 288a28520..31b221738 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "March 5, 2013" +.TH PNG 5 "March 13, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index b10835483..8060f3be7 100644 --- a/png.c +++ b/png.c @@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.15beta09 - March 5, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.5.15beta09 - March 13, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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 "libpng version 1.5.15beta09 - March 5, 2013\ + return "libpng version 1.5.15beta09 - March 13, 2013\ Copyright (c) 1998-2013 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index 43de1d1c8..01b096f3e 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.15beta09 - March 5, 2013 + * libpng version 1.5.15beta09 - March 13, 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.) @@ -11,7 +11,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.5.15beta09 - March 5, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.5.15beta09 - March 13, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -216,7 +216,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.15beta09, March 5, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.15beta09, March 13, 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: @@ -328,7 +328,7 @@ * Y2K compliance in libpng: * ========================= * - * March 5, 2013 + * March 13, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -395,7 +395,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.5.15beta09" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.15beta09 - March 5, 2013\n" + " libpng version 1.5.15beta09 - March 13, 2013\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 diff --git a/pngconf.h b/pngconf.h index 62f4e9d10..fb51dc1d0 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.15beta09 - March 5, 2013 + * libpng version 1.5.15beta09 - March 13, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 368b63f24..9f9230a8d 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -3202,7 +3202,7 @@ png_combine_row(png_structp png_ptr, png_bytep dp, int display) { png_uint_16p dp16 = (png_uint_16p)dp; png_const_uint_16p sp16 = (png_const_uint_16p)sp; - unsigned int skip = (bytes_to_jump-bytes_to_copy) / + size_t skip = (bytes_to_jump-bytes_to_copy) / sizeof (png_uint_16); do diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index b4bd53088..20390063d 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.15beta09 - March 5, 2013 +libpng version 1.5.15beta09 - March 13, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c40f0becf..5bf1ba233 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@