[libpng14] Imported from libpng-1.4.14beta01.tar
diff --git a/INSTALL b/INSTALL
index 58409c4..3b651b8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.14beta01 - February 6, 2014
+Installing libpng version 1.4.14beta01 - November 6, 2014
On Unix/Linux and similar systems, you can simply type
diff --git a/LICENSE b/LICENSE
index 3581b0f..f532c5b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.14beta01, February 6, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.14beta01, November 6, 2014, 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 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 6, 2014
+November 6, 2014
diff --git a/README b/README
index 76f8144..a4eaf51 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.14beta01 - February 6, 2014 (shared library 14.0)
+README for libpng version 1.4.14beta01 - November 6, 2014 (shared library 14.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-1.4.14beta01.txt b/libpng-1.4.14beta01.txt
index ec2eb7c..496c3c9 100644
--- a/libpng-1.4.14beta01.txt
+++ b/libpng-1.4.14beta01.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.14beta01 - February 6, 2014
+ libpng version 1.4.14beta01 - November 6, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.14beta01 - February 6, 2014
+ libpng versions 0.97, January 1998, through 1.4.14beta01 - November 6, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -1010,7 +1010,7 @@
to do that, you can add a true alpha channel with
if (color_type == PNG_COLOR_TYPE_RGB ||
- color_type == PNG_COLOR_TYPE_GRAY)
+ color_type == PNG_COLOR_TYPE_GRAY)
png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);
where "filler" contains the alpha value to assign to each pixel.
@@ -3206,7 +3206,8 @@
XII. Coding style
-Our coding style is similar to the "Allman" style, with curly
+Our coding style is similar to the "Allman" style
+(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly
braces on separate lines:
if (condition)
@@ -3315,7 +3316,7 @@
XIII. Y2K Compliance in libpng
-February 6, 2014
+November 6, 2014
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 c483ec3..50bcd66 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "February 6, 2014"
+.TH LIBPNG 3 "November 6, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.14beta01
.SH SYNOPSIS
@@ -442,7 +442,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.14beta01 - February 6, 2014
+ libpng version 1.4.14beta01 - November 6, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -453,7 +453,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.14beta01 - February 6, 2014
+ libpng versions 0.97, January 1998, through 1.4.14beta01 - November 6, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -1452,7 +1452,7 @@
to do that, you can add a true alpha channel with
if (color_type == PNG_COLOR_TYPE_RGB ||
- color_type == PNG_COLOR_TYPE_GRAY)
+ color_type == PNG_COLOR_TYPE_GRAY)
png_set_add_alpha(png_ptr, filler, PNG_FILLER_AFTER);
where "filler" contains the alpha value to assign to each pixel.
@@ -3648,7 +3648,8 @@
.SH XII. Coding style
-Our coding style is similar to the "Allman" style, with curly
+Our coding style is similar to the "Allman" style
+(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly
braces on separate lines:
if (condition)
@@ -3757,7 +3758,7 @@
.SH XIII. Y2K Compliance in libpng
-February 6, 2014
+November 6, 2014
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -4031,7 +4032,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.14beta01 - February 6, 2014:
+Libpng version 1.4.14beta01 - November 6, 2014:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4054,7 +4055,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.14beta01, February 6, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.14beta01, November 6, 2014, 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
@@ -4153,7 +4154,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 6, 2014
+November 6, 2014
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 0737473..a658fe8 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "February 6, 2014"
+.TH LIBPNGPF 3 "November 6, 2014"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.14beta01
(private functions)
diff --git a/png.5 b/png.5
index 096ccc2..bf3aa87 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "February 6, 2014"
+.TH PNG 5 "November 6, 2014"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 856ef77..0ced5f9 100644
--- a/png.c
+++ b/png.c
@@ -547,13 +547,13 @@
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.4.14beta01 - February 6, 2014" PNG_STRING_NEWLINE \
+ "libpng version 1.4.14beta01 - November 6, 2014" 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.14beta01 - February 6, 2014\
+ return ((png_charp) "libpng version 1.4.14beta01 - November 6, 2014\
Copyright (c) 1998-2010 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 225e894..bd13e17 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.14beta01 - February 6, 2014
+ * libpng version 1.4.14beta01 - November 6, 2014
* 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.)
@@ -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.4.14beta01 - February 6, 2014: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.14beta01 - November 6, 2014: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -205,7 +205,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.4.14beta01, February 6, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.14beta01, November 6, 2014, 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:
@@ -317,7 +317,7 @@
* Y2K compliance in libpng:
* =========================
*
- * February 6, 2014
+ * November 6, 2014
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -381,7 +381,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.4.14beta01"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.14beta01 - February 6, 2014\n"
+ " libpng version 1.4.14beta01 - November 6, 2014\n"
#define PNG_LIBPNG_VER_SONUM 14
#define PNG_LIBPNG_VER_DLLNUM 14
diff --git a/pngconf.h b/pngconf.h
index 3a87cbd..9793602 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.14beta01 - February 6, 2014
+ * libpng version 1.4.14beta01 - November 6, 2014
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpriv.h b/pngpriv.h
index e1092a4..f8ca419 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.14beta01 - February 6, 2014
+ * libpng version 1.4.14beta01 - November 6, 2014
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2014 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index 0ed5c52..576eddf 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1373,6 +1373,9 @@
{
if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE)
{
+ if (png_ptr->palette == NULL)
+ png_error (png_ptr, "Palette is NULL in indexed image");
+
png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1,
png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans);
}
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 09c0d03..d5380b5 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.4.14beta01 - February 6, 2014
+libpng version 1.4.14beta01 - November 6, 2014
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index 912f38e..87fccca 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source and build
*
- * libpng version 1.4.14beta01 - February 6, 2014
+ * libpng version 1.4.14beta01 - November 6, 2014
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index a90691e..02d27fb 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.4.14beta01 - February 6, 2014
+Makefiles for libpng version 1.4.14beta01 - November 6, 2014
makefile.linux => Linux/ELF makefile
(gcc, creates libpng14.so.14.1.4.14beta01)
