diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-11-29 17:04:35 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-11-29 17:04:35 -0600 |
| commit | 7c5d03703274196919d617b60d3c4e52b96f7c90 (patch) | |
| tree | b0291c05c739bc053d93151bdead50a57e92745e | |
| parent | ee16fc4a6f573a5339ddd7474da5aedb4f7c2d87 (diff) | |
| download | libpng-7c5d03703274196919d617b60d3c4e52b96f7c90.tar.gz | |
[libpng16] Update arm/*.c to libpng coding style.
| -rw-r--r-- | arm/arm_init.c | 3 | ||||
| -rw-r--r-- | arm/filter_neon_intrinsics.c | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/arm/arm_init.c b/arm/arm_init.c index 9a23e1040..d87b6e727 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -3,7 +3,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.10 [March 6, 2014] + * Last changed in libpng 1.6.16 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -17,6 +17,7 @@ #include "../pngpriv.h" #ifdef PNG_READ_SUPPORTED + #if PNG_ARM_NEON_OPT > 0 #ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */ /* WARNING: it is strongly recommended that you do not build libpng with diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c index a88674755..a2b5011f6 100644 --- a/arm/filter_neon_intrinsics.c +++ b/arm/filter_neon_intrinsics.c @@ -1,11 +1,11 @@ /* filter_neon_intrinsics.c - NEON optimised filter functions * - * Copyright (c) 2013 Glenn Randers-Pehrson + * Copyright (c) 2014 Glenn Randers-Pehrson * Written by James Yu <james.yu at linaro.org>, October 2013. * Based on filter_neon.S, written by Mans Rullgard, 2011. * - * Last changed in libpng 1.6.8 [December 19, 2013] + * Last changed in libpng 1.6.16 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -14,6 +14,8 @@ #include "../pngpriv.h" +#ifdef PNG_READ_SUPPORTED + /* This code requires -mfpu=neon on the command line: */ #if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */ @@ -35,7 +37,6 @@ #define png_ldr(type,pointer)\ (temp_pointer = png_ptr(type,pointer), *temp_pointer) -#ifdef PNG_READ_SUPPORTED #if PNG_ARM_NEON_OPT > 0 void @@ -368,5 +369,5 @@ png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row, } #endif /* PNG_ARM_NEON_OPT > 0 */ -#endif /* READ */ #endif /* PNG_ARM_NEON_IMPLEMENTATION == 1 (intrinsics) */ +#endif /* READ */ |