rmagick 5.4.3 → 5.5.0

data/ext/RMagick/rminfo.cpp

@@ -819,8 +819,8 @@ Info_density(VALUE self)
 /**
  * Set the text rendering density geometry
  *
- * @param density_arg [String] the density
- * @return [String] the given value
+ * @param density_arg [Magick::Geometry, String] the density
+ * @return [Magick::Geometry, String] the given value
  * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
@@ -836,7 +836,7 @@ Info_density_eq(VALUE self, VALUE density_arg)
     {
         magick_free(info->density);
         info->density = NULL;
-        return self;
+        return density_arg;
     }
 
     density = rb_String(density_arg);
@@ -1000,7 +1000,7 @@ Info_dispose_eq(VALUE self, VALUE disp)
     if (NIL_P(disp))
     {
         DeleteImageOption(info, "dispose");
-        return self;
+        return disp;
     }
 
     VALUE_TO_ENUM(disp, dispose, DisposeType);
@@ -1096,8 +1096,8 @@ Info_extract(VALUE self)
 /**
  * Set the extract geometry.
  *
- * @param extract_arg [String] the extract string
- * @return [String] the given value
+ * @param extract_arg [Magick::Geometry, String] the extract string
+ * @return [Magick::Geometry, String] the given value
  * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
@@ -1113,7 +1113,7 @@ Info_extract_eq(VALUE self, VALUE extract_arg)
     {
         magick_free(info->extract);
         info->extract = NULL;
-        return self;
+        return extract_arg;
     }
 
     extract = rb_String(extract_arg);
@@ -1431,7 +1431,7 @@ Info_gravity_eq(VALUE self, VALUE grav)
     if (NIL_P(grav))
     {
         DeleteImageOption(info, "gravity");
-        return self;
+        return grav;
     }
 
     VALUE_TO_ENUM(grav, gravity, GravityType);
@@ -1668,8 +1668,8 @@ Info_origin(VALUE self)
  * The geometry format is
  *     +-x+-y
  *
- * @param origin_arg [String] the origin geometry
- * @return [String] the given value
+ * @param origin_arg [Magick::Geometry, String] the origin geometry
+ * @return [Magick::Geometry, String] the given value
  * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
@@ -1684,7 +1684,7 @@ Info_origin_eq(VALUE self, VALUE origin_arg)
     if (NIL_P(origin_arg))
     {
         DeleteImageOption(info, "origin");
-        return self;
+        return origin_arg;
     }
 
     origin_str = rb_String(origin_arg);
@@ -1724,8 +1724,8 @@ Info_page(VALUE self)
  * Store the Postscript page geometry. Argument may be a Geometry object as well
  * as a geometry string.
  *
- * @param page_arg [String] the geometry
- * @return [String] the given value
+ * @param page_arg [Magick::Geometry, String] the geometry
+ * @return [Magick::Geometry, String] the given value
  * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
@@ -1740,7 +1740,7 @@ Info_page_eq(VALUE self, VALUE page_arg)
     {
         magick_free(info->page);
         info->page = NULL;
-        return self;
+        return page_arg;
     }
     geom_str = rb_String(page_arg);
     geometry = GetPageGeometry(StringValueCStr(geom_str));
@@ -1748,7 +1748,7 @@ Info_page_eq(VALUE self, VALUE page_arg)
     {
         magick_free(info->page);
         info->page = NULL;
-        return self;
+        return page_arg;
     }
     info->page = geometry;
 
@@ -1949,8 +1949,8 @@ Info_size(VALUE self)
 /**
  * Set the size (either as a Geometry object or a Geometry string
  *
- * @param size_arg [String] the size
- * @return [String] the given value
+ * @param size_arg [Magick::Geometry, String] the size
+ * @return [Magick::Geometry, String] the given value
  * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
@@ -1966,7 +1966,7 @@ Info_size_eq(VALUE self, VALUE size_arg)
     {
         magick_free(info->size);
         info->size = NULL;
-        return self;
+        return size_arg;
     }
 
     size = rb_String(size_arg);
@@ -2100,8 +2100,8 @@ Info_tile_offset(VALUE self)
 /**
  * Set tile offset geometry.
  *
- * @param offset [String] the offset geometry
- * @return [String] the given value
+ * @param offset [Magick::Geometry, String] the offset geometry
+ * @return [Magick::Geometry, String] the given value
  * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
@@ -2401,7 +2401,8 @@ rm_info_new(void)
  * @overload initialize
  *
  * @overload initialize
- *   @yield [Magick::Image::Info]
+ *   @yield [info]
+ *   @yieldparam info [Magick::Image::Info]
  *
  * @return self
  */

data/ext/RMagick/rmkinfo.cpp

@@ -74,15 +74,13 @@ VALUE
 KernelInfo_initialize(VALUE self, VALUE kernel_string)
 {
     KernelInfo *kernel;
+    char *string = StringValueCStr(kernel_string);
+
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
-#endif
-
-    Check_Type(kernel_string, T_STRING);
 
-#if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    kernel = AcquireKernelInfo(StringValueCStr(kernel_string), exception);
+    kernel = AcquireKernelInfo(string, exception);
     if (rm_should_raise_exception(exception, DestroyExceptionRetention))
     {
         if (kernel != (KernelInfo *) NULL)
@@ -92,7 +90,7 @@ KernelInfo_initialize(VALUE self, VALUE kernel_string)
         rm_raise_exception(exception);
     }
 #else
-    kernel = AcquireKernelInfo(StringValueCStr(kernel_string));
+    kernel = AcquireKernelInfo(string);
 #endif
 
     if (!kernel)
@@ -114,9 +112,6 @@ KernelInfo_initialize(VALUE self, VALUE kernel_string)
 VALUE
 KernelInfo_unity_add(VALUE self, VALUE scale)
 {
-    if (!FIXNUM_P(scale))
-        Check_Type(scale, T_FLOAT);
-
     GVL_STRUCT_TYPE(UnityAddKernelInfo) args = { (KernelInfo*)DATA_PTR(self), NUM2DBL(scale) };
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(UnityAddKernelInfo), &args);
     return Qnil;
@@ -136,13 +131,7 @@ KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
 {
     GeometryFlags geoflags;
 
-    if (!FIXNUM_P(scale))
-        Check_Type(scale, T_FLOAT);
-
-    if (rb_obj_is_instance_of(flags, Class_GeometryFlags))
-        VALUE_TO_ENUM(flags, geoflags, GeometryFlags);
-    else
-        rb_raise(rb_eArgError, "expected Integer or Magick::GeometryFlags to specify flags");
+    VALUE_TO_ENUM(flags, geoflags, GeometryFlags);
 
     GVL_STRUCT_TYPE(ScaleKernelInfo) args = { (KernelInfo*)DATA_PTR(self), NUM2DBL(scale), geoflags };
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ScaleKernelInfo), &args);
@@ -158,7 +147,6 @@ KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
 VALUE
 KernelInfo_scale_geometry(VALUE self, VALUE geometry)
 {
-    Check_Type(geometry, T_STRING);
     GVL_STRUCT_TYPE(ScaleGeometryKernelInfo) args = { (KernelInfo*)DATA_PTR(self), StringValueCStr(geometry) };
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ScaleGeometryKernelInfo), &args);
     return Qnil;
@@ -195,7 +183,6 @@ KernelInfo_builtin(VALUE self, VALUE what, VALUE geometry)
     ExceptionInfo *exception;
 #endif
 
-    Check_Type(geometry, T_STRING);
     VALUE_TO_ENUM(what, kernel_type, KernelInfoType);
     ParseGeometry(StringValueCStr(geometry), &info);
 

data/ext/RMagick/rmmain.cpp

@@ -653,30 +653,33 @@ Init_RMagick2(void)
     rb_define_alloc_func(Class_Draw, Draw_alloc);
 
     // Define the attributes
