diff --git a/ANNOUNCE b/ANNOUNCE index 16b05053d..f12787798 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.7.0beta09 - April 19, 2013 +Libpng 1.7.0beta09 - April 24, 2013 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. @@ -254,9 +254,13 @@ Version 1.7.0beta08 [April 18, 2013] written by libpng-1.6.0 and 1.6.1. Disallow storing sRGB information when the sRGB is not supported. -Version 1.7.0beta09 [April 19, 2013] +Version 1.7.0beta09 [April 24, 2013] Exposed PNG chunk types in png.h Modified png_uint_32 macros/code to make as few assumptions as possible + Revised stack marking in arm/filter_neon.S and configure.ac + Ensure that NEON filter stuff is completely disabled when switched 'off'. + Previously the ARM NEON specific files were still built if the option + was switched 'off' as opposed to being explicitly disabled. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 3f59305c5..8d735f875 100644 --- a/CHANGES +++ b/CHANGES @@ -4541,10 +4541,14 @@ Version 1.7.0beta08 [April 18, 2013] written by libpng-1.6.0 and 1.6.1. Disallow storing sRGB information when the sRGB is not supported. -Version 1.7.0beta09 [April 19, 2013] +Version 1.7.0beta09 [April 24, 2013] Exposed PNG chunk types in png.h Modified png_uint_32 macros/code to make as few assumptions as possible about the hardware. + Revised stack marking in arm/filter_neon.S and configure.ac + Ensure that NEON filter stuff is completely disabled when switched 'off'. + Previously the ARM NEON specific files were still built if the option + was switched 'off' as opposed to being explicitly disabled. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/arm/arm_init.c b/arm/arm_init.c index 1e7b9981c..795dd4938 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.15 [%RDATE%] + * Last changed in libpng 1.5.15 [March 28, 2013] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/arm/filter_neon.S b/arm/filter_neon.S index 72420a9e3..c4946b171 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -1,9 +1,9 @@ /* filter_neon.S - NEON optimised filter functions * - * Copyright (c) 2011 Glenn Randers-Pehrson + * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.5.7 [December 15, 2011] + * Last changed in libpng 1.6.2 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -16,12 +16,13 @@ #define PNG_VERSION_INFO_ONLY #include "../pngpriv.h" -#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \ - defined(__ARM_NEON__) #if defined(__linux__) && defined(__ELF__) .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ #endif +#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \ + defined(__ARM_NEON__) + #ifdef __ELF__ # define ELF #else diff --git a/configure.ac b/configure.ac index c7ae7a861..fe06a5042 100644 --- a/configure.ac +++ b/configure.ac @@ -334,11 +334,6 @@ AC_ARG_WITH(libpng-prefix, fi]) AM_CONDITIONAL([DO_PNG_PREFIX], [test "${with_libpng_prefix:-no}" != "no"]) -# Because GCC by default assembles code with an executable stack, even though it -# compiles C code with a non-executable stack, it is necessary to do a fixup -# here (this may by GCC specific) -AC_SUBST([AM_CCASFLAGS], [-Wa,--noexecstack]) - AC_ARG_ENABLE([arm-neon], AS_HELP_STRING([[[--enable-arm-neon]]], [Enable ARM NEON optimizations: =off, check, api, on:] @@ -347,9 +342,12 @@ AC_ARG_ENABLE([arm-neon], [a call to png_set_option; on: turn on unconditionally. The] [default is 'on' if __ARM_NEON__ is defined, otherwise 'off'.]), [case "$enableval" in - off) + no|off) + # disable the default enabling on __ARM_NEON__ systems: AC_DEFINE([PNG_NO_ARM_NEON], [], - [Disable ARM Neon optimizations]);; + [Disable ARM Neon optimizations]) + # Prevent use of the assembler files below: + enable_arm_neon=no;; check) AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [], [Check for ARM Neon support at run-time]);; diff --git a/png.c b/png.c index d0cbbbac3..9b5607a68 100644 --- a/png.c +++ b/png.c @@ -691,13 +691,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta09 - April 19, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta09 - April 24, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.7.0beta09 - April 19, 2013\ + return "libpng version 1.7.0beta09 - April 24, 2013\ Copyright (c) 1998-2013 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 e5e168faf..9a3f93c54 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta09 - April 19, 2013 + * libpng version 1.7.0beta09 - April 24, 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.) @@ -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.7.0beta09 - April 19, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta09 - April 24, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta09, April 19, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta09, April 24, 2013, 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: @@ -312,7 +312,7 @@ * Y2K compliance in libpng: * ========================= * - * April 19, 2013 + * April 24, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -380,7 +380,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta09" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta09 - April 19, 2013\n" + " libpng version 1.7.0beta09 - April 24, 2013\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngrutil.c b/pngrutil.c index 4cb129e83..b82b4ea23 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -76,7 +76,7 @@ png_get_uint_16)(png_const_bytep buf) /* This is an exported function however its error handling is too harsh for most * internal use. For example if it were used for reading the chunk parameters - * it would error out even on ancilliary chunks that can be ignored. + * it would error out even on ancillary chunks that can be ignored. */ png_uint_32 PNGAPI png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf)