rmagick 4.0.0 → 4.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee811873773369d58f0dc4111203635ef513ef4f71563e9c89b18370c11c4c15
-  data.tar.gz: 2b8c09fc168e2709803328a71d8465e4ea64f5b4ce01370021cd7ba63b4dbed8
+  metadata.gz: 69f33d36e9b52a201567b259ed15f90215a5dda6b20200d34c76f8f5bdd80cae
+  data.tar.gz: edcf0fe0e09360c982649b93df9e1bfc5cdcc916a4a9956a5dc30b2062d9302e
 SHA512:
-  metadata.gz: 304f95885436b898fb2dbb609123583c17fae2a1ae78442fa0e5f6c4673073aff0f445ab5b31e699db56a6e9631ce4109cd16dde93ef974bb4b216aadbbcbc7c
-  data.tar.gz: 9e5b5ab7b36cb5f26e3c878b01b3694ddaa10829dfca6049e314e961f8514a9f6495ce2f3ea6a6e78d78871b08c6a6171c0b77f72994547982cb5efb481b7a06
+  metadata.gz: 797ec6b5726b0c16b7bbb271a1cd9c57b2610497e9b30a5130c42aad9821692d56f3e02cdc3739eb11983644118d00c809b386baa8bbc73b2ce0f41fcdffaa8c
+  data.tar.gz: f7fe1c5e8630f0c959bad67813c0fe7520a81857cf34686aa5018c01d486616173ffa0e3ce28dd37057dabe53ed35e05e3bdd7002d309f2814605733b17d7f1d

data/.appveyor.yml

@@ -8,25 +8,37 @@ environment:
       PATCH_VERSION: 10
     - RUBY_VERSION: 23-x64
       IMAGEMAGICK_VERSION: 6.9.10
-      PATCH_VERSION: 49
+      PATCH_VERSION: 61
+    - RUBY_VERSION: 23-x64
+      IMAGEMAGICK_VERSION: 7.0.8
+      PATCH_VERSION: 61
     - RUBY_VERSION: 24-x64
       IMAGEMAGICK_VERSION: 6.8.9
       PATCH_VERSION: 10
     - RUBY_VERSION: 24-x64
       IMAGEMAGICK_VERSION: 6.9.10
-      PATCH_VERSION: 49
+      PATCH_VERSION: 61
+    - RUBY_VERSION: 24-x64
+      IMAGEMAGICK_VERSION: 7.0.8
+      PATCH_VERSION: 61
     - RUBY_VERSION: 25-x64
       IMAGEMAGICK_VERSION: 6.8.9
       PATCH_VERSION: 10
     - RUBY_VERSION: 25-x64
       IMAGEMAGICK_VERSION: 6.9.10
-      PATCH_VERSION: 49
+      PATCH_VERSION: 61
+    - RUBY_VERSION: 25-x64
+      IMAGEMAGICK_VERSION: 7.0.8
+      PATCH_VERSION: 61
     - RUBY_VERSION: 26-x64
       IMAGEMAGICK_VERSION: 6.8.9
       PATCH_VERSION: 10
     - RUBY_VERSION: 26-x64
       IMAGEMAGICK_VERSION: 6.9.10
-      PATCH_VERSION: 49
+      PATCH_VERSION: 61
+    - RUBY_VERSION: 24-x64
+      IMAGEMAGICK_VERSION: 7.0.8
+      PATCH_VERSION: 61
 
 install:
   - appveyor-retry appveyor DownloadFile https://ftp.icm.edu.pl/pub/graphics/ImageMagick/binaries/ImageMagick-%IMAGEMAGICK_VERSION%-%PATCH_VERSION%-Q16-x64-dll.exe

data/.circleci/config.yml

@@ -17,7 +17,7 @@ jobs:
       - run:
           name: setup linux
           command: |
-            IMAGEMAGICK_VERSION=6.9.10-49 bash before_install_linux.sh
+            IMAGEMAGICK_VERSION=6.9.10-61 bash before_install_linux.sh
 
       - run:
           name: install dependencies

data/.travis.yml

@@ -34,8 +34,10 @@ env:
   - IMAGEMAGICK_VERSION=6.7.7-10 CONFIGURE_OPTIONS=--enable-hdri
   - IMAGEMAGICK_VERSION=6.8.9-10
   - IMAGEMAGICK_VERSION=6.8.9-10 CONFIGURE_OPTIONS=--enable-hdri
