rmagick 4.1.0.rc1 → 4.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69f33d36e9b52a201567b259ed15f90215a5dda6b20200d34c76f8f5bdd80cae
-  data.tar.gz: edcf0fe0e09360c982649b93df9e1bfc5cdcc916a4a9956a5dc30b2062d9302e
+  metadata.gz: a57b4160820f61c1c40c33c68be7a616e3698e4ca9bb94840d692fd41dd75a4a
+  data.tar.gz: e7e610cfd2040dd0727211c0a2106dafefab276f9196ac1f2d625b94186cd4c1
 SHA512:
-  metadata.gz: 797ec6b5726b0c16b7bbb271a1cd9c57b2610497e9b30a5130c42aad9821692d56f3e02cdc3739eb11983644118d00c809b386baa8bbc73b2ce0f41fcdffaa8c
-  data.tar.gz: f7fe1c5e8630f0c959bad67813c0fe7520a81857cf34686aa5018c01d486616173ffa0e3ce28dd37057dabe53ed35e05e3bdd7002d309f2814605733b17d7f1d
+  metadata.gz: a95a15f1caa2b4bf104b46cb94cb833e4b8fbc399f1b0ebffeca54e0dd2642979cb575dfee168beec0d4cc0786f5979ce623f94511257f4945551bc507b12403
+  data.tar.gz: 557a7bd78a710bf1c332fbac87cc9fc82143290b4d7fa9cebe8788d332cf82e66b200a3dc5fbba19a377458a1d6940db13cb9d030561802c40777a820087290c

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 4.1.0.rc2
+
+- fix a couple of compilation bugs (#796, #797)
+
 ## RMagick 4.1.0.rc1
 
 The ImageMagick 7 release is here! This adds beta support for ImageMagick 7.

data/ext/RMagick/rmimage.c

@@ -24,6 +24,10 @@
     if (result != (Image *)NULL) \
       SetPixelChannelMask(result, channel_mask);
 
+#ifndef magick_module
+    #define magick_module module
+#endif
+
 /** Method that effects an image */
 typedef Image *(effector_t)(const Image *, const double, const double, ExceptionInfo *);
 /** Method that flips an image */
@@ -3932,7 +3936,7 @@ composite_tiled(int bang, int argc, VALUE *argv, VALUE self)
         {
 #if defined(IMAGEMAGICK_7)
             BEGIN_CHANNEL_MASK(image, channels);
-            status = CompositeImage(image, comp_image, MagickTrue, operator, x, y, exception);
+            status = CompositeImage(image, comp_image, operator, MagickTrue, x, y, exception);
             END_CHANNEL_MASK(image);
             rm_check_exception(exception, image, bang ? RetainOnError: DestroyOnError);
 #else
@@ -10927,6 +10931,7 @@ Image_posterize(int argc, VALUE *argv, VALUE self)
     MagickBooleanType dither = MagickFalse;
     unsigned long levels = 4;
 #if defined(IMAGEMAGICK_7)
+    DitherMethod dither_method;
     ExceptionInfo *exception;
 #endif
 
@@ -10949,7 +10954,8 @@ Image_posterize(int argc, VALUE *argv, VALUE self)
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    (void) PosterizeImage(new_image, levels, dither, exception);
+    dither_method = dither ? RiemersmaDitherMethod : NoDitherMethod;
+    (void) PosterizeImage(new_image, levels, dither_method, exception);
     rm_check_exception(exception, new_image, DestroyOnError);
     (void) DestroyExceptionInfo(exception);
 #else
@@ -16113,7 +16119,7 @@ void add_format_prefix(Info *info, VALUE file)
         CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
 
-        if (magick_info && magick_info->module)
+        if (magick_info && magick_info->magick_module)
         {
             // We have to compare the module names because some formats have
             // more than one name. JPG and JPEG, for example.
@@ -16122,7 +16128,7 @@ void add_format_prefix(Info *info, VALUE file)
             CHECK_EXCEPTION();
             DestroyExceptionInfo(exception);
 
-            if (magick_info2->module && strcmp(magick_info->module, magick_info2->module) != 0)
+            if (magick_info2->magick_module && strcmp(magick_info->magick_module, magick_info2->magick_module) != 0)
             {
                 rb_raise(rb_eRuntimeError
                          , "filename prefix `%s' conflicts with output format `%s'"

data/lib/rmagick/version.rb

@@ -1,5 +1,5 @@
 module Magick
-  VERSION = '4.1.0.rc1'
+  VERSION = '4.1.0.rc2'
   MIN_RUBY_VERSION = '2.3.0'
   MIN_IM_VERSION = '6.7.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 4.1.0.rc1
+  version: 4.1.0.rc2
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler