rmagick 5.3.0 → 5.4.0

data/ext/RMagick/{rmmontage.c → rmmontage.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmmontage.c
- * @version  $Id: rmmontage.c,v 1.5 2009/12/20 02:33:33 baror Exp $
+ * @file     rmmontage.cpp
+ * @version  $Id: rmmontage.cpp,v 1.5 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -37,7 +37,7 @@ const rb_data_type_t rm_montage_data_type = {
 static void
 Montage_destroy(void *obj)
 {
-    Montage *montage = obj;
+    Montage *montage = (Montage *)obj;
 
     // If we saved a temporary texture image, delete it now.
     if (montage->info && montage->info->texture != NULL)
@@ -75,7 +75,7 @@ Montage_memsize(const void *ptr)
  * @return [Magick::ImageList::Montage] a new Montage object
  */
 VALUE
-Montage_alloc(VALUE class)
+Montage_alloc(VALUE klass)
 {
     MontageInfo *montage_info;
     Montage *montage;
@@ -100,7 +100,7 @@ Montage_alloc(VALUE class)
     montage = ALLOC(Montage);
     montage->info = montage_info;
     montage->compose = OverCompositeOp;
-    montage_obj = TypedData_Wrap_Struct(class, &rm_montage_data_type, montage);
+    montage_obj = TypedData_Wrap_Struct(klass, &rm_montage_data_type, montage);
 
     RB_GC_GUARD(montage_obj);
 

data/ext/RMagick/{rmpixel.c → rmpixel.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmpixel.c
- * @version  $Id: rmpixel.c,v 1.7 2009/12/21 10:34:58 baror Exp $
+ * @file     rmpixel.cpp
+ * @version  $Id: rmpixel.cpp,v 1.7 2009/12/21 10:34:58 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -414,7 +414,7 @@ Color_to_PixelColor(PixelColor *pp, VALUE color)
     else
     {
         // require 'to_str' here instead of just 'to_s'.
-        color = rb_rescue(rb_str_to_str, color, color_arg_rescue, color);
+        color = rb_rescue(RESCUE_FUNC(rb_str_to_str), color, RESCUE_EXCEPTION_HANDLER_FUNC(color_arg_rescue), color);
         Color_Name_to_PixelColor(pp, color);
     }
 }
@@ -492,13 +492,13 @@ Color_Name_to_PixelColor(PixelColor *color, VALUE name_arg)
  * @return [Magick::Pixel] a new Magick::Pixel object
  */
 VALUE
-Pixel_alloc(VALUE class)
+Pixel_alloc(VALUE klass)
 {
     Pixel *pixel;
 
     pixel = ALLOC(Pixel);
     memset(pixel, '\0', sizeof(Pixel));
-    return TypedData_Wrap_Struct(class, &rm_pixel_data_type, pixel);
+    return TypedData_Wrap_Struct(klass, &rm_pixel_data_type, pixel);
 }
 
 
@@ -514,17 +514,17 @@ Pixel_case_eq(VALUE self, VALUE other)
 {
     if (CLASS_OF(self) == CLASS_OF(other))
     {
-        Pixel *this, *that;
+        Pixel *self_pixel, *other_pixel;
 
-        TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, this);
-        TypedData_Get_Struct(other, Pixel, &rm_pixel_data_type, that);
-        return (this->red == that->red
-            && this->blue == that->blue
-            && this->green == that->green
+        TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, self_pixel);
+        TypedData_Get_Struct(other, Pixel, &rm_pixel_data_type, other_pixel);
+        return (self_pixel->red == other_pixel->red
+            && self_pixel->blue == other_pixel->blue
+            && self_pixel->green == other_pixel->green
 #if defined(IMAGEMAGICK_7)
-            && this->alpha == that->alpha) ? Qtrue : Qfalse;
+            && self_pixel->alpha == other_pixel->alpha) ? Qtrue : Qfalse;
 #else
-            && this->opacity == that->opacity) ? Qtrue : Qfalse;
+            && self_pixel->opacity == other_pixel->opacity) ? Qtrue : Qfalse;
 #endif
     }
 
@@ -606,7 +606,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     double fuzz = 0.0;
     unsigned int equal;
     ColorspaceType colorspace = RGBColorspace;
-    PixelColor this, that;
+    PixelColor self_pixel_color, other_pixel_color;
 #if defined(IMAGEMAGICK_6)
     Image *image;
     Info *info;
@@ -626,15 +626,15 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
             break;
     }
 
-    Color_to_PixelColor(&this, self);
-    Color_to_PixelColor(&that, argv[0]);
+    Color_to_PixelColor(&self_pixel_color, self);
+    Color_to_PixelColor(&other_pixel_color, argv[0]);
 
 #if defined(IMAGEMAGICK_7)
