summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL2
-rw-r--r--LICENSE4
-rw-r--r--README2
-rw-r--r--Y2KINFO2
-rw-r--r--libpng-1.2.53beta02.txt6
-rw-r--r--libpng.314
-rw-r--r--libpngpf.32
-rw-r--r--png.52
-rw-r--r--png.h10
-rw-r--r--pngconf.h2
-rw-r--r--pngpread.c9
-rw-r--r--pngrutil.c2
-rw-r--r--scripts/README.txt2
13 files changed, 31 insertions, 28 deletions
diff --git a/INSTALL b/INSTALL
index 3da032891..2ea0aa75a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.53beta02 - February 5, 2015
+Installing libpng version 1.2.53beta02 - February 6, 2015
On Unix/Linux and similar systems, you can simply type
diff --git a/LICENSE b/LICENSE
index 1bb589338..2c3b8e690 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.2.53beta02, February 5, 2015, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.53beta02, February 6, 2015, are
Copyright (c) 2004, 2006-2014 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
-February 5, 2015
+February 6, 2015
diff --git a/README b/README
index e7ac5b18e..914c34fdb 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.53beta02 - February 5, 2015 (shared library 12.0)
+README for libpng version 1.2.53beta02 - February 6, 2015 (shared library 12.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/Y2KINFO b/Y2KINFO
index 09265445c..bd2da1212 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,7 +1,7 @@
Y2K compliance in libpng:
=========================
- February 5, 2015
+ February 6, 2015
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
diff --git a/libpng-1.2.53beta02.txt b/libpng-1.2.53beta02.txt
index d804d2ab0..43e76df57 100644
--- a/libpng-1.2.53beta02.txt
+++ b/libpng-1.2.53beta02.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.53beta02 - February 5, 2015
+ libpng version 1.2.53beta02 - February 6, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.2.53beta02 - February 5, 2015
+ libpng versions 0.97, January 1998, through 1.2.53beta02 - February 6, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -3183,7 +3183,7 @@ Other rules can be inferred by inspecting the libpng source.
XIII. Y2K Compliance in libpng
-February 5, 2015
+February 6, 2015
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 ab9ac696d..b55115091 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "February 5, 2015"
+.TH LIBPNG 3 "February 6, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.53beta02
.SH SYNOPSIS
@@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.53beta02 - February 5, 2015
+ libpng version 1.2.53beta02 - February 6, 2015
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -421,7 +421,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.2.53beta02 - February 5, 2015
+ libpng versions 0.97, January 1998, through 1.2.53beta02 - February 6, 2015
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -3593,7 +3593,7 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIII. Y2K Compliance in libpng
-February 5, 2015
+February 6, 2015
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -3986,7 +3986,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.53beta02 - February 5, 2015:
+Libpng version 1.2.53beta02 - February 6, 2015:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4009,7 +4009,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.2.53beta02, February 5, 2015, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.53beta02, February 6, 2015, are
Copyright (c) 2004,2006-2008 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
@@ -4108,7 +4108,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 5, 2015
+February 6, 2015
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index a4a968c26..297670458 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "February 5, 2015"
+.TH LIBPNGPF 3 "February 6, 2015"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.53beta02
(private functions)
diff --git a/png.5 b/png.5
index 225c4abb1..e1297632c 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "February 5, 2015"
+.TH PNG 5 "February 6, 2015"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.h b/png.h
index f37964eaf..40f4a32e4 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.53beta02 - February 5, 2015
+ * libpng version 1.2.53beta02 - February 6, 2015
* Copyright (c) 1998-2014 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.53beta02 - February 5, 2015: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.53beta02 - February 6, 2015: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -324,7 +324,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.53beta02, February 5, 2015, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.53beta02, February 6, 2015, 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:
@@ -436,7 +436,7 @@
* Y2K compliance in libpng:
* =========================
*
- * February 5, 2015
+ * February 6, 2015
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -500,7 +500,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.53beta02"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.53beta02 - February 5, 2015\n"
+ " libpng version 1.2.53beta02 - February 6, 2015\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
diff --git a/pngconf.h b/pngconf.h
index 40b7778ec..fc9bf3ecc 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.53beta02 - February 5, 2015
+ * libpng version 1.2.53beta02 - February 6, 2015
* 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.)
diff --git a/pngpread.c b/pngpread.c
index 5af209d4d..419995eab 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -685,9 +685,12 @@ png_push_save_buffer(png_structp png_ptr)
png_free(png_ptr, old_buffer);
png_error(png_ptr, "Insufficient memory for save_buffer");
}
- png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
- png_free(png_ptr, old_buffer);
- png_ptr->save_buffer_max = new_max;
+ else
+ {
+ png_memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size);
+ png_free(png_ptr, old_buffer);
+ png_ptr->save_buffer_max = new_max;
+ }
}
if (png_ptr->current_buffer_size)
{
diff --git a/pngrutil.c b/pngrutil.c
index bd517b135..7f2340100 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -63,7 +63,7 @@ png_get_uint_31(png_structp png_ptr, png_bytep buf)
((png_uint_32)((*(buf + 3)) & 0xff) );
#endif
if (i > PNG_UINT_31_MAX)
- png_error(png_ptr, "PNG unsigned integer out of range.");
+ png_error(png_ptr, "PNG unsigned integer out of range.");
return (i);
}
#ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
diff --git a/scripts/README.txt b/scripts/README.txt
index 138075c24..8317334b0 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.2.53beta02 - February 5, 2015
+Makefiles for libpng version 1.2.53beta02 - February 6, 2015
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.53beta02)