-  - IMAGEMAGICK_VERSION=6.9.10-49
-  - IMAGEMAGICK_VERSION=6.9.10-49 CONFIGURE_OPTIONS=--enable-hdri
+  - IMAGEMAGICK_VERSION=6.9.10-61
+  - IMAGEMAGICK_VERSION=6.9.10-61 CONFIGURE_OPTIONS=--enable-hdri
+  - IMAGEMAGICK_VERSION=7.0.8-61
+  - IMAGEMAGICK_VERSION=7.0.8-61 CONFIGURE_OPTIONS=--disable-hdri
 
 before_install:
   - /bin/bash before_install_$TRAVIS_OS_NAME.sh

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 4.1.0.rc1
+
+The ImageMagick 7 release is here! This adds beta support for ImageMagick 7.
+Much thanks to **@Watson1978** for getting the ball rolling on this and to
+**@dlemstra** for the extraordinary amount of work and patience that went into
+seeing it through. RMagick should currently behave the same way under IM7 as it
+did under IM6, so please open an issue if you find anything that seems out of
+the ordinary.
+
 ## RMagick 4.0.0
 
 This release removes a *lot* of deprecated functionality, so first upgrade to

data/README.textile

@@ -187,7 +187,7 @@ h4. 3) install ImageMagick and additional environment stuff
 <pre>
 cd /vagrant/rmagick
 export IMAGEMAGICK_VERSION=6.8.9-10
-sh ./before_install_linux.sh
+bash ./before_install_linux.sh
 </pre>
 
 This will take just a few minutes to build ImageMagick

data/before_install_linux.sh

