From c55efc6366c9b655f1840698e408b210a18c0693 Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 14 Dec 2024 12:39:05 +0100 Subject: [PATCH] include image magick version 6 with define --- src/CMakeLists.txt | 2 ++ src/kds_s2000w_image_converter.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2a00f85..b6d56d0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,6 +33,8 @@ FIND_PACKAGE(JSON-C REQUIRED) MESSAGE(STATUS "find json-c: " ${JSON\-C_DIR}) FIND_PACKAGE(ImageMagick COMPONENTS MagickCore REQUIRED) MESSAGE(STATUS "find ImageMagick: " ${ImageMagick_LIBRARIES}) +STRING(SUBSTRING ${ImageMagick_VERSION_STRING} 0 1 ImageMagick_MAJOR_VERSION) +ADD_COMPILE_DEFINITIONS(IMAGE_MAGICK_MAJOR=${ImageMagick_MAJOR_VERSION}) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/" CACHE PATH "install prefix" FORCE) diff --git a/src/kds_s2000w_image_converter.c b/src/kds_s2000w_image_converter.c index ef36412..28a199e 100644 --- a/src/kds_s2000w_image_converter.c +++ b/src/kds_s2000w_image_converter.c @@ -1,9 +1,15 @@ #define MAGICKCORE_QUANTUM_DEPTH 16 #define MAGICKCORE_HDRI_ENABLE 0 +#ifndef IMAGE_MAGICK_MAJOR +#define IMAGE_MAGICK_MAJOR 6 +#endif + #include #include +#if IMAGE_MAGICK_MAJOR == 6 #include +#endif #include "kds_s2000w_image_converter.h" #ifndef NODEBUG -- 2.39.5