From 6af8845a8fe872940d38226ae4c3ba5cb43a9fe1 Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 12 Aug 2022 10:55:39 -0700 Subject: [PATCH] sharpyuv: prefer webp/types.h this provides better compatibility for older Visual Studio versions; stdint.h is a part of C99. this is consistent with the core libwebp library: 8fbb9188 prefer webp/types.h over stdint.h Change-Id: I777cad70d9a407646c4193db9ca0f09e65d88735 --- sharpyuv/Makefile.am | 1 + sharpyuv/sharpyuv_dsp.h | 3 +-- sharpyuv/sharpyuv_gamma.c | 1 - sharpyuv/sharpyuv_gamma.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sharpyuv/Makefile.am b/sharpyuv/Makefile.am index eda07187..ac5862b6 100644 --- a/sharpyuv/Makefile.am +++ b/sharpyuv/Makefile.am @@ -12,6 +12,7 @@ libsharpyuvinclude_HEADERS += sharpyuv.h libsharpyuvinclude_HEADERS += sharpyuv_csp.h noinst_HEADERS = noinst_HEADERS += ../src/dsp/cpu.h +noinst_HEADERS += ../src/webp/types.h libsharpyuv_sse2_la_SOURCES = libsharpyuv_sse2_la_SOURCES += sharpyuv_sse2.c diff --git a/sharpyuv/sharpyuv_dsp.h b/sharpyuv/sharpyuv_dsp.h index e561d8d3..c7755b97 100644 --- a/sharpyuv/sharpyuv_dsp.h +++ b/sharpyuv/sharpyuv_dsp.h @@ -12,9 +12,8 @@ #ifndef WEBP_SHARPYUV_SHARPYUV_DSP_H_ #define WEBP_SHARPYUV_SHARPYUV_DSP_H_ -#include - #include "src/dsp/cpu.h" +#include "src/webp/types.h" extern uint64_t (*SharpYuvUpdateY)(const uint16_t* src, const uint16_t* ref, uint16_t* dst, int len, int bit_depth); diff --git a/sharpyuv/sharpyuv_gamma.c b/sharpyuv/sharpyuv_gamma.c index 05b5436f..20ab2da6 100644 --- a/sharpyuv/sharpyuv_gamma.c +++ b/sharpyuv/sharpyuv_gamma.c @@ -13,7 +13,6 @@ #include #include -#include #include "src/webp/types.h" diff --git a/sharpyuv/sharpyuv_gamma.h b/sharpyuv/sharpyuv_gamma.h index 2f1a3ff4..d13aff59 100644 --- a/sharpyuv/sharpyuv_gamma.h +++ b/sharpyuv/sharpyuv_gamma.h @@ -12,7 +12,7 @@ #ifndef WEBP_SHARPYUV_SHARPYUV_GAMMA_H_ #define WEBP_SHARPYUV_SHARPYUV_GAMMA_H_ -#include +#include "src/webp/types.h" #ifdef __cplusplus extern "C" {