cheng/libpng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the build with MSVC ARM64

Browse Source
This commit is contained in:
Cosmin Truta 2018-09-04 00:53:38 -04:00
parent b66ed71131
commit 1ceaa83a84
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arm/filter_neon_intrinsics.c
View File

@ -20,9 +20,9 @@
#if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */ #if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */
#if defined(_MSC_VER) && defined(_M_ARM64) #if defined(_MSC_VER) && defined(_M_ARM64)
#include <arm64_neon.h> # include <arm64_neon.h>
#else #else
#include <arm_neon.h> # include <arm_neon.h>
#endif #endif
/* libpng row pointers are not necessarily aligned to any particular boundary, /* libpng row pointers are not necessarily aligned to any particular boundary,

8
arm/palette_neon_intrinsics.c
View File

@ -1,5 +1,7 @@
/* palette_neon_intrinsics.c - NEON optimised palette expansion functions /* palette_neon_intrinsics.c - NEON optimised palette expansion functions
* *
* Copyright (c) 2018 Cosmin Truta
* Copyright (c) 2017-2018 Arm Holdings. All rights reserved. * Copyright (c) 2017-2018 Arm Holdings. All rights reserved.
* Written by Richard Townsend <Richard.Townsend@arm.com>, February 2017. * Written by Richard Townsend <Richard.Townsend@arm.com>, February 2017.
* *
@ -12,7 +14,11 @@
#if PNG_ARM_NEON_IMPLEMENTATION == 1 #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. */ /* Build an RGBA palette from the RGB and separate alpha palettes. */
void void

12
pngrtran.c
View File

@ -19,10 +19,14 @@
#include "pngpriv.h" #include "pngpriv.h"
#ifdef PNG_ARM_NEON_IMPLEMENTATION #ifdef PNG_ARM_NEON_IMPLEMENTATION
#if PNG_ARM_NEON_IMPLEMENTATION == 1 # if PNG_ARM_NEON_IMPLEMENTATION == 1
#define PNG_ARM_NEON_INTRINSICS_AVAILABLE # define PNG_ARM_NEON_INTRINSICS_AVAILABLE
#include <arm_neon.h> # if defined(_MSC_VER) && defined(_M_ARM64)
#endif # include <arm64_neon.h>
# else
# include <arm_neon.h>
# endif
# endif
#endif #endif
#ifdef PNG_READ_SUPPORTED #ifdef PNG_READ_SUPPORTED