diff --git a/ANNOUNCE b/ANNOUNCE index 53b638e0c..499ad6270 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -340,6 +340,7 @@ Version 1.7.0beta16 [July 3, 2013] Updated documentation to show default behavior of benign errors correctly. Added perfect hash code generation for lists of PNG chunks. This is a work in progress; checked in for use in pngfix.c + Ported ARM no-read patch from libpng16. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 876c28101..8511ab869 100644 --- a/CHANGES +++ b/CHANGES @@ -4628,6 +4628,7 @@ Version 1.7.0beta16 [July 3, 2013] Updated documentation to show default behavior of benign errors correctly. Added perfect hash code generation for lists of PNG chunks. This is a work in progress; checked in for use in pngfix.c + Ported ARM no-read patch from libpng16. 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 */