From 41f235f494400f507152fecf7bd948780eb0257a Mon Sep 17 00:00:00 2001 From: Bastian Dehn Date: Sat, 14 Dec 2024 13:53:55 +0100 Subject: [PATCH] add support image magick version 7 --- src/CMakeLists.txt | 4 ++++ src/kds_s2000w_image_converter.c | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f321a92..c3dae22 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,6 +37,10 @@ SET(IMAGE_MAGICK_MAJOR 6) MESSAGE(STATUS "define IMAGE_MAGICK_MAJOR: " ${IMAGE_MAGICK_MAJOR}) ADD_COMPILE_DEFINITIONS(IMAGE_MAGICK_MAJOR=${IMAGE_MAGICK_MAJOR}) +IF(${IMAGE_MAGICK_MAJOR} EQUAL 7) + LIST(APPEND ImageMagick_INCLUDE_DIRS "/usr/include/x86_64-linux-gnu/ImageMagick-7") +ENDIF() + IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/" CACHE PATH "install prefix" FORCE) ENDIF() diff --git a/src/kds_s2000w_image_converter.c b/src/kds_s2000w_image_converter.c index 28a199e..4f67c41 100644 --- a/src/kds_s2000w_image_converter.c +++ b/src/kds_s2000w_image_converter.c @@ -10,6 +10,9 @@ #if IMAGE_MAGICK_MAJOR == 6 #include #endif +#if IMAGE_MAGICK_MAJOR == 7 +#include +#endif #include "kds_s2000w_image_converter.h" #ifndef NODEBUG @@ -56,7 +59,12 @@ void kds_s2000w_convert_to_pnm_with_depth(blobdata* in, sprintf(image_info->filename, "streamout.pnm"); if (depth > -1) +#if IMAGE_MAGICK_MAJOR == 6 SetImageDepth(input_image, depth); +#endif +#if IMAGE_MAGICK_MAJOR == 7 + SetImageDepth(input_image, depth, exception); +#endif out->data = ImageToBlob(image_info, input_image, &out->size, exception); -- 2.39.5