From: Bastian Dehn <hhaalo@arcor.de>
Date: Sat, 14 Dec 2024 11:39:05 +0000 (+0100)
Subject: include image magick version 6 with define
X-Git-Tag: v1.0.7^2~7
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=c55efc6366c9b655f1840698e408b210a18c0693;p=sane-kds-s2000w-net.git

include image magick version 6 with define
---

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 <stdio.h>
 #include <string.h>
+#if IMAGE_MAGICK_MAJOR == 6
 #include <magick/MagickCore.h>
+#endif
 #include "kds_s2000w_image_converter.h"
 
 #ifndef NODEBUG