[libpng12] Imported from libpng-1.2.52beta01.tar
diff --git a/INSTALL b/INSTALL
index 324eaf9..dcd206d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.52beta01 - February 6, 2014
+Installing libpng version 1.2.52beta01 - November 6, 2014
On Unix/Linux and similar systems, you can simply type
diff --git a/LICENSE b/LICENSE
index 3305948..b850790 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.2.52beta01, February 6, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.52beta01, 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 f34c74a..2209e46 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.52beta01 - February 6, 2014 (shared library 12.0)
+README for libpng version 1.2.52beta01 - November 6, 2014 (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.
@@ -93,6 +93,12 @@
at GO GRAPHSUP. If you can't find it in any of those places,
e-mail me, and I'll help you find it.
+I am not a lawyer, but I believe that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because it
+is open source, publicly available software, that does not contain any
+encryption software. See the EAR, paragraphs 734.3(b)(3) and 734.7(b).
+
If you have any code changes, requests, problems, etc., please e-mail
them to me. Also, I'd appreciate any make files or project files,
and any modifications you needed to make to get libpng to compile,
diff --git a/Y2KINFO b/Y2KINFO
index 91cffd0..4b4804a 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,7 +1,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.
diff --git a/libpng-1.2.52beta01.txt b/libpng-1.2.52beta01.txt
index 6857d4f..e6e3536 100644
--- a/libpng-1.2.52beta01.txt
+++ b/libpng-1.2.52beta01.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.52beta01 - February 6, 2014
+ libpng version 1.2.52beta01 - 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.2.52beta01 - February 6, 2014
+ libpng versions 0.97, January 1998, through 1.2.52beta01 - November 6, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -3074,7 +3074,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)
@@ -3182,7 +3183,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 39b8d8d..5b7fd3f 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.2.52beta01
.SH SYNOPSIS
@@ -410,7 +410,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.52beta01 - February 6, 2014
+ libpng version 1.2.52beta01 - November 6, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -421,7 +421,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.2.52beta01 - February 6, 2014
+ libpng versions 0.97, January 1998, through 1.2.52beta01 - November 6, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -3484,7 +3484,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)
@@ -3592,7 +3593,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.
@@ -3981,7 +3982,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.52beta01 - February 6, 2014:
+Libpng version 1.2.52beta01 - 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).
@@ -4004,7 +4005,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.2.52beta01, February 6, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.52beta01, November 6, 2014, 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
@@ -4103,7 +4104,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 368ee8f..b56fff5 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.2.52beta01
(private functions)
diff --git a/png.5 b/png.5
index d61b17e..269ee23 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 177d0fe..951284d 100644
--- a/png.c
+++ b/png.c
@@ -724,13 +724,13 @@
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.2.52beta01 - February 6, 2014" PNG_STRING_NEWLINE \
+ "libpng version 1.2.52beta01 - November 6, 2014" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2014 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.2.52beta01 - February 6, 2014\
+ return ((png_charp) "libpng version 1.2.52beta01 - November 6, 2014\
Copyright (c) 1998-2014 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 01c7fa0..2c4f1f4 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.52beta01 - February 6, 2014
+ * libpng version 1.2.52beta01 - November 6, 2014
* 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.52beta01 - February 6, 2014: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.52beta01 - November 6, 2014: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -320,7 +320,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.52beta01, February 6, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.52beta01, 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:
@@ -432,7 +432,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.
@@ -496,7 +496,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.52beta01"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.52beta01 - February 6, 2014\n"
+ " libpng version 1.2.52beta01 - November 6, 2014\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
diff --git a/pngconf.h b/pngconf.h
index 720ab64..6b31c06 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.52beta01 - February 6, 2014
+ * libpng version 1.2.52beta01 - November 6, 2014
* 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/pngrtran.c b/pngrtran.c
index 9e8ff9f..0a760ce 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1379,6 +1379,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, png_ptr->num_trans);
}
diff --git a/scripts/README.txt b/scripts/README.txt
index 401ec25..bc8ce5c 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.2.52beta01 - February 6, 2014
+Makefiles for libpng version 1.2.52beta01 - November 6, 2014
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.52beta01)