-    rb_define_method(Class_Draw, "affine=", RUBY_METHOD_FUNC(Draw_affine_eq), 1);
-    rb_define_method(Class_Draw, "align=", RUBY_METHOD_FUNC(Draw_align_eq), 1);
-    rb_define_method(Class_Draw, "decorate=", RUBY_METHOD_FUNC(Draw_decorate_eq), 1);
-    rb_define_method(Class_Draw, "density=", RUBY_METHOD_FUNC(Draw_density_eq), 1);
-    rb_define_method(Class_Draw, "encoding=", RUBY_METHOD_FUNC(Draw_encoding_eq), 1);
-    rb_define_method(Class_Draw, "fill=", RUBY_METHOD_FUNC(Draw_fill_eq), 1);
-    rb_define_method(Class_Draw, "fill_pattern=", RUBY_METHOD_FUNC(Draw_fill_pattern_eq), 1);
-    rb_define_method(Class_Draw, "font=", RUBY_METHOD_FUNC(Draw_font_eq), 1);
-    rb_define_method(Class_Draw, "font_family=", RUBY_METHOD_FUNC(Draw_font_family_eq), 1);
-    rb_define_method(Class_Draw, "font_stretch=", RUBY_METHOD_FUNC(Draw_font_stretch_eq), 1);
-    rb_define_method(Class_Draw, "font_style=", RUBY_METHOD_FUNC(Draw_font_style_eq), 1);
-    rb_define_method(Class_Draw, "font_weight=", RUBY_METHOD_FUNC(Draw_font_weight_eq), 1);
-    rb_define_method(Class_Draw, "gravity=", RUBY_METHOD_FUNC(Draw_gravity_eq), 1);
-    rb_define_method(Class_Draw, "interline_spacing=", RUBY_METHOD_FUNC(Draw_interline_spacing_eq), 1);
-    rb_define_method(Class_Draw, "interword_spacing=", RUBY_METHOD_FUNC(Draw_interword_spacing_eq), 1);
-    rb_define_method(Class_Draw, "kerning=", RUBY_METHOD_FUNC(Draw_kerning_eq), 1);
-    rb_define_method(Class_Draw, "pointsize=", RUBY_METHOD_FUNC(Draw_pointsize_eq), 1);
-    rb_define_method(Class_Draw, "rotation=", RUBY_METHOD_FUNC(Draw_rotation_eq), 1);
-    rb_define_method(Class_Draw, "stroke=", RUBY_METHOD_FUNC(Draw_stroke_eq), 1);
-    rb_define_method(Class_Draw, "stroke_pattern=", RUBY_METHOD_FUNC(Draw_stroke_pattern_eq), 1);
-    rb_define_method(Class_Draw, "stroke_width=", RUBY_METHOD_FUNC(Draw_stroke_width_eq), 1);
-    rb_define_method(Class_Draw, "text_antialias=", RUBY_METHOD_FUNC(Draw_text_antialias_eq), 1);
-    rb_define_method(Class_Draw, "tile=", RUBY_METHOD_FUNC(Draw_tile_eq), 1);
-    rb_define_method(Class_Draw, "undercolor=", RUBY_METHOD_FUNC(Draw_undercolor_eq), 1);
+    Module_DrawAttribute = rb_define_module_under(Module_Magick, "DrawAttribute");
+    rb_define_method(Module_DrawAttribute, "affine=", RUBY_METHOD_FUNC(Draw_affine_eq), 1);
+    rb_define_method(Module_DrawAttribute, "align=", RUBY_METHOD_FUNC(Draw_align_eq), 1);
+    rb_define_method(Module_DrawAttribute, "decorate=", RUBY_METHOD_FUNC(Draw_decorate_eq), 1);
+    rb_define_method(Module_DrawAttribute, "density=", RUBY_METHOD_FUNC(Draw_density_eq), 1);
+    rb_define_method(Module_DrawAttribute, "encoding=", RUBY_METHOD_FUNC(Draw_encoding_eq), 1);
+    rb_define_method(Module_DrawAttribute, "fill=", RUBY_METHOD_FUNC(Draw_fill_eq), 1);
+    rb_define_method(Module_DrawAttribute, "fill_pattern=", RUBY_METHOD_FUNC(Draw_fill_pattern_eq), 1);
+    rb_define_method(Module_DrawAttribute, "font=", RUBY_METHOD_FUNC(Draw_font_eq), 1);
+    rb_define_method(Module_DrawAttribute, "font_family=", RUBY_METHOD_FUNC(Draw_font_family_eq), 1);
+    rb_define_method(Module_DrawAttribute, "font_stretch=", RUBY_METHOD_FUNC(Draw_font_stretch_eq), 1);
+    rb_define_method(Module_DrawAttribute, "font_style=", RUBY_METHOD_FUNC(Draw_font_style_eq), 1);
+    rb_define_method(Module_DrawAttribute, "font_weight=", RUBY_METHOD_FUNC(Draw_font_weight_eq), 1);
+    rb_define_method(Module_DrawAttribute, "gravity=", RUBY_METHOD_FUNC(Draw_gravity_eq), 1);
+    rb_define_method(Module_DrawAttribute, "interline_spacing=", RUBY_METHOD_FUNC(Draw_interline_spacing_eq), 1);
+    rb_define_method(Module_DrawAttribute, "interword_spacing=", RUBY_METHOD_FUNC(Draw_interword_spacing_eq), 1);
+    rb_define_method(Module_DrawAttribute, "kerning=", RUBY_METHOD_FUNC(Draw_kerning_eq), 1);
+    rb_define_method(Module_DrawAttribute, "pointsize=", RUBY_METHOD_FUNC(Draw_pointsize_eq), 1);
+    rb_define_method(Module_DrawAttribute, "rotation=", RUBY_METHOD_FUNC(Draw_rotation_eq), 1);
+    rb_define_method(Module_DrawAttribute, "stroke=", RUBY_METHOD_FUNC(Draw_stroke_eq), 1);
+    rb_define_method(Module_DrawAttribute, "stroke_pattern=", RUBY_METHOD_FUNC(Draw_stroke_pattern_eq), 1);
+    rb_define_method(Module_DrawAttribute, "stroke_width=", RUBY_METHOD_FUNC(Draw_stroke_width_eq), 1);
+    rb_define_method(Module_DrawAttribute, "text_antialias=", RUBY_METHOD_FUNC(Draw_text_antialias_eq), 1);
+    rb_define_method(Module_DrawAttribute, "tile=", RUBY_METHOD_FUNC(Draw_tile_eq), 1);
+    rb_define_method(Module_DrawAttribute, "undercolor=", RUBY_METHOD_FUNC(Draw_undercolor_eq), 1);
+
+    rb_include_module(Class_Draw, Module_DrawAttribute);
 
     rb_define_method(Class_Draw, "annotate", RUBY_METHOD_FUNC(Draw_annotate), 6);
     rb_define_method(Class_Draw, "clone", RUBY_METHOD_FUNC(Draw_clone), 0);
