diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-02-16 10:15:57 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-02-16 10:48:29 -0600 |
commit | 3b8e7e869d3d0797a03ce50409a04a3bc4d3337b (patch) | |
tree | f3799368a79c625ae50d6a218a0a14ace123d5d7 | |
parent | 765d145ec4c7349bdc8c3c760ad98ae1f9b2079a (diff) | |
download | libpng-3b8e7e869d3d0797a03ce50409a04a3bc4d3337b.tar.gz |
[libpng16] Imported from libpng-1.6.1beta01.tarv1.6.1beta01
-rw-r--r-- | ANNOUNCE | 2 | ||||
-rw-r--r-- | CHANGES | 5 | ||||
-rw-r--r-- | arm/arm_init.c | 4 | ||||
-rw-r--r-- | pngpriv.h | 3 | ||||
-rw-r--r-- | pngrutil.c | 4 | ||||
-rw-r--r-- | pngstruct.h | 1 |
6 files changed, 11 insertions, 8 deletions
@@ -25,7 +25,7 @@ Other information: 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. @@ -3672,7 +3672,8 @@ Version 1.5.6 [November 3, 2011] 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.0rc08 [February 10, 2013] 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 3a3e86e64..2042180ec 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 @@ png_have_neon(png_structp png_ptr) #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. */ @@ -1892,7 +1892,8 @@ PNG_INTERNAL_FUNCTION(void, png_image_free, (png_imagep image), PNG_EMPTY); #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 e66075786..dd997ea2d 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 b8202d13a..a9bd7abb5 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -471,6 +471,7 @@ struct png_struct_def /* 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); |