-    this.fuzz = fuzz;
-    this.colorspace = colorspace;
-    that.fuzz = fuzz;
-    that.colorspace = colorspace;
-    equal = IsFuzzyEquivalencePixelInfo(&this, &that);
+    self_pixel_color.fuzz = fuzz;
+    self_pixel_color.colorspace = colorspace;
+    other_pixel_color.fuzz = fuzz;
+    other_pixel_color.colorspace = colorspace;
+    equal = IsFuzzyEquivalencePixelInfo(&self_pixel_color, &other_pixel_color);
 #else
     // The IsColorSimilar function expects to get the
     // colorspace and fuzz parameters from an Image structure.
@@ -658,7 +658,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     image->colorspace = colorspace;
     image->fuzz = fuzz;
 
-    equal = IsColorSimilar(image, &this, &that);
+    equal = IsColorSimilar(image, &self_pixel_color, &other_pixel_color);
     DestroyImage(image);
 #endif
 
@@ -679,7 +679,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
  * @see Magick::Pixel#to_color
  */
 VALUE
-Pixel_from_color(VALUE class ATTRIBUTE_UNUSED, VALUE name)
+Pixel_from_color(VALUE klass ATTRIBUTE_UNUSED, VALUE name)
 {
     PixelColor pp;
     ExceptionInfo *exception;
@@ -715,7 +715,7 @@ Pixel_from_color(VALUE class ATTRIBUTE_UNUSED, VALUE name)
  *   @return [Magick::Pixel] a new Magick::Pixel object
  */
 VALUE
-Pixel_from_hsla(int argc, VALUE *argv, VALUE class ATTRIBUTE_UNUSED)
+Pixel_from_hsla(int argc, VALUE *argv, VALUE klass ATTRIBUTE_UNUSED)
 {
     double h, s, l, a = 1.0;
     MagickPixel pp;
@@ -1067,32 +1067,32 @@ Pixel_marshal_load(VALUE self, VALUE dpixel)
 VALUE
 Pixel_spaceship(VALUE self, VALUE other)
 {
-    Pixel *this, *that;
+    Pixel *self_pixel, *other_pixel;
 
-    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, this);
-    TypedData_Get_Struct(other, Pixel, &rm_pixel_data_type, that);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, self_pixel);
+    TypedData_Get_Struct(other, Pixel, &rm_pixel_data_type, other_pixel);
 
-    if (this->red != that->red)
+    if (self_pixel->red != other_pixel->red)
     {
-        return INT2NUM((this->red - that->red)/abs((int)(this->red - that->red)));
+        return INT2NUM((self_pixel->red - other_pixel->red)/abs((int)(self_pixel->red - other_pixel->red)));
     }
-    else if(this->green != that->green)
+    else if(self_pixel->green != other_pixel->green)
     {
-        return INT2NUM((this->green - that->green)/abs((int)(this->green - that->green)));
+        return INT2NUM((self_pixel->green - other_pixel->green)/abs((int)(self_pixel->green - other_pixel->green)));
     }
-    else if(this->blue != that->blue)
+    else if(self_pixel->blue != other_pixel->blue)
     {
-        return INT2NUM((this->blue - that->blue)/abs((int)(this->blue - that->blue)));
+        return INT2NUM((self_pixel->blue - other_pixel->blue)/abs((int)(self_pixel->blue - other_pixel->blue)));
     }
 #if defined(IMAGEMAGICK_7)
-    else if(this->alpha != that->alpha)
+    else if(self_pixel->alpha != other_pixel->alpha)
     {
-        return INT2NUM((this->alpha - that->alpha)/abs((int)(this->alpha - that->alpha)));
+        return INT2NUM((self_pixel->alpha - other_pixel->alpha)/abs((int)(self_pixel->alpha - other_pixel->alpha)));
     }
 #else
-    else if(this->opacity != that->opacity)
+    else if(self_pixel->opacity != other_pixel->opacity)
     {
-        return INT2NUM(((QuantumRange - this->opacity) - (QuantumRange - that->opacity))/abs((int)((QuantumRange - this->opacity) - (QuantumRange - that->opacity))));
+        return INT2NUM(((QuantumRange - self_pixel->opacity) - (QuantumRange - other_pixel->opacity))/abs((int)((QuantumRange - self_pixel->opacity) - (QuantumRange - other_pixel->opacity))));
     }
 #endif
 
@@ -1207,13 +1207,13 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     char name[MaxTextExtent];
     ExceptionInfo *exception;
     ComplianceType compliance = AllCompliance;
-    unsigned int alpha = MagickFalse;
+    MagickBooleanType alpha = MagickFalse;
     unsigned int depth = MAGICKCORE_QUANTUM_DEPTH;
 
     switch (argc)
     {
         case 4:
-            hex = RTEST(argv[3]);
+            hex = (MagickBooleanType)RTEST(argv[3]);
         case 3:
             depth = NUM2UINT(argv[2]);
 
@@ -1233,7 +1233,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
                     break;
             }
        case 2:
-            alpha = RTEST(argv[1]);
+            alpha = (MagickBooleanType)RTEST(argv[1]);
         case 1:
             VALUE_TO_ENUM(argv[0], compliance, ComplianceType);
         case 0:
@@ -1318,4 +1318,3 @@ Pixel_to_s(VALUE self)
 #endif
     return rb_str_new2(buff);
 }
