change compatibility define magick 6

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0c4a638df0d36f9aa53b8963e02184ce73ad2757..70b868244b9d853889d9e5b916f9dcce36c9c0be 100644 (file)
--- 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 8a6c70c92b109e208ef00354c40e893b3bdae426..23c4159edd008763921ffb44fbf7943a3ab27a25 100644 (file)
--- 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>