@@ -704,27 +707,8 @@ Init_RMagick2(void)
 
     rb_define_method(Class_DrawOptions, "initialize", RUBY_METHOD_FUNC(DrawOptions_initialize), 0);
 
-    rb_define_method(Class_DrawOptions, "affine=", RUBY_METHOD_FUNC(Draw_affine_eq), 1);
-    rb_define_method(Class_DrawOptions, "align=", RUBY_METHOD_FUNC(Draw_align_eq), 1);
-    rb_define_method(Class_DrawOptions, "decorate=", RUBY_METHOD_FUNC(Draw_decorate_eq), 1);
-    rb_define_method(Class_DrawOptions, "density=", RUBY_METHOD_FUNC(Draw_density_eq), 1);
-    rb_define_method(Class_DrawOptions, "encoding=", RUBY_METHOD_FUNC(Draw_encoding_eq), 1);
-    rb_define_method(Class_DrawOptions, "fill=", RUBY_METHOD_FUNC(Draw_fill_eq), 1);
-    rb_define_method(Class_DrawOptions, "fill_pattern=", RUBY_METHOD_FUNC(Draw_fill_pattern_eq), 1);
-    rb_define_method(Class_DrawOptions, "font=", RUBY_METHOD_FUNC(Draw_font_eq), 1);
-    rb_define_method(Class_DrawOptions, "font_family=", RUBY_METHOD_FUNC(Draw_font_family_eq), 1);
-    rb_define_method(Class_DrawOptions, "font_stretch=", RUBY_METHOD_FUNC(Draw_font_stretch_eq), 1);
-    rb_define_method(Class_DrawOptions, "font_style=", RUBY_METHOD_FUNC(Draw_font_style_eq), 1);
-    rb_define_method(Class_DrawOptions, "font_weight=", RUBY_METHOD_FUNC(Draw_font_weight_eq), 1);
-    rb_define_method(Class_DrawOptions, "gravity=", RUBY_METHOD_FUNC(Draw_gravity_eq), 1);
-    rb_define_method(Class_DrawOptions, "pointsize=", RUBY_METHOD_FUNC(Draw_pointsize_eq), 1);
-    rb_define_method(Class_DrawOptions, "rotation=", RUBY_METHOD_FUNC(Draw_rotation_eq), 1);
-    rb_define_method(Class_DrawOptions, "stroke=", RUBY_METHOD_FUNC(Draw_stroke_eq), 1);
-    rb_define_method(Class_DrawOptions, "stroke_pattern=", RUBY_METHOD_FUNC(Draw_stroke_pattern_eq), 1);
-    rb_define_method(Class_DrawOptions, "stroke_width=", RUBY_METHOD_FUNC(Draw_stroke_width_eq), 1);
-    rb_define_method(Class_DrawOptions, "text_antialias=", RUBY_METHOD_FUNC(Draw_text_antialias_eq), 1);
-    rb_define_method(Class_DrawOptions, "tile=", RUBY_METHOD_FUNC(Draw_tile_eq), 1);
-    rb_define_method(Class_DrawOptions, "undercolor=", RUBY_METHOD_FUNC(Draw_undercolor_eq), 1);
+    rb_include_module(Class_DrawOptions, Module_DrawAttribute);
+
 
     /*-----------------------------------------------------------------------*/
     /* Class Magick::Pixel                                                   */
