rmagick 4.2.2 → 5.3.0

data/ext/RMagick/rmpixel.c

@@ -19,6 +19,15 @@
 
 static VALUE color_arg_rescue(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void Color_Name_to_PixelColor(PixelColor *, VALUE);
+static void Pixel_destroy(void *);
+static size_t Pixel_memsize(const void *);
+
+const rb_data_type_t rm_pixel_data_type = {
+    "Magick::Pixel",
+    { NULL, Pixel_destroy, Pixel_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
 
 
 /**
@@ -26,15 +35,30 @@ static void Color_Name_to_PixelColor(PixelColor *, VALUE);
  *
  * No Ruby usage (internal function)
  *
- * @param pixel the Pixel object to destroy
+ * @param ptr the Pixel object to destroy
  */
-void
-destroy_Pixel(Pixel *pixel)
+static void
+Pixel_destroy(void *ptr)
 {
+    Pixel *pixel = (Pixel *)ptr;
     xfree(pixel);
 }
 
 
+/**
+  * Get Pixel object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param ptr pointer to the Pixel object
+  */
+static size_t
+Pixel_memsize(const void *ptr)
+{
+    return sizeof(Pixel);
+}
+
+
 /**
  * Get Pixel red value.
  *
@@ -43,7 +67,7 @@ destroy_Pixel(Pixel *pixel)
 VALUE
 Pixel_red(VALUE self)
 {
-    IMPLEMENT_ATTR_READER(Pixel, red, int);
+    IMPLEMENT_TYPED_ATTR_READER(Pixel, red, int, &rm_pixel_data_type);
 }
 
 /**
@@ -54,7 +78,7 @@ Pixel_red(VALUE self)
 VALUE
 Pixel_green(VALUE self)
 {
-    IMPLEMENT_ATTR_READER(Pixel, green, int);
+    IMPLEMENT_TYPED_ATTR_READER(Pixel, green, int, &rm_pixel_data_type);
 }
 
 /**
@@ -65,7 +89,7 @@ Pixel_green(VALUE self)
 VALUE
 Pixel_blue(VALUE self)
 {
-    IMPLEMENT_ATTR_READER(Pixel, blue, int);
+    IMPLEMENT_TYPED_ATTR_READER(Pixel, blue, int, &rm_pixel_data_type);
 }
 
 /**
@@ -77,7 +101,7 @@ VALUE
 Pixel_alpha(VALUE self)
 {
     Pixel *pixel;
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 #if defined(IMAGEMAGICK_7)
     return C_int_to_R_int(pixel->alpha);
 #else
@@ -102,7 +126,7 @@ Pixel_red_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->red = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -126,7 +150,7 @@ Pixel_green_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->green = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -150,7 +174,7 @@ Pixel_blue_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->blue = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -172,9 +196,9 @@ VALUE
 Pixel_alpha_eq(VALUE self, VALUE v)
 {
     Pixel *pixel;
- 
+
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 #if defined(IMAGEMAGICK_7)
     pixel->alpha = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
@@ -198,7 +222,7 @@ Pixel_cyan(VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     return INT2NUM(pixel->red);
 }
 
@@ -219,7 +243,7 @@ Pixel_cyan_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->red = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -236,7 +260,7 @@ Pixel_magenta(VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     return INT2NUM(pixel->green);
 }
 
@@ -257,7 +281,7 @@ Pixel_magenta_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->green = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -274,7 +298,7 @@ Pixel_yellow(VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     return INT2NUM(pixel->blue);
 }
 
@@ -295,7 +319,7 @@ Pixel_yellow_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->blue = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -312,7 +336,7 @@ Pixel_black(VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     return INT2NUM(pixel->black);
 }
 
@@ -333,7 +357,7 @@ Pixel_black_eq(VALUE self, VALUE v)
     Pixel *pixel;
 
     rb_check_frozen(self);
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->black = APP2QUANTUM(v);
     rb_funcall(self, rm_ID_changed, 0);
     rb_funcall(self, rm_ID_notify_observers, 1, self);
@@ -376,13 +400,13 @@ Color_to_PixelColor(PixelColor *pp, VALUE color)
     if (CLASS_OF(color) == Class_Pixel)
     {
         memset(pp, 0, sizeof(*pp));
-        Data_Get_Struct(color, Pixel, pixel);
+        TypedData_Get_Struct(color, Pixel, &rm_pixel_data_type, pixel);
         pp->red     = pixel->red;
         pp->green   = pixel->green;
         pp->blue    = pixel->blue;
 #if defined(IMAGEMAGICK_7)
-        pp->alpha   = pixel->alpha;
         pp->black   = pixel->black;
+        rm_set_pixelinfo_alpha(pp, pixel->alpha);
 #else
         pp->opacity = pixel->opacity;
 #endif
@@ -415,7 +439,7 @@ Color_to_Pixel(Pixel *pp, VALUE color)
     {
         Pixel *pixel;
 
-        Data_Get_Struct(color, Pixel, pixel);
+        TypedData_Get_Struct(color, Pixel, &rm_pixel_data_type, pixel);
         memcpy(pp, pixel, sizeof(Pixel));
     }
     else
@@ -474,7 +498,7 @@ Pixel_alloc(VALUE class)
 
     pixel = ALLOC(Pixel);
     memset(pixel, '\0', sizeof(Pixel));
-    return Data_Wrap_Struct(class, NULL, destroy_Pixel, pixel);
+    return TypedData_Wrap_Struct(class, &rm_pixel_data_type, pixel);
 }
 
 
@@ -492,8 +516,8 @@ Pixel_case_eq(VALUE self, VALUE other)
     {
         Pixel *this, *that;
 
-        Data_Get_Struct(self, Pixel, this);
-        Data_Get_Struct(other, Pixel, that);
+        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
@@ -547,7 +571,7 @@ Pixel_dup(VALUE self)
 
     pixel = ALLOC(Pixel);
     memset(pixel, '\0', sizeof(Pixel));
-    dup = Data_Wrap_Struct(CLASS_OF(self), NULL, destroy_Pixel, pixel);
+    dup = TypedData_Wrap_Struct(CLASS_OF(self), &rm_pixel_data_type, pixel);
     RB_GC_GUARD(dup);
 
     return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
@@ -785,7 +809,7 @@ Pixel_from_MagickPixel(const MagickPixel *pp)
 #endif
     pixel->black   = pp->index;
 
-    return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
+    return TypedData_Wrap_Struct(Class_Pixel, &rm_pixel_data_type, pixel);
 }
 
 
@@ -817,7 +841,7 @@ Pixel_from_PixelPacket(const PixelPacket *pp)
     pixel->black   = 0;
 #endif
 
-    return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
+    return TypedData_Wrap_Struct(Class_Pixel, &rm_pixel_data_type, pixel);
 }
 
 
@@ -849,7 +873,7 @@ Pixel_from_PixelColor(const PixelColor *pp)
     pixel->black   = 0;
 #endif
 
-    return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
+    return TypedData_Wrap_Struct(Class_Pixel, &rm_pixel_data_type, pixel);
 }
 
 
@@ -864,7 +888,7 @@ Pixel_hash(VALUE self)
     Pixel *pixel;
     unsigned int hash;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
     hash  = ScaleQuantumToChar(pixel->red)   << 24;
     hash += ScaleQuantumToChar(pixel->green) << 16;
@@ -892,8 +916,8 @@ Pixel_init_copy(VALUE self, VALUE orig)
 {
     Pixel *copy, *original;
 
-    Data_Get_Struct(orig, Pixel, original);
-    Data_Get_Struct(self, Pixel, copy);
+    TypedData_Get_Struct(orig, Pixel, &rm_pixel_data_type, original);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, copy);
 
     *copy = *original;
 
@@ -916,7 +940,7 @@ Pixel_initialize(int argc, VALUE *argv, VALUE self)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
 #if defined(IMAGEMAGICK_7)
     pixel->alpha = OpaqueAlpha;
@@ -972,7 +996,7 @@ Pixel_intensity(VALUE self)
     Pixel *pixel;
     Quantum intensity;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
     intensity = ROUND_TO_QUANTUM((0.299*pixel->red)
                                 + (0.587*pixel->green)
@@ -993,7 +1017,7 @@ Pixel_marshal_dump(VALUE self)
     Pixel *pixel;
     VALUE dpixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     dpixel = rb_hash_new();
     rb_hash_aset(dpixel, CSTR2SYM("red"), QUANTUM2NUM(pixel->red));
     rb_hash_aset(dpixel, CSTR2SYM("green"), QUANTUM2NUM(pixel->green));
@@ -1021,7 +1045,7 @@ Pixel_marshal_load(VALUE self, VALUE dpixel)
 {
     Pixel *pixel;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     pixel->red = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("red")));
     pixel->green = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("green")));
     pixel->blue = NUM2QUANTUM(rb_hash_aref(dpixel, CSTR2SYM("blue")));
@@ -1045,8 +1069,8 @@ Pixel_spaceship(VALUE self, VALUE other)
 {
     Pixel *this, *that;
 
-    Data_Get_Struct(self, Pixel, this);
-    Data_Get_Struct(other, Pixel, that);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, this);
+    TypedData_Get_Struct(other, Pixel, &rm_pixel_data_type, that);
 
     if (this->red != that->red)
     {
@@ -1093,7 +1117,7 @@ Pixel_to_hsla(VALUE self)
     Pixel *pixel;
     VALUE hsla;
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
     ConvertRGBToHSL(pixel->red, pixel->green, pixel->blue, &hue, &sat, &lum);
     hue *= 360.0;
@@ -1218,7 +1242,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 to 2)", argc);
     }
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
 
     info = CloneImageInfo(NULL);
     image = rm_acquire_image(info);
@@ -1284,7 +1308,7 @@ Pixel_to_s(VALUE self)
     Pixel *pixel;
     char buff[100];
 
-    Data_Get_Struct(self, Pixel, pixel);
+    TypedData_Get_Struct(self, Pixel, &rm_pixel_data_type, pixel);
     snprintf(buff, sizeof(buff), "red=" QuantumFormat ", green=" QuantumFormat ", blue=" QuantumFormat ", alpha=" QuantumFormat,
             pixel->red, pixel->green, pixel->blue,
 #if defined(IMAGEMAGICK_7)

data/ext/RMagick/rmstruct.c

@@ -285,7 +285,7 @@ Export_ColorInfo(ColorInfo *ci, VALUE st)
         ci->color.green = (MagickRealType) pixel.green;
         ci->color.blue = (MagickRealType) pixel.blue;
 #if defined(IMAGEMAGICK_7)
-        ci->color.alpha = (MagickRealType) OpaqueAlpha;
+        rm_set_pixelinfo_alpha(&ci->color, (MagickRealType) OpaqueAlpha);
 #else
         ci->color.opacity = (MagickRealType) OpaqueOpacity;
 #endif
@@ -672,10 +672,10 @@ Import_RectangleInfo(RectangleInfo *rect)
     VALUE height;
     VALUE x, y;
 
-    width  = UINT2NUM(rect->width);
-    height = UINT2NUM(rect->height);
-    x      = INT2NUM(rect->x);
-    y      = INT2NUM(rect->y);
+    width  = ULONG2NUM(rect->width);
+    height = ULONG2NUM(rect->height);
+    x      = LONG2NUM(rect->x);
+    y      = LONG2NUM(rect->y);
 
     RB_GC_GUARD(width);
     RB_GC_GUARD(height);
@@ -760,7 +760,7 @@ Import_SegmentInfo(SegmentInfo *segment)
     RB_GC_GUARD(y1);
     RB_GC_GUARD(x2);
     RB_GC_GUARD(y2);
-    
+
     return rb_funcall(Class_Segment, rm_ID_new, 4, x1, y1, x2, y2);
 }
 

data/ext/RMagick/rmutil.c

@@ -22,6 +22,9 @@ static VALUE rescue_not_str(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
 
 
+DEFINE_GVL_STUB5(CloneImage, const Image *, const size_t, const size_t, const MagickBooleanType, ExceptionInfo *);
+
+
 /**
  * ImageMagick safe version of malloc.
  *
@@ -269,7 +272,7 @@ rm_check_destroyed(VALUE obj)
 {
     Image *image;
 
-    Data_Get_Struct(obj, Image, image);
+    TypedData_Get_Struct(obj, Image, &rm_image_data_type, image);
     if (!image)
     {
         rb_raise(Class_DestroyedImageError, "destroyed image");
@@ -780,7 +783,7 @@ rm_write_temp_image(Image *image, char *temp_name, size_t temp_name_l)
     snprintf(temp_name, temp_name_l, "mpri:%d", id);
 
     // Omit "mpri:" from filename to form the key
-    okay = SetImageRegistry(ImageRegistryType, temp_name+5, image, exception);
+    okay = (MagickBooleanType)SetImageRegistry(ImageRegistryType, temp_name+5, image, exception);
     CHECK_EXCEPTION();
     DestroyExceptionInfo(exception);
     if (!okay)
@@ -858,6 +861,25 @@ rm_magick_error(const char *msg)
     RB_GC_GUARD(mesg);
 }
 
+#if defined(IMAGEMAGICK_7)
+/**
+ * Sets the alpha channel of a pixel color
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param pixel the Pixel
+ * @param value the value
+ */
+void
+rm_set_pixelinfo_alpha(PixelInfo *pixel, const MagickRealType value)
+{
+    pixel->alpha = value;
+    if (value != (MagickRealType) OpaqueAlpha)
+    {
+        pixel->alpha_trait = BlendPixelTrait;
+    }
+}
+#endif
 
 /**
  * Initialize a new ImageMagickError object - store the "loc" string in the
@@ -1006,14 +1028,7 @@ rm_get_optional_arguments(VALUE img)
         argv[0] = img;
         opt_args = rb_class_new_instance(1, argv, optional_method_arguments);
 
-        if (rb_proc_arity(rb_block_proc()) == 0)
-        {
-            rb_obj_instance_eval(0, NULL, opt_args);
-        }
-        else
-        {
-            rb_yield(opt_args);
-        }
+        rb_yield(opt_args);
     }
 
     RB_GC_GUARD(optional_method_arguments);
@@ -1253,7 +1268,7 @@ void rm_sync_image_options(Image *image, Info *info)
 /**
  * Replicate old (ImageMagick < 6.3.2) EXIF:* functionality using
  * GetImageProperty by returning the exif entries as a single string, separated
- * by \n's.  Do this so that RMagick.rb works no matter which version of
+ * by \n's.  Do this so that RMagick works no matter which version of
  * ImageMagick is in use.
  *
  * No Ruby usage (internal function)
@@ -1372,7 +1387,7 @@ rm_exif_by_entry(Image *image)
 /**
  * Replicate old (ImageMagick < 6.3.2) EXIF:! functionality using
  * GetImageProperty by returning the exif entries as a single string, separated
- * by \n's. Do this so that RMagick.rb works no matter which version of
+ * by \n's. Do this so that RMagick works no matter which version of
  * ImageMagick is in use.
  *
  * No Ruby usage (internal function)
@@ -1506,7 +1521,8 @@ rm_clone_image(Image *image)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-    clone = CloneImage(image, 0, 0, MagickTrue, exception);
+    GVL_STRUCT_TYPE(CloneImage) args = { image, 0, 0, MagickTrue, exception };
+    clone = (Image *)CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CloneImage), &args);
     if (!clone)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
@@ -1518,64 +1534,6 @@ rm_clone_image(Image *image)
 }
 
 
-/**
- * SetImage(Info)ProgressMonitor exit.
- *
- * No Ruby usage (internal function)
- *
- * Notes:
- *   - ImageMagick's "tag" argument is unused. We pass along the method name
- *     instead.
- *
- * @param tag ImageMagick argument (unused)
- * @param of the offset type
- * @param sp the size type
- * @param client_data pointer to the progress method to call
- * @return true if calling client_data returns a non-nil value, otherwise false
- */
-MagickBooleanType
-rm_progress_monitor(
-    const char *tag ATTRIBUTE_UNUSED,
-    const MagickOffsetType of,
-    const MagickSizeType sp,
-    void *client_data)
-{
-    VALUE rval;
-    VALUE method, offset, span;
-
-    // Check running thread.
-    if (rm_current_thread_id() != rm_main_thread_id)
-    {
-        // ImageMagick might call back in a different thread than Ruby is running in.
-        // If it is a different thread, it would not have a Ruby GVL and
-        // it could not retrieve properly Ruby stack.
-
-        // Unfortunately, there is no API available to check if the current thread has a GVL,
-        // so the thread id was checked in here.
-        return MagickTrue;
-    }
-
-#if defined(HAVE_LONG_LONG)     // defined in Ruby's defines.h
-    offset = rb_ll2inum(of);
-    span = rb_ull2inum(sp);
-#else
-    offset = rb_int2big((long)of);
-    span = rb_uint2big((unsigned long)sp);
-#endif
-
-    method = rb_id2str(rb_frame_this_func());
-
-    rval = rb_funcall((VALUE)client_data, rm_ID_call, 3, method, offset, span);
-
-    RB_GC_GUARD(rval);
-    RB_GC_GUARD(method);
-    RB_GC_GUARD(offset);
-    RB_GC_GUARD(span);
-
-    return RTEST(rval) ? MagickTrue : MagickFalse;
-}
-
-
 /**
  * Remove the ImageMagick links between images in an scene sequence.
  *
@@ -1881,20 +1839,3 @@ rm_raise_exception(ExceptionInfo *exception)
 
     rm_magick_error(msg);
 }
-
-/**
- * Get current thread id.
- *
- * No Ruby usage (internal function)
- *
- * @return thread id
- */
-unsigned long long
-rm_current_thread_id()
-{
-#if defined(_WIN32)
-    return (unsigned long long)GetCurrentThreadId();
-#else
-    return (unsigned long long)pthread_self();
-#endif
-}

data/lib/rmagick/version.rb

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

data/lib/rmagick.rb

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

data/lib/rmagick_internal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # $Id: RMagick.rb,v 1.84 2009/09/15 22:08:41 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2009 by Timothy P. Hunter
@@ -12,7 +14,7 @@ if RUBY_PLATFORM =~ /mingw/i
   begin
     require 'ruby_installer'
     ENV['PATH'].split(File::PATH_SEPARATOR).grep(/ImageMagick/i).each do |path|
-      RubyInstaller::Runtime.add_dll_directory(path)
+      RubyInstaller::Runtime.add_dll_directory(path) if File.exist?(File.join(path, 'CORE_RL_magick_.dll')) || File.exist?(File.join(path, 'CORE_RL_MagickCore_.dll'))
     end
   rescue LoadError
   end
@@ -23,9 +25,6 @@ require 'observer'
 require 'RMagick2.so'
 
 module Magick
-  @formats = nil
-  @trace_proc = nil
-  @exit_block_set_up = nil
   IMAGEMAGICK_VERSION = Magick::Magick_version.split[1].split('-').first
 
   class << self
@@ -53,45 +52,13 @@ module Magick
     #   => {"3FR"=>" r-+", "3G2"=>" r-+", "3GP"=>" r-+", "A"=>"*rw+",
     #   ...
     def formats
-      @formats ||= init_formats
+      formats = init_formats
 
       if block_given?
-        @formats.each { |k, v| yield k, v }
+        formats.each { |k, v| yield k, v }
         self
       else
-        @formats
-      end
-    end
-
-    # If the Magick module attribute +trace_proc+ is set to a Proc object,
-    # RMagick calls the proc whenever an image is created or destroyed.
-    #
-    # You can use this proc to keep track of which images your program has created
-    # and which have been destroyed.
-    #
-    # @param p [Proc] The proc object.
-    #   The following value will be passed into the proc object.
-    #   - +which+ - A symbol that indicates which operation the proc is being called for.
-    #     If the proc is called for an image creation, the value is +:c+.
-    #     If called for an image destruction, the value is +:d+.
-    #   - +description+ - A string describing the image. This is the same string that
-    #     would be returned by calling the image's inspect method.
-    #   - +id+ - A unique identifier for the image. This identifier is not the same as the object's +object_id+.
-    #   - +method+ - The name of the method responsible for creating or destroying the image.
-    #
-    # @example
-    #   Magick.trace_proc = proc do |which, description, id, method|
-    #     ...
-    #   end
-    def trace_proc=(p)
-      m = Mutex.new
-      m.synchronize do
-        if @trace_proc.nil? && !p.nil? && !@exit_block_set_up
-          at_exit { @trace_proc = nil }
-          @exit_block_set_up = true
-        end
-
-        @trace_proc = p
+        formats
       end
     end
   end
@@ -109,7 +76,7 @@ module Magick
   MinimumGeometry  = GeometryValue.new(:MinimumGeometry, 6).freeze
 
   class Geometry
-    FLAGS = ['', '%', '!', '<', '>', '@', '^']
+    FLAGS = ['', '%', '!', '<', '>', '@', '^'].freeze
     RFLAGS = {
       '%' => PercentGeometry,
       '!' => AspectGeometry,
@@ -117,7 +84,7 @@ module Magick
       '>' => GreaterGeometry,
       '@' => AreaGeometry,
       '^' => MinimumGeometry
-    }
+    }.freeze
 
     attr_accessor :width, :height, :x, :y, :flag
 
@@ -173,7 +140,7 @@ module Magick
 
     # Convert object to a geometry string
     def to_s
-      str = ''
+      str = String.new
       if @width > 0
         fmt = @width.truncate == @width ? '%d' : '%.2f'
         str << sprintf(fmt, @width)
@@ -804,12 +771,6 @@ module Magick
     module Post_ObjectData_Descriptor
       Confirmed_ObjectData_Size              = '9:10'
     end
-
-    # Make all constants above immutable
-    constants.each do |record|
-      rec = const_get(record)
-      rec.constants.each { |ds| rec.const_get(ds).freeze }
-    end
   end # module Magick::IPTC
 
   # Ruby-level Magick::Image methods