[libpng16] Imported from libpng-1.6.22beta03.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 96c60e4..6cf6dfb 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.22beta03 - March 7, 2016
+Libpng 1.6.22beta03 - March 9, 2016
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.
@@ -54,7 +54,7 @@
extend the png_set_alpha_mode range as HDR imaging systems are starting
to emerge.
-Version 1.6.22beta03 [March 7, 2016]
+Version 1.6.22beta03 [March 9, 2016]
Added a common-law trademark notice and export control information
to the LICENSE file, png.h, and the man page.
Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
diff --git a/CHANGES b/CHANGES
index 6142ded..79d70f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5514,7 +5514,7 @@
extend the png_set_alpha_mode range as HDR imaging systems are starting
to emerge.
-Version 1.6.22beta03 [March 7, 2016]
+Version 1.6.22beta03 [March 9, 2016]
Added a common-law trademark notice and export control information
to the LICENSE file, png.h, and the man page.
Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
diff --git a/LICENSE b/LICENSE
index d2bb706..adb3998 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.6.22beta03, February 19, 2016, are
+libpng versions 1.0.7, July 1, 2000 through 1.6.22beta03, March 9, 2016 are
Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
@@ -127,4 +127,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 19, 2016
+March 9, 2016
diff --git a/README b/README
index 4c5b0ec..b4dbd84 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.22beta03 - February 8, 2016 (shared library 16.0)
+README for libpng version 1.6.22beta03 - March 9, 2016 (shared library 16.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/contrib/intel/INSTALL b/contrib/intel/INSTALL
index 9b4f9dc..e4d5677 100644
--- a/contrib/intel/INSTALL
+++ b/contrib/intel/INSTALL
@@ -3,23 +3,47 @@
Copyright (c) 2016 Google, Inc.
Written by Mike Klein and Matt Sarett
-To enable SSE support in libpng, apply intel_sse.patch in your build
-directory, before running "configure". If you prefer, manually edit
-configure.ac and Makefile.am, following the instructions below, then
-then follow the instructions in section II of INSTALL in the main libpng
-directory.
-
-Then configure libpng with -DPNG_INTEL_SSE in CPPFLAGS. If you only
-want to optimize reading 4bpp images, also use -DPNG_NO_INTEL_SSE_3BPP.
-
If you have moved intel_init.c and filter_sse2_intrinsics.c to a different
directory, be sure to update the '#include "../../pngpriv.h"' line in both
files if necessary to point to the correct relative location of pngpriv.h
with respect to the new location of those files.
-If you are using a custom makefile instead of a configure-generated
-makefile, you will have to update it manually to include contrib/intel/*.c
-and to define PNG_INTEL_SSE and possibly PNG_NO_INTEL_SSE_3BPP.
+To enable SSE support in libpng, follow the instructions in I, II, or III,
+below:
+
+I. Using patched "configure" scripts:
+
+First, apply intel_sse.patch in your build directory.
+
+ patch -i contrib/intel/intel_sse.patch -p1
+
+Then, if you are not building in a new GIT clone, e.g., in a tar
+distribution, remove any existing pre-built configure scripts:
+
+ ./configure --enable-maintainer-mode
+ make maintainer-clean
+ ./autogen.sh --maintainer --clean
+
+Finally, configure libpng with -DPNG_INTEL_SSE in CPPFLAGS. If you only
+want to optimize reading 4bpp images, also use -DPNG_NO_INTEL_SSE_3BPP:
+
+ ./autogen.sh --maintainer
+ CPPFLAGS="-DPNG_INTEL_SSE -DPNG_NO_INTEL_SSE_3BPP" ./configure [options]
+ make
+
+II. Using a custom makefile:
+
+If you are using a custom makefile makefile, you will have to update it
+manually to include contrib/intel/*.o in the dependencies, and to define
+PNG_INTEL_SSE and possibly PNG_NO_INTEL_SSE_3BPP.
+
+III. Using manually updated "configure" scripts:
+
+If you prefer, manually edit configure.ac and Makefile.am, following the
+instructions below, then follow the instructions in section II of INSTALL
+in the main libpng directory, then configure libpng with -DPNG_INTEL_SSE
+in CPPFLAGS. If you only want to optimize reading 4bpp images, also use
+-DPNG_NO_INTEL_SSE_3BPP.
1. Insert the following lines above the copyright line near the top of
configure.ac:
diff --git a/libpng-manual.txt b/libpng-manual.txt
index 9261e01..e597727 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.6.22beta03 - February 19, 2016
+ libpng version 1.6.22beta03 - March 9, 2016
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.22beta03 - February 19, 2016
+ libpng versions 0.97, January 1998, through 1.6.22beta03 - March 9, 2016
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2016 Glenn Randers-Pehrson
diff --git a/libpng.3 b/libpng.3
index 561e464..85e9f45 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "February 19, 2016"
+.TH LIBPNG 3 "March 9, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta03
.SH SYNOPSIS
@@ -510,7 +510,7 @@
.SH LIBPNG.TXT
libpng-manual.txt - A description on how to use and modify libpng
- libpng version 1.6.22beta03 - February 19, 2016
+ libpng version 1.6.22beta03 - March 9, 2016
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -521,7 +521,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.6.22beta03 - February 19, 2016
+ libpng versions 0.97, January 1998, through 1.6.22beta03 - March 9, 2016
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2016 Glenn Randers-Pehrson
@@ -6005,7 +6005,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.6.22beta03 - February 19, 2016:
+Libpng version 1.6.22beta03 - March 9, 2016:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -6030,7 +6030,7 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.6.22beta03, February 19, 2016, are
+libpng versions 1.0.7, July 1, 2000 through 1.6.22beta03, March 9, 2016 are
Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
derived from libpng-1.0.6, and are distributed according to the same
disclaimer and license as libpng-1.0.6 with the following individuals
@@ -6155,7 +6155,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-February 19, 2016
+March 9, 2016
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 5173d8a..4192008 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "February 8, 2016"
+.TH LIBPNGPF 3 "March 9, 2016"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.6.22beta03
(private functions)
diff --git a/png.5 b/png.5
index f1e6c3a..e9d82c2 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "February 8, 2016"
+.TH PNG 5 "March 9, 2016"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index ea5b94c..8033ab9 100644
--- a/png.c
+++ b/png.c
@@ -775,14 +775,14 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.22beta03 - February 8, 2016" PNG_STRING_NEWLINE \
+ "libpng version 1.6.22beta03 - March 9, 2016" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2016 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.6.22beta03 - February 8, 2016\
+ return "libpng version 1.6.22beta03 - March 9, 2016\
Copyright (c) 1998-2002,2004,2006-2016 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 62a7cb7..7318dbe 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.22beta03, February 19, 2016
+ * libpng version 1.6.22beta03, March 9, 2016
*
* Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -12,7 +12,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.6.22beta03, February 19, 2016:
+ * libpng versions 0.97, January 1998, through 1.6.22beta03, March 9, 2016:
* Glenn Randers-Pehrson.
* See also "Contributing Authors", below.
*/
@@ -29,7 +29,7 @@
* files that are distributed with libpng have other copyright owners and
* are released under other open source licenses.
*
- * libpng versions 1.0.7, July 1, 2000, through 1.6.22beta03, February 19, 2016, are
+ * libpng versions 1.0.7, July 1, 2000 through 1.6.22beta03, March 9, 2016 are
* Copyright (c) 2000-2002, 2004, 2006-2016 Glenn Randers-Pehrson, are
* derived from libpng-1.0.6, and are distributed according to the same
* disclaimer and license as libpng-1.0.6 with the following individuals
@@ -245,7 +245,7 @@
* Y2K compliance in libpng:
* =========================
*
- * February 19, 2016
+ * March 9, 2016
*
* Since the PNG Development group is an ad-hoc body, we can't make
* an official declaration.
@@ -315,7 +315,7 @@
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.6.22beta03"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.22beta03 - February 19, 2016\n"
+ " libpng version 1.6.22beta03 - March 9, 2016\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
diff --git a/pngconf.h b/pngconf.h
index c850f5d..67a9fb9 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.22beta03, February 8, 2016
+ * libpng version 1.6.22beta03, March 9, 2016
*
* Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpriv.h b/pngpriv.h
index 0ac16fa..8893f18 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * Last changed in libpng 1.6.21 [(PENDING RELEASE)]
+ * Last changed in libpng 1.6.22 [(PENDING RELEASE)]
* Copyright (c) 1998-2002,2004,2006-2015 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 8456714..b65abbd 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -159,7 +159,7 @@
png_set_background_fixed(png_ptr, background_color, background_gamma_code,
need_expand, png_fixed(png_ptr, background_gamma, "png_set_background"));
}
-# endif /* FLOATING_POINT */
+# endif /* FLOATING_POINT */
#endif /* READ_BACKGROUND */
/* Scale 16-bit depth files to 8-bit depth. If both of these are set then the
@@ -1915,7 +1915,7 @@
png_ptr->palette[i].blue = (png_byte)component;
}
}
-#endif /* READ_SHIFT */
+#endif /* READ_SHIFT */
}
/* Modify the info structure to reflect the transformations. The
diff --git a/pngset.c b/pngset.c
index 2103fe6..4bd5ab3 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.6.21 [(PENDING RELEASE)]
+ * Last changed in libpng 1.6.21 [January 15, 2016]
* Copyright (c) 1998-2015 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/pngwutil.c b/pngwutil.c
index aa5bda3..4941690 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
- * Last changed in libpng 1.6.21 [(PENDING RELEASE)]
+ * Last changed in libpng 1.6.22 [(PENDING RELEASE)]
* Copyright (c) 1998-2002,2004,2006-2015 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/projects/vstudio/README.txt b/projects/vstudio/README.txt
index 6919cc0..b70c1d3 100644
--- a/projects/vstudio/README.txt
+++ b/projects/vstudio/README.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.22beta03 - February 8, 2016
+libpng version 1.6.22beta03 - March 9, 2016
Copyright (c) 2010,2013,2015 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index caf5d9c..9934f7a 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.6.22beta03 - February 8, 2016
+ * libpng version 1.6.22beta03 - March 9, 2016
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 63e0e0e..9bfa81f 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,5 +1,5 @@
-Makefiles for libpng version 1.6.22beta03 - February 8, 2016
+Makefiles for libpng version 1.6.22beta03 - March 9, 2016
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 7204c6d..898ebcd 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -2,7 +2,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.22beta03 - February 8, 2016 */
+/* Libpng version 1.6.22beta03 - March 9, 2016 */
/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */
