From 8a9d79a493eb688961e605f4335694fb797aaa53 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 22 Jan 2023 16:22:23 +0100 Subject: [PATCH] STB headers may be in /usr/include on some distribs (alpine 3.17) --- cmake/modules/FindSTB.cmake | 2 +- src/libs/image/impl/stb/JPEGImage.cpp | 2 +- src/libs/image/impl/stb/RawImage.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindSTB.cmake b/cmake/modules/FindSTB.cmake index 10e8afdc..9da76b57 100644 --- a/cmake/modules/FindSTB.cmake +++ b/cmake/modules/FindSTB.cmake @@ -1,4 +1,4 @@ -find_path(STB_INCLUDE_DIR stb/stb_image.h) +find_path(STB_INCLUDE_DIR stb_image.h PATH_SUFFIXES stb) include(FindPackageHandleStandardArgs) diff --git a/src/libs/image/impl/stb/JPEGImage.cpp b/src/libs/image/impl/stb/JPEGImage.cpp index 4bfcef4c..280fcd6e 100644 --- a/src/libs/image/impl/stb/JPEGImage.cpp +++ b/src/libs/image/impl/stb/JPEGImage.cpp @@ -20,7 +20,7 @@ #include "JPEGImage.hpp" #define STB_IMAGE_WRITE_IMPLEMENTATION -#include +#include #include "image/Exception.hpp" #include "RawImage.hpp" diff --git a/src/libs/image/impl/stb/RawImage.cpp b/src/libs/image/impl/stb/RawImage.cpp index a68f36b9..ba7a80b9 100644 --- a/src/libs/image/impl/stb/RawImage.cpp +++ b/src/libs/image/impl/stb/RawImage.cpp @@ -25,8 +25,8 @@ #define STBIR_DEFAULT_FILTER_DOWNSAMPLE STBIR_FILTER_MITCHELL #define STBIR_DEFAULT_FILTER_UPSAMPLE STBIR_FILTER_CATMULLROM -#include -#include +#include +#include #include "JPEGImage.hpp"