diff options
| author | John Bowler <jbowler@acm.org> | 2013-04-24 21:31:04 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2013-04-24 21:31:04 -0500 |
| commit | b4a08b81b2d382b5d7531dc7ab95fc0a50867d25 (patch) | |
| tree | 3e4e5e6a6058907b9377ca58e20e16d887e073b1 /arm | |
| parent | 880636292c4852a5fa19948e47c3ecfb1db6e767 (diff) | |
| download | libpng-b4a08b81b2d382b5d7531dc7ab95fc0a50867d25.tar.gz | |
[libpng15] 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.
Diffstat (limited to 'arm')
| -rw-r--r-- | arm/arm_init.c | 4 | ||||
| -rw-r--r-- | arm/filter_neon.S | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/arm/arm_init.c b/arm/arm_init.c index 795dd4938..c24b2a083 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 [March 28, 2013] + * Last changed in libpng 1.5.16 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -216,4 +216,4 @@ png_init_filter_functions_neon(png_structp pp, unsigned int bpp) png_read_filter_row_paeth4_neon; } } -#endif /* FILTER_OPTIMIZATIONS && __arm__ && __ARM_NEON__ */ +#endif /* PNG_ARM_NEON_SUPPORTED */ diff --git a/arm/filter_neon.S b/arm/filter_neon.S index c25f9b8b0..827d1a390 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.5.16 [%RDATE%] + * Last changed in libpng 1.5.16 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -11,7 +11,7 @@ */ /* This is required to get the symbol renames, which are #defines, and also - * includes the value of PNG_FILTER_OPTIMIZATIONS. + * includes the definition (or not) of PNG_ARM_NEON_SUPPORTED. */ #define PNG_VERSION_INFO_ONLY #include "../pngpriv.h" @@ -20,8 +20,7 @@ .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ #endif -#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \ - defined(__ARM_NEON__) +#ifdef PNG_ARM_NEON_SUPPORTED #ifdef __ELF__ # define ELF @@ -233,4 +232,4 @@ func png_read_filter_row_paeth3_neon, export=1 pop {r4,pc} endfunc -#endif /* FILTER_OPTIMIZATIONS && __arm__ && __ARM_NEON__ */ +#endif /* PNG_ARM_NEON_SUPPORTED */ |