@@ -948,25 +932,7 @@ Init_RMagick2(void)
     rb_define_method(Class_PolaroidOptions, "border_color=", RUBY_METHOD_FUNC(PolaroidOptions_border_color_eq), 1);
 
     // The other attribute writer methods are implemented by Draw's functions
-    rb_define_method(Class_PolaroidOptions, "align=", RUBY_METHOD_FUNC(Draw_align_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "decorate=", RUBY_METHOD_FUNC(Draw_decorate_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "density=", RUBY_METHOD_FUNC(Draw_density_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "encoding=", RUBY_METHOD_FUNC(Draw_encoding_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "fill=", RUBY_METHOD_FUNC(Draw_fill_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "fill_pattern=", RUBY_METHOD_FUNC(Draw_fill_pattern_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "font=", RUBY_METHOD_FUNC(Draw_font_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "font_family=", RUBY_METHOD_FUNC(Draw_font_family_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "font_stretch=", RUBY_METHOD_FUNC(Draw_font_stretch_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "font_style=", RUBY_METHOD_FUNC(Draw_font_style_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "font_weight=", RUBY_METHOD_FUNC(Draw_font_weight_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "gravity=", RUBY_METHOD_FUNC(Draw_gravity_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "pointsize=", RUBY_METHOD_FUNC(Draw_pointsize_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "stroke=", RUBY_METHOD_FUNC(Draw_stroke_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "stroke_pattern=", RUBY_METHOD_FUNC(Draw_stroke_pattern_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "stroke_width=", RUBY_METHOD_FUNC(Draw_stroke_width_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "text_antialias=", RUBY_METHOD_FUNC(Draw_text_antialias_eq), 1);
-    rb_define_method(Class_PolaroidOptions, "undercolor=", RUBY_METHOD_FUNC(Draw_undercolor_eq), 1);
-
+    rb_include_module(Class_PolaroidOptions, Module_DrawAttribute);
 
     /*-----------------------------------------------------------------------*/
     /* Magick::******Fill classes and methods                                */

data/ext/RMagick/rmmontage.cpp

@@ -235,7 +235,7 @@ Montage_font_eq(VALUE self, VALUE font)
  *      <width>x<height>+<outer-bevel-width>+<inner-bevel-width>
  *   or a Geometry object
  *
- * @param frame_arg [String] the frame geometry
+ * @param frame_arg [Magick::Geometry, String] the frame geometry
  * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
@@ -261,8 +261,8 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
  *      <width>x<height>+<outer-bevel-width>+<inner-bevel-width>
  *   or a Geometry object
  *
- * @param geometry_arg [String] the geometry
- * @return [String] the given geometry
+ * @param geometry_arg [Magick::Geometry, String] the geometry
+ * @return [Magick::Geometry, String] the given geometry
  * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
@@ -422,8 +422,8 @@ Montage_texture_eq(VALUE self, VALUE texture)
  *      <width>x<height>+<outer-bevel-width>+<inner-bevel-width>
  *   or a Geometry object
  *
- * @param tile_arg [String] the tile geometry
- * @return [String] the given tile geometry
+ * @param tile_arg [Magick::Geometry, String] the tile geometry
+ * @return [Magick::Geometry, String] the given tile geometry
  * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE

data/ext/RMagick/rmpixel.cpp

@@ -595,8 +595,8 @@ Pixel_eql_q(VALUE self, VALUE other)
  * Compare pixel values for equality.
  *
  * @overload fcmp(other, fuzz = 0.0, colorspace = Magick::RGBColorspace)
- *   @param other [Magick::Pixel] The pixel to which the receiver is compared
- *   @param fuzz [Float] The amount of fuzz to allow before the colors are considered to be different
+ *   @param other [Magick::Pixel, String] The pixel to which the receiver is compared
+ *   @param fuzz [Numeric] The amount of fuzz to allow before the colors are considered to be different
  *   @param colorspace [Magick::ColorspaceType] The colorspace
  *   @return [Boolean] true if equal, otherwise false
  */
@@ -711,7 +711,7 @@ Pixel_from_color(VALUE klass ATTRIBUTE_UNUSED, VALUE name)
  *   @param hue [Numeric, String] A value in the range.
  *   @param saturation [Numeric, String] A value in the range.
  *   @param lightness [Numeric, String] A value in the range.
- *   @param alpha [Numeric] The alpha value.
+ *   @param alpha [Numeric, String] The alpha value.
  *   @return [Magick::Pixel] a new Magick::Pixel object
  */
 VALUE
@@ -1069,6 +1069,10 @@ Pixel_spaceship(VALUE self, VALUE other)
 {
     Pixel *self_pixel, *other_pixel;
 
+    if (CLASS_OF(self) != CLASS_OF(other)) {
+        return Qnil;
+    }
+
     TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, self_pixel);
     TypedData_Get_Struct(other, Pixel, &rm_pixel_data_type, other_pixel);
 
@@ -1096,10 +1100,8 @@ Pixel_spaceship(VALUE self, VALUE other)
     }
 #endif
 
-    // Values are equal, check class.
-
-    return rb_funcall(CLASS_OF(self), rb_intern("<=>"), 1, CLASS_OF(other));
-
+    // Values are equal.
+    return INT2NUM(0);
 }
 
 

data/ext/RMagick/rmutil.cpp

@@ -360,49 +360,23 @@ rescue_not_str(VALUE arg, VALUE raised_exc ATTRIBUTE_UNUSED)
  *
  * @param arg the argument
  * @param max the maximum allowed value
+ * @param only_positive Accept whether only positive numbers?
  * @return a double
  */
 double
-rm_percentage(VALUE arg, double max)
+rm_percentage2(VALUE arg, double max, bool only_positive)
 {
     double pct;
     char *end;
 
     if (!rm_check_num2dbl(arg))
     {
-        char *pct_str;
-        long pct_long;
-
-        arg = rb_rescue(RESCUE_FUNC(rb_str_to_str), arg, RESCUE_EXCEPTION_HANDLER_FUNC(rescue_not_str), arg);
-        pct_str = StringValueCStr(arg);
-        errno = 0;
-        pct_long = strtol(pct_str, &end, 10);
-        if (errno == ERANGE)
-        {
-            rb_raise(rb_eRangeError, "`%s' out of range", pct_str);
-        }
-        if (*end != '\0' && *end != '%')
-        {
-            rb_raise(rb_eArgError, "expected percentage, got `%s'", pct_str);
-        }
-
-        if (*end == '%' && pct_long != 0)
-        {
-            pct = (((double)pct_long) / 100.0) * max;
-        }
-        else
-        {
-            pct = (double) pct_long;
-        }
-        if (pct < 0.0)
-        {
-            rb_raise(rb_eArgError, "percentages may not be negative (got `%s')", pct_str);
-        }
+        pct = rm_str_to_pct(arg, only_positive) * max;
     }
     else
     {
         pct = NUM2DBL(arg);
-        if (pct < 0.0)
+        if (pct < 0.0 && only_positive)
         {
             rb_raise(rb_eArgError, "percentages may not be negative (got `%g')", pct);
         }
@@ -412,6 +386,24 @@ rm_percentage(VALUE arg, double max)
 }
 
 
+/**
+ * Return a double between 0.0 and max (the second argument), inclusive. If the
+ * argument is a number convert to a Float object, otherwise it's supposed to be
+ * a string in the form * "NN%". Convert to a number and then to a Float.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param arg the argument
+ * @param max the maximum allowed value
+ * @return a double
+ */
+double
+rm_percentage(VALUE arg, double max)
+{
+    return rm_percentage2(arg, max, true);
+}
+
+
 /**
  * Return 0 if rb_num2dbl doesn't raise an exception.
  *
@@ -464,10 +456,11 @@ rm_check_num2dbl(VALUE obj)
  * No Ruby usage (internal function)
  *
  * @param str the string
+ * @param only_positive Accept whether only positive numbers?
  * @return a double
  */
 double
-rm_str_to_pct(VALUE str)
+rm_str_to_pct(VALUE str, bool only_positive)
 {
     long pct;
     char *pct_str, *end;
@@ -485,7 +478,7 @@ rm_str_to_pct(VALUE str)
     {
         rb_raise(rb_eArgError, "expected percentage, got `%s'", pct_str);
     }
-    if (pct < 0L)
+    if (pct < 0L && only_positive)
     {
         rb_raise(rb_eArgError, "percentages may not be negative (got `%s')", pct_str);
     }
@@ -508,45 +501,7 @@ rm_str_to_pct(VALUE str)
 double
 rm_fuzz_to_dbl(VALUE fuzz_arg)
 {
-    double fuzz;
-    char *end;
-
-    if (!rm_check_num2dbl(fuzz_arg))
-    {
-        char *fuzz_str;
-
-        // Convert to string, issue error message if failure.
-        fuzz_arg = rb_rescue(RESCUE_FUNC(rb_str_to_str), fuzz_arg, RESCUE_EXCEPTION_HANDLER_FUNC(rescue_not_str), fuzz_arg);
-        fuzz_str = StringValueCStr(fuzz_arg);
-        errno = 0;
-        fuzz = strtod(fuzz_str, &end);
-        if (errno == ERANGE)
-        {
-            rb_raise(rb_eRangeError, "`%s' out of range", fuzz_str);
-        }
-        if(*end == '%')
-        {
-            if (fuzz < 0.0)
-            {
-                rb_raise(rb_eArgError, "percentages may not be negative (got `%s')", fuzz_str);
-            }
-            fuzz = (fuzz * QuantumRange) / 100.0;
-        }
-        else if(*end != '\0')
-        {
-            rb_raise(rb_eArgError, "expected percentage, got `%s'", fuzz_str);
-        }
-    }
-    else
-    {
-        fuzz = NUM2DBL(fuzz_arg);
-        if (fuzz < 0.0)
-        {
-            rb_raise(rb_eArgError, "fuzz may not be negative (got `%g')", fuzz);
-        }
-    }
-
-    return fuzz;
+    return rm_percentage(fuzz_arg, QuantumRange);
 }
 
 
@@ -1262,6 +1217,11 @@ void rm_sync_image_options(Image *image, Info *info)
     }
 
     copy_options(image, info);
+
+#if defined(IMAGEMAGICK_7)
+    // The value of info->compression is referenced when saving the image in ImageMagick 7.
+    info->compression = image->compression;
+#endif
 }
 
 

data/lib/rmagick/version.rb

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