rmagick 5.5.0 → 6.0.1

data/ext/RMagick/rmimage.cpp

@@ -288,17 +288,11 @@ DEFINE_GVL_STUB2(WriteImage, const ImageInfo *, Image *);
 DEFINE_GVL_STUB4(GetImageChannelEntropy, const Image *, const ChannelType, double *, ExceptionInfo *);
 #endif
 
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
 DEFINE_GVL_STUB3(RotationalBlurImage, const Image *, const double, ExceptionInfo *);
-#else
-DEFINE_GVL_STUB3(RadialBlurImage, const Image *, const double, ExceptionInfo *);
-#endif
 
 #if defined(IMAGEMAGICK_7)
-#elif defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
-DEFINE_GVL_STUB4(RotationalBlurImageChannel, const Image *, const ChannelType, const double, ExceptionInfo *);
 #else
-DEFINE_GVL_STUB4(RadialBlurImageChannel, const Image *, const ChannelType, const double, ExceptionInfo *);
+DEFINE_GVL_STUB4(RotationalBlurImageChannel, const Image *, const ChannelType, const double, ExceptionInfo *);
 #endif
 
 /**
@@ -2327,6 +2321,7 @@ Image_capture(int argc, VALUE *argv, VALUE self ATTRIBUTE_UNUSED)
     rm_ensure_result(new_image);
 
     rm_set_user_artifact(new_image, image_info);
+    rm_sync_image_options(new_image, image_info);
 
     RB_GC_GUARD(info_obj);
 
@@ -7307,6 +7302,7 @@ Image_from_blob(VALUE klass ATTRIBUTE_UNUSED, VALUE blob_arg)
 
     rm_ensure_result(images);
     rm_set_user_artifact(images, info);
+    rm_sync_image_options(images, info);
 
     RB_GC_GUARD(info_obj);
 
@@ -7963,26 +7959,7 @@ Image_gray_q(VALUE self)
 #if defined(HAVE_SETIMAGEGRAY)
     return has_attribute(self, (MagickBooleanType (*)(const Image *, ExceptionInfo *))SetImageGray);
 #else
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
     return has_attribute(self, IsGrayImage);
-#else
-    // For ImageMagick 6.7
-    Image *image;
-    ColorspaceType colorspace;
-    VALUE ret;
-
-    image = rm_check_destroyed(self);
-    colorspace = image->colorspace;
-    if (image->colorspace == sRGBColorspace || image->colorspace == TransparentColorspace) {
-        // Workaround
-        //   If image colorspace has non-RGBColorspace, IsGrayImage() always return false.
-        image->colorspace = RGBColorspace;
-    }
-
-    ret = has_attribute(self, IsGrayImage);
-    image->colorspace = colorspace;
-    return ret;
-#endif
 #endif
 }
 
@@ -9931,6 +9908,8 @@ Image_initialize(int argc, VALUE *argv, VALUE self)
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(SetImageExtent), &args);
 #endif
 
+    rm_sync_image_options(image, info);
+
     // If the caller did not supply a fill argument, call SetImageBackgroundColor
     // to fill the image using the background color. The background color can
     // be set by specifying it when creating the Info parm block.
@@ -10671,11 +10650,11 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
         DestroyExceptionInfo(exception);
 
 #if defined(IMAGEMAGICK_7)
-        old_color.red   = GetPixelRed(image, old_pixel);
-        old_color.green = GetPixelGreen(image, old_pixel);
-        old_color.blue  = GetPixelBlue(image, old_pixel);
-        old_color.alpha = GetPixelAlpha(image, old_pixel);
-        old_color.black = GetPixelBlack(image, old_pixel);
+        old_color.red   = GetPixelRed(image, old_pixel) + 0.5;
+        old_color.green = GetPixelGreen(image, old_pixel) + 0.5;
+        old_color.blue  = GetPixelBlue(image, old_pixel) + 0.5;
+        old_color.alpha = GetPixelAlpha(image, old_pixel) + 0.5;
+        old_color.black = GetPixelBlack(image, old_pixel) + 0.5;
         return Pixel_from_PixelPacket(&old_color);
 #else
         old_color = *old_pixel;
@@ -10750,11 +10729,11 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
     if (pixel)
     {
 #if defined(IMAGEMAGICK_7)
-        old_color.red   = GetPixelRed(image, pixel);
-        old_color.green = GetPixelGreen(image, pixel);
-        old_color.blue  = GetPixelBlue(image, pixel);
-        old_color.alpha = GetPixelAlpha(image, pixel);
-        old_color.black = GetPixelBlack(image, pixel);
+        old_color.red   = GetPixelRed(image, pixel) + 0.5;
+        old_color.green = GetPixelGreen(image, pixel) + 0.5;
+        old_color.blue  = GetPixelBlue(image, pixel) + 0.5;
+        old_color.alpha = GetPixelAlpha(image, pixel) + 0.5;
+        old_color.black = GetPixelBlack(image, pixel) + 0.5;
 
         SetPixelRed(image,   new_color.red,   pixel);
         SetPixelGreen(image, new_color.green, pixel);
@@ -11185,11 +11164,9 @@ Image_quantum_operator(int argc, VALUE *argv, VALUE self)
         case SumQuantumOperator:
             qop = SumEvaluateOperator;
             break;
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         case RootMeanSquareQuantumOperator:
             qop = RootMeanSquareEvaluateOperator;
             break;
-#endif
     }
 
     exception = AcquireExceptionInfo();
@@ -11307,15 +11284,9 @@ Image_radial_blur(VALUE self, VALUE angle_obj)
     image = rm_check_destroyed(self);
     exception = AcquireExceptionInfo();
 
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
     GVL_STRUCT_TYPE(RotationalBlurImage) args = { image, angle, exception };
     void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RotationalBlurImage), &args);
     new_image = reinterpret_cast<decltype(new_image)>(ret);
-#else
-    GVL_STRUCT_TYPE(RadialBlurImage) args = { image, angle, exception };
-    void *ret = CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RadialBlurImage), &args);
-    new_image = reinterpret_cast<decltype(new_image)>(ret);
-#endif
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
 
@@ -11366,12 +11337,9 @@ Image_radial_blur_channel(int argc, VALUE *argv, VALUE self)
     new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RotationalBlurImage), &args);
     CHANGE_RESULT_CHANNEL_MASK(new_image);
     END_CHANNEL_MASK(image);
-#elif defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
+#else
     GVL_STRUCT_TYPE(RotationalBlurImageChannel) args = { image, channels, angle, exception };
     new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RotationalBlurImageChannel), &args);
-#else
-    GVL_STRUCT_TYPE(RadialBlurImageChannel) args = { image, channels, angle, exception };
-    new_image = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(RadialBlurImageChannel), &args);
 #endif
     rm_check_exception(exception, new_image, DestroyOnError);
     DestroyExceptionInfo(exception);
@@ -11630,9 +11598,11 @@ rd_image(VALUE klass ATTRIBUTE_UNUSED, VALUE file, gvl_function_t fp)
 #endif
 
     rm_check_exception(exception, images, DestroyOnError);
-    rm_set_user_artifact(images, info);
     DestroyExceptionInfo(exception);
 
+    rm_set_user_artifact(images, info);
+    rm_sync_image_options(images, info);
+
     RB_GC_GUARD(info_obj);
 
     return array_from_images(images);
@@ -11774,9 +11744,10 @@ Image_read_inline(VALUE self ATTRIBUTE_UNUSED, VALUE content)
     magick_free((void *)blob);
 
     rm_check_exception(exception, images, DestroyOnError);
-
     DestroyExceptionInfo(exception);
+
     rm_set_user_artifact(images, info);
+    rm_sync_image_options(images, info);
 
     RB_GC_GUARD(info_obj);
 

data/ext/RMagick/rmmain.cpp

@@ -14,7 +14,7 @@
 #define MAIN                        // Define external variables
 #include "rmagick.h"
 
-#if defined(HAVE_SETMAGICKALIGNEDMEMORYMETHODS) && defined(HAVE_RB_GC_ADJUST_MEMORY_USAGE)
+#if defined(HAVE_SETMAGICKALIGNEDMEMORYMETHODS)
     #if defined(HAVE_POSIX_MEMALIGN) || defined(HAVE__ALIGNED_MSIZE)
         #define USE_RM_ALIGNED_MALLOC 1
 
@@ -1019,10 +1019,8 @@ Init_RMagick2(void)
         ENUMERATOR(ShapeAlphaChannel)
         ENUMERATOR(TransparentAlphaChannel)
         ENUMERATOR(BackgroundAlphaChannel)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         ENUMERATOR(AssociateAlphaChannel)
         ENUMERATOR(DisassociateAlphaChannel)
-#endif
 #if defined(IMAGEMAGICK_7)
         ENUMERATOR(OnAlphaChannel)
         ENUMERATOR(OffAlphaChannel)
@@ -1052,7 +1050,12 @@ Init_RMagick2(void)
         ENUMERATOR(BlackChannel)
         ENUMERATOR(IndexChannel)
         ENUMERATOR(GrayChannel)
+        ENUMERATOR(CompositeChannels)
         ENUMERATOR(AllChannels)
+        ENUMERATOR(TrueAlphaChannel)
+        ENUMERATOR(RGBChannels)
+        ENUMERATOR(GrayChannels)
+        ENUMERATOR(SyncChannels)
         ENUMERATORV(AlphaChannel, OpacityChannel)
         ENUMERATORV(DefaultChannels, 0xff & ~OpacityChannel)
         ENUMERATORV(HueChannel, RedChannel)
@@ -1090,7 +1093,6 @@ Init_RMagick2(void)
         ENUMERATOR(Rec709YCbCrColorspace)
         ENUMERATOR(LogColorspace)
         ENUMERATOR(CMYColorspace)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         ENUMERATOR(LuvColorspace)
         ENUMERATOR(HCLColorspace)
         ENUMERATOR(LCHColorspace)
@@ -1103,7 +1105,6 @@ Init_RMagick2(void)
         ENUMERATOR(HCLpColorspace)
         ENUMERATOR(YDbDrColorspace)
         ENUMERATORV(XyYColorspace, xyYColorspace)
-#endif
 #if defined(IMAGEMAGICK_7)
 #if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_0_8)
         ENUMERATOR(LinearGRAYColorspace)
@@ -1196,9 +1197,7 @@ Init_RMagick2(void)
         ENUMERATOR(UndefinedCompositeOp)
         ENUMERATOR(VividLightCompositeOp)
         ENUMERATOR(XorCompositeOp)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         ENUMERATOR(HardMixCompositeOp)
-#endif
 #if defined(IMAGEMAGICK_7)
         ENUMERATOR(CopyAlphaCompositeOp)
 #else
@@ -1242,6 +1241,7 @@ Init_RMagick2(void)
 
     // DisposeType constants
     DEF_ENUM(DisposeType)
+        ENUMERATOR(UnrecognizedDispose)
         ENUMERATOR(UndefinedDispose)
         ENUMERATOR(BackgroundDispose)
         ENUMERATOR(NoneDispose)
@@ -1318,9 +1318,7 @@ Init_RMagick2(void)
         ENUMERATOR(RobidouxSharpFilter)
         ENUMERATOR(CosineFilter)
         ENUMERATOR(SplineFilter)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         ENUMERATOR(LanczosRadiusFilter)
-#endif
         ENUMERATORV(WelchFilter, WelshFilter)
         ENUMERATORV(HannFilter, HanningFilter)
     END_ENUM
@@ -1412,9 +1410,7 @@ Init_RMagick2(void)
         ENUMERATOR(RootMeanSquaredErrorMetric)
         ENUMERATOR(NormalizedCrossCorrelationErrorMetric)
         ENUMERATOR(FuzzErrorMetric)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         ENUMERATOR(PerceptualHashErrorMetric)
-#endif
 #if defined(IMAGEMAGICK_7)
         ENUMERATOR(UndefinedErrorMetric)
         ENUMERATOR(MeanErrorPerPixelErrorMetric)
@@ -1546,9 +1542,7 @@ Init_RMagick2(void)
         ENUMERATOR(ExponentialQuantumOperator)
         ENUMERATOR(MedianQuantumOperator)
         ENUMERATOR(SumQuantumOperator)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         ENUMERATOR(RootMeanSquareQuantumOperator)
-#endif
     END_ENUM
 
     // RenderingIntent
@@ -1673,9 +1667,7 @@ Init_RMagick2(void)
         ENUMERATOR(CorrelateNormalizeValue)
         ENUMERATOR(AreaValue)
         ENUMERATOR(DecimalValue)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
         ENUMERATOR(SeparatorValue)
-#endif
         ENUMERATOR(AllValues)
     END_ENUM
 
@@ -1744,9 +1736,7 @@ Init_RMagick2(void)
       ENUMERATOR(OctagonalKernel)
       ENUMERATOR(EuclideanKernel)
       ENUMERATOR(UserDefinedKernel)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
       ENUMERATOR(BinomialKernel)
-#endif
     END_ENUM
 
     /*-----------------------------------------------------------------------*/