-

data/ext/RMagick/{rmstruct.c → rmstruct.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmstruct.c
- * @version  $Id: rmstruct.c,v 1.5 2009/12/20 02:33:34 baror Exp $
+ * @file     rmstruct.cpp
+ * @version  $Id: rmstruct.cpp,v 1.5 2009/12/20 02:33:34 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -456,8 +456,8 @@ Export_TypeInfo(TypeInfo *ti, VALUE st)
     {
         CloneString((char **)&(ti->family), StringValueCStr(m));
     }
-    m = rb_ary_entry(members, 3); ti->style   = m == Qnil ? 0 : FIX2INT(Enum_to_i(m));
-    m = rb_ary_entry(members, 4); ti->stretch = m == Qnil ? 0 : FIX2INT(Enum_to_i(m));
+    m = rb_ary_entry(members, 3); ti->style   = m == Qnil ? UndefinedStyle : (StyleType)FIX2INT(Enum_to_i(m));
+    m = rb_ary_entry(members, 4); ti->stretch = m == Qnil ? UndefinedStretch : (StretchType)FIX2INT(Enum_to_i(m));
     m = rb_ary_entry(members, 5); ti->weight  = m == Qnil ? 0 : FIX2INT(m);
 
     m = rb_ary_entry(members, 6);
@@ -524,7 +524,7 @@ Font_to_s(VALUE self)
             strcpy(weight, "BoldWeight");
             break;
         default:
-            snprintf(weight, sizeof(weight), "%"RMIuSIZE"", ti.weight);
+            snprintf(weight, sizeof(weight), "%" RMIuSIZE "", ti.weight);
             break;
     }
 
@@ -732,7 +732,7 @@ RectangleInfo_to_s(VALUE self)
     char buff[100];
 
     Export_RectangleInfo(&rect, self);
-    snprintf(buff, sizeof(buff), "width=%"RMIuSIZE", height=%"RMIuSIZE", x=%"RMIdSIZE", y=%"RMIdSIZE"",
+    snprintf(buff, sizeof(buff), "width=%" RMIuSIZE ", height=%" RMIuSIZE ", x=%" RMIdSIZE ", y=%" RMIdSIZE "",
              rect.width, rect.height, rect.x, rect.y);
     return rb_str_new2(buff);
 }

data/ext/RMagick/{rmutil.c → rmutil.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmutil.c
- * @version  $Id: rmutil.c,v 1.182 2009/12/21 10:34:58 baror Exp $
+ * @file     rmutil.cpp
+ * @version  $Id: rmutil.cpp,v 1.182 2009/12/21 10:34:58 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -252,7 +252,7 @@ rm_check_ary_type(VALUE ary)
     VALUE checked = rb_check_array_type(ary);
     if (NIL_P(checked))
     {
-        rb_raise(rb_eTypeError, "wrong argument type %"RMIsVALUE" was given. (must respond to :to_ary)", rb_obj_class(ary));
+        rb_raise(rb_eTypeError, "wrong argument type %" RMIsVALUE " was given. (must respond to :to_ary)", rb_obj_class(ary));
     }
     return checked;
 }
@@ -319,16 +319,16 @@ rm_no_freeze(VALUE obj)
  * No Ruby usage (internal function)
  *
  * @param str the Ruby string
- * @param len pointer to a long in which to store the number of characters
+ * @param len pointer to a size_t in which to store the number of characters
  * @return a C string version of str
  */
 char *
-rm_str2cstr(VALUE str, long *len)
+rm_str2cstr(VALUE str, size_t *len)
 {
     StringValue(str);
     if (len)
     {
-        *len = RSTRING_LEN(str);
+        *len = (size_t)RSTRING_LEN(str);
     }
     return RSTRING_PTR(str);
 }
@@ -373,7 +373,7 @@ rm_percentage(VALUE arg, double max)
         char *pct_str;
         long pct_long;
 
