From: Bastian Dehn <hhaalo@arcor.de>
Date: Fri, 24 Apr 2026 15:41:46 +0000 (+0200)
Subject: change compatibility define magick 6
X-Git-Tag: v1.1.28^2~1
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=5d8f94bee7ae9206acde8341a7b530017e9b377c;p=sane-kds-s2000w-net.git

change compatibility define magick 6
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c4a638..70b8682 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,7 @@ else()
 endif()
 
 if(ImageMagick_VERSION_STRING VERSION_LESS 7)
-	add_compile_definitions(IMAGEMAGICK6)
+	add_compile_definitions(IMAGEMAGICK_BEFORE_7)
 endif()
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
diff --git a/src/kds_s2000w_image_converter_magick.c b/src/kds_s2000w_image_converter_magick.c
index 8a6c70c..23c4159 100644
--- a/src/kds_s2000w_image_converter_magick.c
+++ b/src/kds_s2000w_image_converter_magick.c
@@ -1,7 +1,7 @@
 #define MAGICKCORE_QUANTUM_DEPTH 16
 #define MAGICKCORE_HDRI_ENABLE 0
 
-#ifdef IMAGEMAGICK6
+#ifdef IMAGEMAGICK_BEFORE_7
 	#include <magick/MagickCore.h>
 #else
 	#include <MagickCore/MagickCore.h>