add support image magick version 7

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f321a92d62cd0a0b1fabb901620bd26685e9108c..c3dae2220da944478b7316e19a236f93d6df51d9 100644 (file)
--- 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 28a199ebe5c213f18c555bdc63e87d55580d3e23..4f67c41a4e7d52ce80e77770fe5f7577da7e402d 100644 (file)
--- a/src/kds_s2000w_image_converter.c
+++ b/src/kds_s2000w_image_converter.c
@@ -10,6 +10,9 @@
 #if IMAGE_MAGICK_MAJOR == 6
 #include <magick/MagickCore.h>
 #endif
+#if IMAGE_MAGICK_MAJOR == 7
+#include <MagickCore/MagickCore.h>
+#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);