[libpng16] Imported from libpng-1.6.1beta01.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 83068a7..db5d9c1 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -25,7 +25,7 @@
Changes since the last public release (1.6.0):
-Version 1.6.1 [February 16, 2013]
+Version 1.6.1beta01 [February 16, 2013]
Made symbol prefixing work with the ARM neon optimizations. Also allow
pngpriv.h to be included for preprocessor definitions only, so it can
be used in non-C/C++ files. Back ported from libpng 1.7.
diff --git a/CHANGES b/CHANGES
index 94d56f1..5b712d0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3672,7 +3672,8 @@
No changes.
Version 1.5.7beta01 [November 4, 2011]
- Added support for ARM processor (Mans Rullgard)
+ Added support for ARM processor, when decoding all PNG up-filtered rows
+ and any other-filtered rows with 3 or 4 bytes per pixel (Mans Rullgard).
Fixed bug in pngvalid on early allocation failure; fixed type cast in
pngmem.c; pngvalid would attempt to call png_error() if the allocation
of a png_struct or png_info failed. This would probably have led to a
@@ -4381,7 +4382,7 @@
Version 1.6.0 [February 14, 2013]
No changes.
-Version 1.6.1 [February 16, 2013]
+Version 1.6.1beta01 [February 16, 2013]
Made symbol prefixing work with the ARM neon optimizations. Also allow
pngpriv.h to be included for preprocessor definitions only, so it can
be used in non-C/C++ files. Back ported from libpng 1.7.
diff --git a/arm/arm_init.c b/arm/arm_init.c
index 3a3e86e..2042180 100644
--- a/arm/arm_init.c
+++ b/arm/arm_init.c
@@ -3,7 +3,7 @@
*
* Copyright (c) 2013 Glenn Randers-Pehrson
* Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.5.14 [(PENDING RELEASE)]
+ * Last changed in libpng 1.5.15 [%RDATE%]
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer
@@ -56,7 +56,7 @@
#include <elf.h>
#include <asm/hwcap.h>
-/* A read call may be interupted, in which case it returns -1 and sets errno to
+/* A read call may be interrupted, in which case it returns -1 and sets errno to
* EINTR if nothing was done, otherwise (if something was done) a partial read
* may result.
*/
diff --git a/pngpriv.h b/pngpriv.h
index 8d3905c..d58b22d 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1892,7 +1892,8 @@
#endif /* SIMPLIFIED READ/WRITE */
#ifdef PNG_FILTER_OPTIMIZATIONS
-PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr, unsigned int bpp), PNG_EMPTY);
+PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr,
+ unsigned int bpp), PNG_EMPTY);
/* This is the initialization function for hardware specific optimizations,
* one implementation (for ARM NEON machines) is contained in
* arm/filter_neon.c. It need not be defined - the generic code will be used
diff --git a/pngrutil.c b/pngrutil.c
index e660757..dd997ea 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,8 +1,8 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.6.0 [(PENDING RELEASE)]
- * Copyright (c) 1998-2012 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.0 [February 14, 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.)
*
diff --git a/pngstruct.h b/pngstruct.h
index b8202d1..a9bd7ab 100644
--- a/pngstruct.h
+++ b/pngstruct.h
@@ -471,6 +471,7 @@
/* New member added in libpng-1.5.6 */
png_bytep big_prev_row;
+/* New member added in libpng-1.5.7 */
void (*read_filter[PNG_FILTER_VALUE_LAST-1])(png_row_infop row_info,
png_bytep row, png_const_bytep prev_row);
