jpeg-utils: ImageMagick 7 adaptations

MagickWand comes with a couple of incompatible API changes in version 7.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/jpeg-utils.cpp b/src/jpeg-utils.cpp
index 32eb64f..2e214e4 100644
--- a/src/jpeg-utils.cpp
+++ b/src/jpeg-utils.cpp
@@ -15,6 +15,8 @@
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -22,7 +24,11 @@
 #include <exiv2/image.hpp>
 #include <exiv2/exif.hpp>
 
-#include <wand/MagickWand.h>
+#ifdef HAVE_IMAGEMAGICK_7
+#  include <MagickWand/MagickWand.h>
+#else
+#  include <wand/MagickWand.h>
+#endif
 
 #include <config.h>
 
@@ -618,7 +624,11 @@ resize_image (const gchar *src, const gchar *dst,
       if (thumbnail) {
         MagickThumbnailImage (magick_wand, size_x, size_y);
       } else {
+#ifdef HAVE_IMAGEMAGICK_7
+        MagickResizeImage (magick_wand, size_x, size_y, LanczosFilter);
+#else
         MagickResizeImage (magick_wand, size_x, size_y, LanczosFilter, 1.0);
+#endif
       }
     } else {
       /*  Perform resizing through ImageMagick commandline parser  */