@@ -40,7 +40,11 @@ build_imagemagick() {
   mkdir -p build-ImageMagick
 
   version=(${IMAGEMAGICK_VERSION//./ })
-  if (( "${version[0]}${version[1]}" >= 69 )); then
+  if (( "${version[0]}" >= 7 )); then
+    wget https://github.com/ImageMagick/ImageMagick/archive/${IMAGEMAGICK_VERSION}.tar.gz
+    tar -xf ${IMAGEMAGICK_VERSION}.tar.gz
+    mv ImageMagick-${IMAGEMAGICK_VERSION} $build_dir
+  elif (( "${version[0]}${version[1]}" >= 69 )); then
     wget https://github.com/ImageMagick/ImageMagick6/archive/${IMAGEMAGICK_VERSION}.tar.gz
     tar -xf ${IMAGEMAGICK_VERSION}.tar.gz
     rm ${IMAGEMAGICK_VERSION}.tar.gz

data/ext/RMagick/extconf.rb

@@ -51,7 +51,9 @@ module RMagick
     def configure_headers
       @headers = %w[assert.h ctype.h stdio.h stdlib.h math.h time.h sys/types.h]
 
-      if have_header('magick/MagickCore.h')
+      if have_header('MagickCore/MagickCore.h')
+        headers << 'MagickCore/MagickCore.h'
+      elsif have_header('magick/MagickCore.h')
         headers << 'magick/MagickCore.h'
       else
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find magick/MagickCore.h."
@@ -92,7 +94,7 @@ module RMagick
 
       elsif RUBY_PLATFORM =~ /mingw/ # mingw
 
-        `identify -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
+        `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
         abort 'Unable to get ImageMagick version' unless Regexp.last_match(1)
         $magick_version = Regexp.last_match(1)
 
@@ -100,11 +102,11 @@ module RMagick
         $CPPFLAGS = %(-I"#{dir_paths[:include]}")
         $LDFLAGS = %(-L"#{dir_paths[:lib]}")
 
-        have_library('CORE_RL_magick_')
+        have_library(im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_' : 'CORE_RL_magick_')
 
       else # mswin
 
-        `identify -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
+        `#{magick_command} -version` =~ /Version: ImageMagick (\d+\.\d+\.\d+)-+\d+ /
         abort 'Unable to get ImageMagick version' unless Regexp.last_match(1)
         $magick_version = Regexp.last_match(1)
 
@@ -112,7 +114,7 @@ module RMagick
         $CPPFLAGS << %( -I"#{dir_paths[:include]}")
         $LDFLAGS << %( -libpath:"#{dir_paths[:lib]}")
 
-        $LOCAL_LIBS = 'CORE_RL_magick_.lib'
+        $LOCAL_LIBS = im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib'
 
       end
 
@@ -165,7 +167,7 @@ SRC
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find pkg-config in #{ENV['PATH']}\n"
       end
 
-      packages = `pkg-config --list-all`.scan(/(ImageMagick\-6[\.A-Z0-9]+) .*/).flatten
+      packages = `pkg-config --list-all`.scan(/(ImageMagick\-[\.A-Z0-9]+) .*/).flatten
 
       # For ancient version of ImageMagick 6 we need a different regex
       if packages.empty?
@@ -176,6 +178,23 @@ SRC
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find ImageMagick with pkg-config\n"
       end
 
+      if packages.length > 1
+
+        im7_packages = packages.grep(/\AImageMagick-7/)
+
+        if im7_packages.any?
+          checking_for('forced use of ImageMagick 6') do
+            if ENV['USE_IMAGEMAGICK_6']
+              packages -= im7_packages
+              true
+            else
+              packages = im7_packages
+              false
+            end
+          end
+        end
+      end
+
       if packages.length > 1
         package_lines = packages.map { |package| " - #{package}" }.join("\n")
         msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n#{package_lines}\n\n"
@@ -259,7 +278,7 @@ SRC
       paths = ENV['PATH'].split(File::PATH_SEPARATOR)
       paths.each do |dir|
         lib = File.join(dir, 'lib')
-        lib_file = File.join(lib, 'CORE_RL_magick_.lib')
+        lib_file = File.join(lib, im_version_at_least?('7.0.0') ? 'CORE_RL_MagickCore_.lib' : 'CORE_RL_magick_.lib')
         next unless File.exist?(lib_file)
 
         dir_paths[:include] = File.join(dir, 'include')
@@ -316,12 +335,9 @@ END_MINGW
       $defs.push("-DRUBY_VERSION_STRING=\"ruby #{RUBY_VERSION}\"")
       $defs.push("-DRMAGICK_VERSION_STRING=\"RMagick #{RMAGICK_VERS}\"")
 
-      if Gem::Version.new($magick_version) >= Gem::Version.new('6.8.9')
-        $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9=1')
-      end
-      if Gem::Version.new($magick_version) >= Gem::Version.new('6.9.0')
-        $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_9_0=1')
-      end
+      $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9=1') if im_version_at_least?('6.8.9')
+      $defs.push('-DIMAGEMAGICK_GREATER_THAN_EQUAL_6_9_0=1') if im_version_at_least?('6.9.0')
+      $defs.push('-DIMAGEMAGICK_7=1') if im_version_at_least?('7.0.0')
 
       create_header
     end
@@ -339,6 +355,14 @@ END_MINGW
       print_summary
     end
 
+    def magick_command
+      @magick_command ||= find_executable('magick') ? 'magick' : 'identify'
+    end
+
+    def im_version_at_least?(version)
+      Gem::Version.new($magick_version) >= Gem::Version.new(version)
+    end
+
     def print_summary
       summary = <<"END_SUMMARY"
 

data/ext/RMagick/rmagick.h

@@ -34,16 +34,20 @@
 #undef PACKAGE_TARNAME
 #undef WORDS_BIGENDIAN
 
-#include "magick/MagickCore.h"
-#include "magick/magick-config.h"
+#include "extconf.h"
+
+#if defined(IMAGEMAGICK_7)
+    #include "MagickCore/MagickCore.h"
+    #include "MagickCore/magick-config.h"
+#else
+    #include "magick/MagickCore.h"
+    #include "magick/magick-config.h"
+#endif
 
 // Undef ImageMagick's versions of these symbols
 #undef PACKAGE_STRING
 
 
-#include "extconf.h"
-
-
 //! For quoting preprocessor symbols
 #define Q2(q) #q
 //! For quoting preprocessor symbols
@@ -114,17 +118,33 @@
 
 #define MagickLibSubversion MagickLibAddendum
 
-
 typedef ImageInfo Info; /**< Make type name match class name */
-typedef PixelPacket Pixel; /**< Make type name match class name */
-typedef MagickPixelPacket MagickPixel;
-typedef PixelPacket PixelColor;
-typedef AlphaChannelType AlphaChannelOption;
-typedef DistortImageMethod DistortMethod;
-typedef FilterTypes FilterType;
-typedef InterpolatePixelMethod PixelInterpolateMethod;
-typedef ImageLayerMethod LayerMethod;
-#define TransparentAlpha 0
+#if defined(IMAGEMAGICK_7)
+    typedef struct _QuantumPixelPacket
+    {
+    Quantum
+        red,
+        green,
+        blue,
+        alpha,
+        black;
+    } QuantumPixelPacket;
+
+    typedef QuantumPixelPacket Pixel;
+    typedef PixelInfo MagickPixel;
+    typedef PixelInfo PixelColor;
+#else
+    typedef PixelPacket Pixel;
+    typedef MagickPixelPacket MagickPixel;
+    typedef PixelPacket PixelColor;
+    typedef AlphaChannelType AlphaChannelOption;
+    typedef DistortImageMethod DistortMethod;
+    typedef FilterTypes FilterType;
+    typedef InterpolatePixelMethod PixelInterpolateMethod;
+    typedef ImageLayerMethod LayerMethod;
+    #define TransparentAlpha 0
+    #define IMAGEMAGICK_6 1
+#endif
 
 //! Montage
 typedef struct
@@ -1161,7 +1181,6 @@ typedef enum
     DestroyExceptionRetention
 } ExceptionRetention;
 
-extern void   rm_check_image_exception(Image *, ErrorRetention);
 extern void   rm_check_exception(ExceptionInfo *, Image *, ErrorRetention);
 extern void   rm_ensure_result(Image *);
 extern Image *rm_clone_image(Image *);
@@ -1174,5 +1193,9 @@ extern void   rm_error_handler(const ExceptionType, const char *, const char *);
 extern void   rm_warning_handler(const ExceptionType, const char *, const char *);
 extern MagickBooleanType rm_should_raise_exception(ExceptionInfo *, const ExceptionRetention);
 extern void   rm_raise_exception(ExceptionInfo *);
+#if defined(IMAGEMAGICK_6)
+extern void   rm_check_image_exception(Image *, ErrorRetention);
+#endif
+
 #endif
 

data/ext/RMagick/rmdraw.c

@@ -18,7 +18,11 @@ static void destroy_Draw(void *);
 static VALUE new_DrawOptions(void);
 
 /** Method that gets type metrics */
-typedef MagickBooleanType (get_type_metrics_func_t)(Image *, const DrawInfo *, TypeMetric *);
+#if defined(IMAGEMAGICK_7)
+    typedef MagickBooleanType (get_type_metrics_func_t)(Image *, const DrawInfo *, TypeMetric *, ExceptionInfo *);
+#else
+    typedef MagickBooleanType (get_type_metrics_func_t)(Image *, const DrawInfo *, TypeMetric *);
+#endif
 static VALUE get_type_metrics(int, VALUE *, VALUE, get_type_metrics_func_t);
 
 
@@ -608,7 +612,11 @@ Draw_marshal_dump(VALUE self)
     // rb_hash_aset(ddraw, CSTR2SYM("clip_mask"), MAGICK_STRING_TO_OBJ(draw->info->clip_mask)); internal
     // rb_hash_aset(ddraw, CSTR2SYM("bounds"), Import_SegmentInfo(&draw->info->bounds)); internal
     rb_hash_aset(ddraw, CSTR2SYM("clip_units"), INT2FIX(draw->info->clip_units));
+#if defined(IMAGEMAGICK_7)
+    rb_hash_aset(ddraw, CSTR2SYM("alpha"), QUANTUM2NUM(draw->info->alpha));
+#else
     rb_hash_aset(ddraw, CSTR2SYM("opacity"), QUANTUM2NUM(draw->info->opacity));
+#endif
     // rb_hash_aset(ddraw, CSTR2SYM("render"), draw->info->render ? Qtrue : Qfalse); internal
     // rb_hash_aset(ddraw, CSTR2SYM("element_reference"), Qnil);     // not used yet
     // rb_hash_aset(ddraw, CSTR2SYM("debug"), draw->info->debug ? Qtrue : Qfalse);
@@ -681,7 +689,11 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     Color_to_PixelColor(&draw->info->undercolor, val);
 
     draw->info->clip_units = FIX2INT(rb_hash_aref(ddraw, CSTR2SYM("clip_units")));
+#if defined(IMAGEMAGICK_7)
+    draw->info->alpha = NUM2QUANTUM(rb_hash_aref(ddraw, CSTR2SYM("alpha")));
+#else
     draw->info->opacity = NUM2QUANTUM(rb_hash_aref(ddraw, CSTR2SYM("opacity")));
+#endif
     draw->info->kerning = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("kerning")));
     draw->info->interword_spacing = NUM2DBL(rb_hash_aref(ddraw, CSTR2SYM("interword_spacing")));
 
@@ -946,6 +958,9 @@ VALUE Draw_annotate(
     long x, y;
     AffineMatrix keep;
     char geometry_str[100];
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     // Save the affine matrix in case it is modified by
     // Draw#rotation=
@@ -963,9 +978,25 @@ VALUE Draw_annotate(
     }
 
     // Translate & store in Draw structure
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    draw->info->text = InterpretImageProperties(NULL, image, StringValuePtr(text), exception);
+    if (rm_should_raise_exception(exception, RetainExceptionRetention))
+    {
+        if (draw->info->text)
+        {
+            magick_free(draw->info->text);
+        }
+        rm_raise_exception(exception);
+    }
+#else
     draw->info->text = InterpretImageProperties(NULL, image, StringValuePtr(text));
+#endif
     if (!draw->info->text)
     {
+#if defined(IMAGEMAGICK_7)
+        (void) DestroyExceptionInfo(exception);
+#endif
         rb_raise(rb_eArgError, "no text");
     }
 
@@ -989,13 +1020,22 @@ VALUE Draw_annotate(
 
     magick_clone_string(&draw->info->geometry, geometry_str);
 
+#if defined(IMAGEMAGICK_7)
+    (void) AnnotateImage(image, draw->info, exception);
+#else
     (void) AnnotateImage(image, draw->info);
+#endif
 
     magick_free(draw->info->text);
     draw->info->text = NULL;
     draw->info->affine = keep;
 
+#if defined(IMAGEMAGICK_7)
+    CHECK_EXCEPTION()
+    (void) DestroyExceptionInfo(exception);
+#else
     rm_check_image_exception(image, RetainOnError);
+#endif
 
     return self;
 }
@@ -1127,6 +1167,9 @@ Draw_draw(VALUE self, VALUE image_arg)
 {
     Draw *draw;
     Image *image;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     image_arg = rm_cur_image(image_arg);
     image = rm_check_frozen(image_arg);
@@ -1140,12 +1183,23 @@ Draw_draw(VALUE self, VALUE image_arg)
     // Point the DrawInfo structure at the current set of primitives.
     magick_clone_string(&(draw->info->primitive), StringValuePtr(draw->primitives));
 
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    (void) DrawImage(image, draw->info, exception);
+#else
     (void) DrawImage(image, draw->info);
-    rm_check_image_exception(image, RetainOnError);
+#endif
 
     magick_free(draw->info->primitive);
     draw->info->primitive = NULL;
 
+#if defined(IMAGEMAGICK_7)
+    CHECK_EXCEPTION()
+    (void) DestroyExceptionInfo(exception);
+#else
+    rm_check_image_exception(image, RetainOnError);
+#endif
+
     return self;
 }
 
@@ -1708,6 +1762,9 @@ get_type_metrics(
     char *text = NULL;
     long text_l;
     unsigned int okay;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     switch (argc)
     {
@@ -1731,25 +1788,53 @@ get_type_metrics(
     }
 
     Data_Get_Struct(self, Draw, draw);
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    draw->info->text = InterpretImageProperties(NULL, image, text, exception);
+    if (rm_should_raise_exception(exception, RetainExceptionRetention))
+    {
+        if (draw->info->text)
+        {
+            magick_free(draw->info->text);
+        }
+        rm_raise_exception(exception);
+    }
+#else
     draw->info->text = InterpretImageProperties(NULL, image, text);
+#endif
     if (!draw->info->text)
     {
+#if defined(IMAGEMAGICK_7)
+        (void) DestroyExceptionInfo(exception);
+#endif
         rb_raise(rb_eArgError, "no text to measure");
     }
 
+#if defined(IMAGEMAGICK_7)
+    okay = (*getter)(image, draw->info, &metrics, exception);
+#else
     okay = (*getter)(image, draw->info, &metrics);
+#endif
 
     magick_free(draw->info->text);
     draw->info->text = NULL;
 
     if (!okay)
     {
+#if defined(IMAGEMAGICK_7)
+        CHECK_EXCEPTION()
+        (void) DestroyExceptionInfo(exception);
+#else
         rm_check_image_exception(image, RetainOnError);
+#endif
 
         // Shouldn't get here...
         rb_raise(rb_eRuntimeError, "Can't measure text. Are the fonts installed? "
                  "Is the FreeType library installed?");
     }
+#if defined(IMAGEMAGICK_7)
+    (void) DestroyExceptionInfo(exception);
+#endif
 
     RB_GC_GUARD(t);