diff options
| author | Cosmin Truta <ctruta@gmail.com> | 2018-09-04 00:53:38 -0400 |
|---|---|---|
| committer | Cosmin Truta <ctruta@gmail.com> | 2018-09-04 00:53:38 -0400 |
| commit | 1ceaa83a844cd3ecef25279d60720f910b96f297 (patch) | |
| tree | a06dfa144f1ca1e5917449d6385417b553e260ce | |
| parent | b66ed711315c46ef6c556c83c0074ecdcbd9937f (diff) | |
| download | libpng-1ceaa83a844cd3ecef25279d60720f910b96f297.tar.gz | |
Fix the build with MSVC ARM64
| -rw-r--r-- | arm/filter_neon_intrinsics.c | 4 | ||||
| -rw-r--r-- | arm/palette_neon_intrinsics.c | 8 | ||||
| -rw-r--r-- | pngrtran.c | 12 |
3 files changed, 17 insertions, 7 deletions
diff --git a/arm/filter_neon_intrinsics.c b/arm/filter_neon_intrinsics.c index 1cb5aa8af..75399f6e0 100644 --- a/arm/filter_neon_intrinsics.c +++ b/arm/filter_neon_intrinsics.c @@ -20,9 +20,9 @@ #if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */ #if defined(_MSC_VER) && defined(_M_ARM64) -#include <arm64_neon.h> +# include <arm64_neon.h> #else -#include <arm_neon.h> +# include <arm_neon.h> #endif /* libpng row pointers are not necessarily aligned to any particular boundary, diff --git a/arm/palette_neon_intrinsics.c b/arm/palette_neon_intrinsics.c index c01db1171..fa02d6a8b 100644 --- a/arm/palette_neon_intrinsics.c +++ b/arm/palette_neon_intrinsics.c @@ -1,5 +1,7 @@ + /* palette_neon_intrinsics.c - NEON optimised palette expansion functions * + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 2017-2018 Arm Holdings. All rights reserved. * Written by Richard Townsend <Richard.Townsend@arm.com>, February 2017. * @@ -12,7 +14,11 @@ #if PNG_ARM_NEON_IMPLEMENTATION == 1 -#include <arm_neon.h> +#if defined(_MSC_VER) && defined(_M_ARM64) +# include <arm64_neon.h> +#else +# include <arm_neon.h> +#endif /* Build an RGBA palette from the RGB and separate alpha palettes. */ void diff --git a/pngrtran.c b/pngrtran.c index 8b48f79ba..ccc58ce6f 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -19,10 +19,14 @@ #include "pngpriv.h" #ifdef PNG_ARM_NEON_IMPLEMENTATION -#if PNG_ARM_NEON_IMPLEMENTATION == 1 -#define PNG_ARM_NEON_INTRINSICS_AVAILABLE -#include <arm_neon.h> -#endif +# if PNG_ARM_NEON_IMPLEMENTATION == 1 +# define PNG_ARM_NEON_INTRINSICS_AVAILABLE +# if defined(_MSC_VER) && defined(_M_ARM64) +# include <arm64_neon.h> +# else +# include <arm_neon.h> +# endif +# endif #endif #ifdef PNG_READ_SUPPORTED |