From 497e7319f4ecf127f786551026090ece2f752b7c Mon Sep 17 00:00:00 2001 From: John Bowler Date: Tue, 2 Jul 2013 22:57:40 -0500 Subject: [PATCH] [libpng16] Only compile ARM code when PNG_READ_SUPPORTED is defined. --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- arm/arm_init.c | 2 ++ arm/filter_neon.S | 2 ++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 9b25880d5..be07a0263 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.3beta10 - July 2, 2013 +Libpng 1.6.3beta10 - July 3, 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. @@ -112,8 +112,9 @@ Version 1.6.3beta09 [June 27, 2013] Renamed contrib/tools/png-fix-too-far-back.c to pngfix.c and revised it to check all compressed chunks known to libpng. -Version 1.6.3beta10 [July 2, 2013] +Version 1.6.3beta10 [July 3, 2013] Updated documentation to show default behavior of benign errors correctly. + Only compile ARM code when PNG_READ_SUPPORTED is defined. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 99d0413a0..06b4f4e36 100644 --- a/CHANGES +++ b/CHANGES @@ -4596,8 +4596,9 @@ Version 1.6.3beta09 [June 27, 2013] Renamed contrib/tools/png-fix-too-far-back.c to pngfix.c and revised it to check all compressed chunks known to libpng. -Version 1.6.3beta10 [July 2, 2013] +Version 1.6.3beta10 [July 3, 2013] Updated documentation to show default behavior of benign errors correctly. + Only compile ARM code when PNG_READ_SUPPORTED is defined. 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 36eacde9e..33d667292 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -16,6 +16,7 @@ #include "../pngpriv.h" +#ifdef PNG_READ_SUPPORTED #if PNG_ARM_NEON_OPT > 0 #ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */ #include /* for sig_atomic_t */ @@ -217,3 +218,4 @@ png_init_filter_functions_neon(png_structp pp, unsigned int bpp) } } #endif /* PNG_ARM_NEON_OPT > 0 */ +#endif /* PNG_READ_SUPPORTED */ diff --git a/arm/filter_neon.S b/arm/filter_neon.S index 9c0cab9d6..73520dd81 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -20,6 +20,7 @@ .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ #endif +#ifdef PNG_READ_SUPPORTED #if PNG_ARM_NEON_OPT > 0 #ifdef __ELF__ @@ -233,3 +234,4 @@ func png_read_filter_row_paeth3_neon, export=1 pop {r4,pc} endfunc #endif /* PNG_ARM_NEON_OPT > 0 */ +#endif /* PNG_READ_SUPPORTED */