-        arg = rb_rescue(rb_str_to_str, arg, rescue_not_str, arg);
+        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);
@@ -454,7 +454,7 @@ rescue_not_dbl(VALUE ignored ATTRIBUTE_UNUSED, VALUE raised_exc ATTRIBUTE_UNUSED
 int
 rm_check_num2dbl(VALUE obj)
 {
-    return FIX2INT(rb_rescue(check_num2dbl, obj, rescue_not_dbl, (VALUE)0));
+    return FIX2INT(rb_rescue(RESCUE_FUNC(check_num2dbl), obj, RESCUE_EXCEPTION_HANDLER_FUNC(rescue_not_dbl), (VALUE)0));
 }
 
 
@@ -472,7 +472,7 @@ rm_str_to_pct(VALUE str)
     long pct;
     char *pct_str, *end;
 
-    str = rb_rescue(rb_str_to_str, str, rescue_not_str, str);
+    str = rb_rescue(RESCUE_FUNC(rb_str_to_str), str, RESCUE_EXCEPTION_HANDLER_FUNC(rescue_not_str), str);
     pct_str = StringValueCStr(str);
     errno = 0;
     pct = strtol(pct_str, &end, 10);
@@ -516,7 +516,7 @@ rm_fuzz_to_dbl(VALUE fuzz_arg)
         char *fuzz_str;
 
         // Convert to string, issue error message if failure.
-        fuzz_arg = rb_rescue(rb_str_to_str, fuzz_arg, rescue_not_str, fuzz_arg);
+        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);
@@ -911,7 +911,7 @@ ImageMagickError_initialize(int argc, VALUE *argv, VALUE self)
     }
 
     rb_call_super(super_argc, (const VALUE *)super_argv);
-    rb_iv_set(self, "@"MAGICK_LOC, extra);
+    rb_iv_set(self, "@" MAGICK_LOC, extra);
 
     RB_GC_GUARD(extra);
 
@@ -1332,7 +1332,7 @@ rm_exif_by_entry(Image *image)
         return Qnil;
     }
 
-    str = xmalloc(len);
+    str = (char *)xmalloc(len);
     len = 0;
 
     // Copy the exif properties and values into the string.
@@ -1450,7 +1450,7 @@ rm_exif_by_number(Image *image)
         return Qnil;
     }
 
-    str = xmalloc(len);
+    str = (char *)xmalloc(len);
     len = 0;
 
     // Copy the exif properties and values into the string.
@@ -1839,3 +1839,23 @@ rm_raise_exception(ExceptionInfo *exception)
 
     rm_magick_error(msg);
 }
+
+/**
+ * Get IO path.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param io An IO object
+ * @return string of the path
+ */
+VALUE
+rm_io_path(VALUE io)
+{
+#ifdef HAVE_RB_IO_PATH
+    return rb_io_path(io);
+#else
+    rb_io_t *fptr;
+    GetOpenFile(io, fptr);
+    return fptr->pathv;
+#endif
+}

data/lib/rmagick/version.rb

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

data/rmagick.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.requirements << "ImageMagick #{Magick::MIN_IM_VERSION} or later"
 
   s.add_runtime_dependency 'pkg-config', '~> 1.4'
+  s.add_runtime_dependency 'observer', '~> 0.1'
 
   s.add_development_dependency 'pry', '~> 0.14'
   s.add_development_dependency 'rake-compiler', '~> 1.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-19 00:00:00.000000000 Z
+date: 2024-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pkg-config
@@ -27,6 +27,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: observer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -183,21 +197,21 @@ files:
 - before_install_linux.sh
 - before_install_osx.sh
 - ext/RMagick/extconf.rb
-- ext/RMagick/rmagick.c
+- ext/RMagick/rmagick.cpp
 - ext/RMagick/rmagick.h
 - ext/RMagick/rmagick_gvl.h
-- ext/RMagick/rmdraw.c
-- ext/RMagick/rmenum.c
-- ext/RMagick/rmfill.c
-- ext/RMagick/rmilist.c
-- ext/RMagick/rmimage.c
-- ext/RMagick/rminfo.c
-- ext/RMagick/rmkinfo.c
-- ext/RMagick/rmmain.c
-- ext/RMagick/rmmontage.c
-- ext/RMagick/rmpixel.c
-- ext/RMagick/rmstruct.c
-- ext/RMagick/rmutil.c
+- ext/RMagick/rmdraw.cpp
+- ext/RMagick/rmenum.cpp
+- ext/RMagick/rmfill.cpp
+- ext/RMagick/rmilist.cpp
+- ext/RMagick/rmimage.cpp
+- ext/RMagick/rminfo.cpp
+- ext/RMagick/rmkinfo.cpp
+- ext/RMagick/rmmain.cpp
+- ext/RMagick/rmmontage.cpp
+- ext/RMagick/rmpixel.cpp
+- ext/RMagick/rmstruct.cpp
+- ext/RMagick/rmutil.cpp
 - lib/rmagick.rb
 - lib/rmagick/version.rb
 - lib/rmagick_internal.rb
@@ -237,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick 6.7.7 or later
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Ruby binding to ImageMagick