@@ -1822,25 +1812,20 @@ Init_RMagick2(void)
  * were compiled with.
  *
  * No Ruby usage (internal function)
- *
- * Notes:
- *   - Bypass the test by defining the constant RMAGICK_BYPASS_VERSION_TEST to
- *     'true' at the top level, before requiring 'rmagick'
  */
 static void
 test_Magick_version(void)
 {
     size_t version_number;
     const char *version_str;
-    ID bypass = rb_intern("RMAGICK_BYPASS_VERSION_TEST");
 
-    if (RTEST(rb_const_defined(rb_cObject, bypass)) && RTEST(rb_const_get(rb_cObject, bypass)))
-    {
-        return;
-    }
+    /* ImageMagick versions are defined as major, minor and patch, each of which are defined as a value in 1 byte. */
+    /* ImageMagick 6.9.12 has `#define MagickLibVersion  0x69C` */
+    /* It use only major and minor versions. */
+    size_t mask_major_minor_version = 0xFFFFFFF0;
 
     version_str = GetMagickVersion(&version_number);
-    if (version_number != MagickLibVersion)
+    if ((version_number & mask_major_minor_version) != (MagickLibVersion & mask_major_minor_version))
     {
         int n, x;
 

data/ext/RMagick/rmpixel.cpp

@@ -1191,7 +1191,7 @@ rm_set_magick_pixel_packet(Pixel *pixel, MagickPixel *pp)
 /**
  * Return the color name corresponding to the pixel values.
  *
- * @overload to_color(compliance = Magick::AllCompliance, alpha = false, depth = Magick::MAGICKCORE_QUANTUM_DEPTH, hex = false)
+ * @overload to_color(compliance = Magick::AllCompliance, alpha = false, depth = Magick::MAGICKCORE_QUANTUM_DEPTH, hex = true)
  *   @param compliance [Magick::ComplianceType] A ComplianceType constant
  *   @param alpha [Boolean] If false, the pixel's alpha attribute is ignored
  *   @param depth [Numeric] An image depth
@@ -1205,7 +1205,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     Image *image;
     Pixel *pixel;
     MagickPixel mpp;
-    MagickBooleanType hex = MagickFalse;
+    MagickBooleanType hex = MagickTrue;
     char name[MaxTextExtent];
     ExceptionInfo *exception;
     ComplianceType compliance = AllCompliance;

data/ext/RMagick/rmutil.cpp

@@ -21,6 +21,11 @@
 static VALUE rescue_not_str(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
 
+#if defined(IMAGEMAGICK_7)
+DEFINE_GVL_STUB3(TransformImageColorspace, Image *, const ColorspaceType, ExceptionInfo *);
+#else
+DEFINE_GVL_STUB2(TransformImageColorspace, Image *, const ColorspaceType);
+#endif
 
 DEFINE_GVL_STUB5(CloneImage, const Image *, const size_t, const size_t, const MagickBooleanType, ExceptionInfo *);
 
@@ -367,7 +372,6 @@ double
 rm_percentage2(VALUE arg, double max, bool only_positive)
 {
     double pct;
-    char *end;
 
     if (!rm_check_num2dbl(arg))
     {
@@ -590,23 +594,27 @@ rm_cur_image(VALUE img)
 VALUE
 rm_pixelcolor_to_color_name(Image *image, PixelColor *color)
 {
-    PixelColor pp;
-    char name[MaxTextExtent];
-    ExceptionInfo *exception;
+    MagickPixel mpp;
+    char tuple[MaxTextExtent];
 
-    exception = AcquireExceptionInfo();
-
-    pp = *color;
 #if defined(IMAGEMAGICK_7)
-    pp.depth = MAGICKCORE_QUANTUM_DEPTH;
-    pp.colorspace = image->colorspace;
+    mpp = *color;
+    mpp.alpha_trait = BlendPixelTrait;
+    mpp.colorspace = image->colorspace;
+#else
+    rm_init_magickpixel(image, &mpp);
+    mpp.red = GetPixelRed(color);
+    mpp.green = GetPixelGreen(color);
+    mpp.blue = GetPixelBlue(color);
+    mpp.opacity = GetPixelOpacity(color);
+    mpp.index   = (MagickRealType) 0.0;
+    mpp.matte = MagickTrue;
 #endif
+    mpp.depth = image->depth;
 
-    QueryColorname(image, &pp, X11Compliance, name, exception);
-    CHECK_EXCEPTION();
-    DestroyExceptionInfo(exception);
+    GetColorTuple(&mpp, MagickTrue, tuple);
 
-    return rb_str_new2(name);
+    return rb_str_new2(tuple);
 }
 
 
@@ -1057,13 +1065,14 @@ void rm_sync_image_options(Image *image, Info *info)
     {
 #if defined(IMAGEMAGICK_7)
         exception = AcquireExceptionInfo();
-        SetImageColorspace(image, info->colorspace, exception);
-        // We should not throw an exception in this method because we will
-        // leak memory in the place where this method is called. And that is
-        // why the exception is being ignored here.
+        GVL_STRUCT_TYPE(TransformImageColorspace) args = { image, info->colorspace, exception };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransformImageColorspace), &args);
+        CHECK_EXCEPTION();
         DestroyExceptionInfo(exception);
 #else
-        SetImageColorspace(image, info->colorspace);
+        GVL_STRUCT_TYPE(TransformImageColorspace) args = { image, info->colorspace };
+        CALL_FUNC_WITHOUT_GVL(GVL_FUNC(TransformImageColorspace), &args);
+        rm_check_image_exception(image, RetainOnError);
 #endif
     }
 

data/lib/rmagick/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '5.5.0'
-  MIN_RUBY_VERSION = '2.3.0'
-  MIN_IM_VERSION = '6.7.7'
+  VERSION = '6.0.1'
+  MIN_RUBY_VERSION = '3.0.0'
+  MIN_IM_VERSION = '6.8.9'
 end

data/lib/rmagick.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'rmagick_internal.rb'
+require 'rmagick_internal'