rmagick 4.3.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baffdb83618f956f81c5e8bf81873465642c2727f279514d416553b092590086
-  data.tar.gz: 2d65e812017b48d555ad5e0865b24074910f495e2ef94b9c70e9b7a53980acb6
+  metadata.gz: fc51525cc3880511b635e26bf96e54159785ecabc95af81dda6f374f073074f5
+  data.tar.gz: 0f51ed92105011c4d7854946f2cf81c86a6fc5c0fcb48b0bd620e0e6b1f92d01
 SHA512:
-  metadata.gz: 6040c8ff49d8eb0441b4ebd8fe2c30de695c28f95d17f4475851eae564e25383558f6588595b6e21d887c8edf20965b4f4a8587122925be8ffdac702bdecb4af
-  data.tar.gz: 2012804b6a11228f960c89d8b3748e7917a9faa7ea8d717d18327f2ef3c3d390c1e892e9980c9d909d6bdf9a7594a0987c87797872043ab45775443d080b3df2
+  metadata.gz: 9aaca50c60d675aae5e868bf882ad14a544d92586ec02844b4be1a754acac6bac81f4729cf64c14cfe9cb1cfcf0d57b7eaecf179b8ab4097dee94ce44def05c8
+  data.tar.gz: 7279013b8d46a66dae34870f7f2918043a8e0305c0e7b79623b8dd66e3409a7707baf3dfd551c17927fce8718de57be2d170cfb0b7a2d156ee5420e9bcd9a814

data/.rubocop_todo.yml

@@ -182,7 +182,6 @@ Naming/ConstantName:
 # AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
 Naming/FileName:
   Exclude:
-    - 'deprecated/RMagick.rb'
     - 'doc/ex/InitialCoords.rb'
     - 'doc/ex/NewCoordSys.rb'
     - 'doc/ex/OrigCoordSys.rb'

data/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project are documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## RMagick 5.0.0
+
+Improvements
+
+- Improve installer in order to avoid SEGV within pkg-config command (#1359)
+- Clean up the documents and comment in source code referring to something that no longer exist (#1363)
+- Remove deprecated 'tile' attribute in Draw#marshal_dump (#1364)
+- Remove deprecated #instance_eval calling when block was given with Magick::ImageList#montage, Magick::Image::Info.new and more (#1362)
+- Remove deprecated RMagick.rb file (#1361)
+- Remove deprecated Magick.trace_proc= (#1351)
+- Remove deprecated Magick::{Image, Image::Info}#monitor= (#1356)
+
 ## RMagick 4.3.0
 
 Deprecates

data/ext/RMagick/extconf.rb

@@ -9,6 +9,33 @@ module RMagick
     RMAGICK_VERS = ::Magick::VERSION
     MIN_RUBY_VERS = ::Magick::MIN_RUBY_VERSION
 
+    # ImageMagick 6.7 package
+    IM6_7_PACKAGES = ['ImageMagick'].freeze
+
+    # ImageMagick 6.8+ packages
+    IM6_PACKAGES = %w[
+      ImageMagick-6.Q64HDRI
+      ImageMagick-6.Q32HDRI
+      ImageMagick-6.Q16HDRI
+      ImageMagick-6.Q8HDRI
+      ImageMagick-6.Q64
+      ImageMagick-6.Q32
+      ImageMagick-6.Q16
+      ImageMagick-6.Q8
+    ].freeze
+
+    # ImageMagick 7 packages
+    IM7_PACKAGES = %w[
+      ImageMagick-7.Q64HDRI
+      ImageMagick-7.Q32HDRI
+      ImageMagick-7.Q16HDRI
+      ImageMagick-7.Q8HDRI
+      ImageMagick-7.Q64
+      ImageMagick-7.Q32
+      ImageMagick-7.Q16
+      ImageMagick-7.Q8
+    ].freeze
+
     attr_reader :headers
 
     def initialize
@@ -123,31 +150,40 @@ module RMagick
       exit(1)
     end
 
+    def detect_imagemagick_packages(packages)
+      packages.select do |package|
+        system "pkg-config --exists #{package}"
+      end
+    end
+
+    def installed_im6_packages
+      @installed_im6_packages ||= detect_imagemagick_packages(IM6_PACKAGES)
+    end
+
+    def installed_im7_packages
+      @installed_im7_packages ||= detect_imagemagick_packages(IM7_PACKAGES)
+    end
+
     def determine_imagemagick_package
-      packages = `pkg-config --list-all`.scan(/(ImageMagick\-[\.A-Z0-9]+) .*/).flatten
+      packages = [installed_im7_packages, installed_im6_packages].flatten
 
-      # For ancient version of ImageMagick 6 we need a different regex
       if packages.empty?
-        packages = `pkg-config --list-all`.scan(/(ImageMagick) .*/).flatten
+        # ImageMagick 6.7 does not have package file like ImageMagick-6.Q16.pc
+        packages = detect_imagemagick_packages(IM6_7_PACKAGES)
       end
 
       if packages.empty?
         exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find ImageMagick with pkg-config\n"
       end
 
-      if packages.length > 1
-
-        im7_packages = packages.grep(/\AImageMagick-7/)
-
-        if im7_packages.any?
-          checking_for('forced use of ImageMagick 6') do
-            if ENV['USE_IMAGEMAGICK_6']
-              packages -= im7_packages
-              true
-            else
-              packages = im7_packages
-              false
-            end
+      if installed_im6_packages.any? && installed_im7_packages.any?
+        checking_for('forced use of ImageMagick 6') do
+          if ENV['USE_IMAGEMAGICK_6']
+            packages = installed_im6_packages
+            true
+          else
+            packages = installed_im7_packages
+            false
           end
         end
       end

data/ext/RMagick/rmagick.h

@@ -90,8 +90,8 @@
 
 //! Trace new image creation in bang methods
 #define UPDATE_DATA_PTR(_obj_, _new_) \
-    do { (void) rm_trace_creation(_new_);\
-    DATA_PTR(_obj_) = (void *)(_new_);\
+    do { \
+        DATA_PTR(_obj_) = (void *)(_new_); \
     } while(0)
 
 
@@ -396,7 +396,6 @@ EXTERN VALUE Class_KernelInfoType;
 /**
 *   Commonly-used IDs
 */
-EXTERN ID rm_ID_trace_proc;        /**< "@trace_proc" */
 EXTERN ID rm_ID_call;              /**< "call" */
 EXTERN ID rm_ID_changed;           /**< "changed" */
 EXTERN ID rm_ID_cur_image;         /**< "cur_image" */
@@ -411,8 +410,6 @@ EXTERN ID rm_ID_push;              /**< "push" */
 EXTERN ID rm_ID_values;            /**< "values" */
 EXTERN ID rm_ID_width;             /**< "width" */
 
-EXTERN unsigned long long rm_main_thread_id;
-
 #if !defined(min)
 #define min(a, b) ((a)<(b)?(a):(b)) /**< min of two values */
 #endif
@@ -1019,7 +1016,6 @@ extern VALUE Image_write(VALUE, VALUE);
 
 extern VALUE rm_image_new(Image *);
 extern void  rm_image_destroy(void *);
-extern void  rm_trace_creation(Image *);
 
 
 // rmfill.c
@@ -1193,7 +1189,6 @@ typedef enum
 extern void   rm_check_exception(ExceptionInfo *, Image *, ErrorRetention);
 extern void   rm_ensure_result(Image *);
 extern Image *rm_clone_image(Image *);
-extern MagickBooleanType rm_progress_monitor(const char *, const MagickOffsetType, const MagickSizeType, void *);
 extern VALUE  rm_exif_by_entry(Image *);
 extern VALUE  rm_exif_by_number(Image *);
 extern void   rm_get_optional_arguments(VALUE);
@@ -1202,7 +1197,6 @@ extern void   rm_error_handler(const ExceptionType, const char *, const char *);
 extern void   rm_warning_handler(const ExceptionType, const char *, const char *);
 extern MagickBooleanType rm_should_raise_exception(ExceptionInfo *, const ExceptionRetention);
 extern void   rm_raise_exception(ExceptionInfo *);
-extern unsigned long long rm_current_thread_id();
 #if defined(IMAGEMAGICK_6)
 extern void   rm_check_image_exception(Image *, ErrorRetention);
 #endif

data/ext/RMagick/rmdraw.c

@@ -493,31 +493,17 @@ Draw_marshal_dump(VALUE self)
 
     ddraw = rb_hash_new();
 
-    // rb_hash_aset(ddraw, CSTR2SYM("primitive"), MAGICK_STRING_TO_OBJ(draw->info->primitive)); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("geometry"), MAGICK_STRING_TO_OBJ(draw->info->geometry)); set by "text" primitive
-    // rb_hash_aset(ddraw, CSTR2SYM("viewbox"), Import_RectangleInfo(&draw->info->viewbox)); internal
     rb_hash_aset(ddraw, CSTR2SYM("affine"), Import_AffineMatrix(&draw->info->affine));
     rb_hash_aset(ddraw, CSTR2SYM("gravity"), INT2FIX(draw->info->gravity));
     rb_hash_aset(ddraw, CSTR2SYM("fill"), Pixel_from_PixelColor(&draw->info->fill));
     rb_hash_aset(ddraw, CSTR2SYM("stroke"), Pixel_from_PixelColor(&draw->info->stroke));
     rb_hash_aset(ddraw, CSTR2SYM("stroke_width"), rb_float_new(draw->info->stroke_width));
-    // rb_hash_aset(ddraw, CSTR2SYM("gradient"), Qnil);  // not used yet
     rb_hash_aset(ddraw, CSTR2SYM("fill_pattern"), image_to_str(draw->info->fill_pattern));
-    rb_hash_aset(ddraw, CSTR2SYM("tile"), Qnil); // deprecated
     rb_hash_aset(ddraw, CSTR2SYM("stroke_pattern"), image_to_str(draw->info->stroke_pattern));
     rb_hash_aset(ddraw, CSTR2SYM("stroke_antialias"), draw->info->stroke_antialias ? Qtrue : Qfalse);
     rb_hash_aset(ddraw, CSTR2SYM("text_antialias"), draw->info->text_antialias ? Qtrue : Qfalse);
-    // rb_hash_aset(ddraw, CSTR2SYM("fill_rule"), INT2FIX(draw->info->fill_rule)); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("linecap"), INT2FIX(draw->info->linecap));
-    // rb_hash_aset(ddraw, CSTR2SYM("linejoin"), INT2FIX(draw->info->linejoin));
-    // rb_hash_aset(ddraw, CSTR2SYM("miterlimit"), ULONG2NUM(draw->info->miterlimit));
-    // rb_hash_aset(ddraw, CSTR2SYM("dash_offset"), rb_float_new(draw->info->dash_offset));
     rb_hash_aset(ddraw, CSTR2SYM("decorate"), INT2FIX(draw->info->decorate));
-    // rb_hash_aset(ddraw, CSTR2SYM("compose"), INT2FIX(draw->info->compose)); set via "image" primitive
-    // rb_hash_aset(ddraw, CSTR2SYM("text"), MAGICK_STRING_TO_OBJ(draw->info->text)); set via "text" primitive
-    // rb_hash_aset(ddraw, CSTR2SYM("face"), Qnil);  internal
     rb_hash_aset(ddraw, CSTR2SYM("font"), MAGICK_STRING_TO_OBJ(draw->info->font));
-    // rb_hash_aset(ddraw, CSTR2SYM("metrics"), Qnil);   internal
     rb_hash_aset(ddraw, CSTR2SYM("family"), MAGICK_STRING_TO_OBJ(draw->info->family));
     rb_hash_aset(ddraw, CSTR2SYM("style"), INT2FIX(draw->info->style));
     rb_hash_aset(ddraw, CSTR2SYM("stretch"), INT2FIX(draw->info->stretch));
@@ -527,26 +513,17 @@ Draw_marshal_dump(VALUE self)
     rb_hash_aset(ddraw, CSTR2SYM("density"), MAGICK_STRING_TO_OBJ(draw->info->density));
     rb_hash_aset(ddraw, CSTR2SYM("align"), INT2FIX(draw->info->align));
     rb_hash_aset(ddraw, CSTR2SYM("undercolor"), Pixel_from_PixelColor(&draw->info->undercolor));
-    // rb_hash_aset(ddraw, CSTR2SYM("border_color"), Pixel_from_PixelColor(&draw->info->border_color)); Montage and Polaroid
-    // rb_hash_aset(ddraw, CSTR2SYM("server_name"), MAGICK_STRING_TO_OBJ(draw->info->server_name));
-    // rb_hash_aset(ddraw, CSTR2SYM("dash_pattern"), dash_pattern_to_array(draw->info->dash_pattern)); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("clip_mask"), MAGICK_STRING_TO_OBJ(draw->info->clip_mask)); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("bounds"), Import_SegmentInfo(&draw->info->bounds)); internal
     rb_hash_aset(ddraw, CSTR2SYM("clip_units"), INT2FIX(draw->info->clip_units));
 #if defined(IMAGEMAGICK_7)
     rb_hash_aset(ddraw, CSTR2SYM("alpha"), QUANTUM2NUM(draw->info->alpha));
 #else
     rb_hash_aset(ddraw, CSTR2SYM("opacity"), QUANTUM2NUM(draw->info->opacity));
 #endif
-    // rb_hash_aset(ddraw, CSTR2SYM("render"), draw->info->render ? Qtrue : Qfalse); internal
-    // rb_hash_aset(ddraw, CSTR2SYM("element_reference"), Qnil);     // not used yet
-    // rb_hash_aset(ddraw, CSTR2SYM("debug"), draw->info->debug ? Qtrue : Qfalse);
     rb_hash_aset(ddraw, CSTR2SYM("kerning"), rb_float_new(draw->info->kerning));
     rb_hash_aset(ddraw, CSTR2SYM("interword_spacing"), rb_float_new(draw->info->interword_spacing));
 
     // Non-DrawInfo fields
     rb_hash_aset(ddraw, CSTR2SYM("primitives"), draw->primitives);
-    // rb_hash_aset(ddraw, CSTR2SYM("shadow_color"), Pixel_from_PixelColor(&draw->shadow_color)); Polaroid-only
 
     return ddraw;
 }
@@ -565,20 +542,17 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
     VALUE val;
 
     Data_Get_Struct(self, Draw, draw);
-    
+
     if (draw->info == NULL)
     {
         ImageInfo *image_info;
 
         image_info = CloneImageInfo(NULL);
         draw->info = CloneDrawInfo(image_info, (DrawInfo *) NULL);
-        DestroyImageInfo(image_info);        
+        DestroyImageInfo(image_info);
     }
     OBJ_TO_MAGICK_STRING(draw->info->geometry, rb_hash_aref(ddraw, CSTR2SYM("geometry")));
 
-    //val = rb_hash_aref(ddraw, CSTR2SYM("viewbox"));
-    //Export_RectangleInfo(&draw->info->viewbox, val);
-
     val = rb_hash_aref(ddraw, CSTR2SYM("affine"));
     Export_AffineMatrix(&draw->info->affine, val);
 
@@ -853,16 +827,7 @@ VALUE Draw_annotate(
     // allowing the app a chance to modify the object's attributes
     if (rb_block_given_p())
     {
-        if (rb_proc_arity(rb_block_proc()) == 0)
-        {
-            // Run the block in self's context
-            rb_warn("passing a block without an image argument is deprecated");
-            rb_obj_instance_eval(0, NULL, self);
-        }
-        else
-        {
-            rb_yield(self);
-        }
+        rb_yield(self);
     }
 
     // Translate & store in Draw structure
@@ -973,7 +938,7 @@ Draw_clone(VALUE self)
  *   @param image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
  *     imagelist, uses the current image.
  *   @param operator [Magick::CompositeOperator] the operator
- * 
+ *
  * @return [Magick::Draw] self
  */
 VALUE
@@ -1394,16 +1359,7 @@ DrawOptions_initialize(VALUE self)
 
     if (rb_block_given_p())
     {
-        if (rb_proc_arity(rb_block_proc()) == 0)
-        {
-            // Run the block in self's context
-            rb_warn("passing a block without an image argument is deprecated");
-            rb_obj_instance_eval(0, NULL, self);
-        }
-        else
-        {
-            rb_yield(self);
-        }
+        rb_yield(self);
     }
 
     return self;
@@ -1466,16 +1422,7 @@ PolaroidOptions_initialize(VALUE self)
 
     if (rb_block_given_p())
     {
-        if (rb_proc_arity(rb_block_proc()) == 0)
-        {
-            // Run the block in self's context
-            rb_warn("passing a block without an image argument is deprecated");
-            rb_obj_instance_eval(0, NULL, self);
-        }
-        else
-        {
-            rb_yield(self);
-        }
+        rb_yield(self);
     }
 
     return self;

data/ext/RMagick/rmilist.c

@@ -429,7 +429,7 @@ ImageList_flatten_images(VALUE self)
  *   Creates {Magick::ImageList::Montage} object, yields to block
  *   if present in {Magick::ImageList::Montage} object's scope.
  *   @yield [Magick::ImageList::Montage]
- * 
+ *
  * @return [Magick::ImageList] a new image list
  */
 VALUE
@@ -444,17 +444,7 @@ ImageList_montage(VALUE self)
     montage_obj = rm_montage_new();
     if (rb_block_given_p())
     {
-        // Run the block in the instance's context, allowing the app to modify the
-        // object's attributes.
-        if (rb_proc_arity(rb_block_proc()) == 0)
-        {
-            rb_warn("passing a block without an image argument is deprecated");
-            rb_obj_instance_eval(0, NULL, montage_obj);
-        }
-        else
-        {
-            rb_yield(montage_obj);
-        }
+        rb_yield(montage_obj);
     }
 
     Data_Get_Struct(montage_obj, Montage, montage);

data/ext/RMagick/rmimage.c

@@ -63,9 +63,7 @@ static VALUE scale(int, int, VALUE *, VALUE, scaler_t);
 static VALUE threshold_image(int, VALUE *, VALUE, thresholder_t);
 static VALUE xform_image(int, VALUE, VALUE, VALUE, VALUE, VALUE, xformer_t);
 static VALUE array_from_images(Image *);
-static void call_trace_proc(Image *, const char *);
 static VALUE file_arg_rescue(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
-static VALUE rm_trace_creation_handle_exception(VALUE, VALUE) ATTRIBUTE_NORETURN;
 
 static const char *BlackPointCompensationKey = "PROFILE:black-point-compensation";
 
@@ -9190,42 +9188,6 @@ Image_modulate(int argc, VALUE *argv, VALUE self)
 }
 
 
-/**
- * Establish a progress monitor.
- *
- * - A progress monitor is a callable object. Save the monitor proc as the client_data and establish
- *   `progress_monitor' as the monitor exit. When `progress_monitor' is called, retrieve the proc
- *   and call it.
- *
- * @param monitor [Proc] the progress monitor
- * @return [Proc] the given value
- * @example
- *   img.monitor = Proc.new do |method, offset, span|
- *     print "%s is %3.0f%% complete.\n", method, (offset.to_f/span)*100)
- *     true
- *   end
- * @deprecated Magick::Image#monitor= is deprecated. This method will be removed in RMagick 5.0.
- */
-VALUE
-Image_monitor_eq(VALUE self, VALUE monitor)
-{
-    Image *image = rm_check_frozen(self);
-
-    rb_warning("Magick::Image#monitor= is deprecated. This method will be removed in RMagick 5.0.");
-
-    if (NIL_P(monitor))
-    {
-        image->progress_monitor = NULL;
-    }
-    else
-    {
-        SetImageProgressMonitor(image, rm_progress_monitor, (void *)monitor);
-    }
-
-    return monitor;
-}
-
-
 /**
  * Return true if all the pixels in the image have the same red, green, and blue intensities and the
  * intensity is either 0 or {Magick::QuantumRange}.
@@ -9550,8 +9512,6 @@ rm_image_new(Image *image)
 {
     rm_ensure_result(image);
 
-    rm_trace_creation(image);
-
     return Data_Wrap_Struct(Class_Image, NULL, rm_image_destroy, image);
 }
 
@@ -15813,75 +15773,6 @@ raise_ChannelType_error(VALUE arg)
 }
 
 
-
-/**
- * If Magick.trace_proc is not nil, build an argument list and call the proc.
- *
- * No Ruby usage (internal function)
- *
- * @param image the image
- * @param which which operation the proc is being called for
- */
-static void call_trace_proc(Image *image, const char *which)
-{
-    VALUE trace;
-    VALUE trace_args[4];
-
-    if (rb_ivar_defined(Module_Magick, rm_ID_trace_proc) == Qtrue)
-    {
-        trace = rb_ivar_get(Module_Magick, rm_ID_trace_proc);
-        if (!NIL_P(trace))
-        {
-            // Maybe the stack won't get extended until we need the space.
-            char buffer[MaxTextExtent];
-
-            trace_args[0] = ID2SYM(rb_intern(which));
-
-            build_inspect_string(image, buffer, sizeof(buffer));
-            trace_args[1] = rb_str_new2(buffer);
-
-            snprintf(buffer, sizeof(buffer), "%p", (void *)image);
-            trace_args[2] = rb_str_new2(buffer+2);      // don't use leading 0x
-            trace_args[3] = ID2SYM(rb_frame_this_func());
-            rb_funcall2(trace, rm_ID_call, 4, (VALUE *)trace_args);
-        }
-    }
-
-    RB_GC_GUARD(trace);
-}
-
-
-static VALUE
-rm_trace_creation_body(VALUE img)
-{
-    Image *image = (Image *)img;
-    call_trace_proc(image, "c");
-    return Qnil;
-}
-
-static VALUE
-rm_trace_creation_handle_exception(VALUE img, VALUE exc)
-{
-    Image *image = (Image *)img;
-    DestroyImage(image);
-    rb_exc_raise(exc);
-}
-
-/**
- * Trace image creation
- *
- * No Ruby usage (internal function)
- *
- * @param image the image
- * @see call_trace_proc
- */
-void rm_trace_creation(Image *image)
-{
-    rb_rescue(rm_trace_creation_body, (VALUE)image, rm_trace_creation_handle_exception, (VALUE)image);
-}
-
-
-
 /**
  * Destroy an image. Called from GC when all references to the image have gone
  * out of scope.
@@ -15900,7 +15791,6 @@ void rm_image_destroy(void *img)
 
     if (img != NULL)
     {
-        call_trace_proc(image, "d");
         DestroyImage(image);
     }
 }

data/ext/RMagick/rminfo.c

@@ -1554,35 +1554,6 @@ Info_matte_color_eq(VALUE self, VALUE matte_arg)
     return matte_arg;
 }
 
-/**
- * Establish a progress monitor.
- *
- * @param monitor [Proc] the monitor
- * @return [Proc] monitor
- * @see Image#monitor=
- * @deprecated Magick::Image::Info#monitor= is deprecated. This method will be removed in RMagick 5.0.
- */
-VALUE
-Info_monitor_eq(VALUE self, VALUE monitor)
-{
-    Info *info;
-
-    Data_Get_Struct(self, Info, info);
-
-    rb_warning("Magick::Image::Info#monitor= is deprecated. This method will be removed in RMagick 5.0.");
-
-    if (NIL_P(monitor))
-    {
-        info->progress_monitor = NULL;
-    }
-    else
-    {
-        SetImageInfoProgressMonitor(info, rm_progress_monitor, (void *)monitor);
-    }
-
-    return monitor;
-}
-
 /**
  * Get the monochrome value.
  *
@@ -2417,16 +2388,7 @@ Info_initialize(VALUE self)
 {
     if (rb_block_given_p())
     {
-        if (rb_proc_arity(rb_block_proc()) == 0)
-        {
-            // Run the block in self's context
-            rb_warn("passing a block without an image argument is deprecated");
-            rb_obj_instance_eval(0, NULL, self);
-        }
-        else
-        {
-            rb_yield(self);
-        }
+        rb_yield(self);
     }
     return self;
 }

data/ext/RMagick/rmmain.c

@@ -242,13 +242,10 @@ Init_RMagick2(void)
 
     test_Magick_version();
 
-    rm_main_thread_id = rm_current_thread_id();
-
     /*-----------------------------------------------------------------------*/
     /* Create IDs for frequently used methods, etc.                          */
     /*-----------------------------------------------------------------------*/
 
-    rm_ID_trace_proc       = rb_intern("@trace_proc");
     rm_ID_call             = rb_intern("call");
     rm_ID_changed          = rb_intern("changed");
     rm_ID_cur_image        = rb_intern("cur_image");
@@ -358,7 +355,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "matte_color=", Image_matte_color_eq, 1);
     rb_define_method(Class_Image, "mean_error_per_pixel", Image_mean_error_per_pixel, 0);
     rb_define_method(Class_Image, "mime_type", Image_mime_type, 0);
-    rb_define_method(Class_Image, "monitor=", Image_monitor_eq, 1);
     rb_define_method(Class_Image, "montage", Image_montage, 0);
     rb_define_method(Class_Image, "normalized_mean_error", Image_normalized_mean_error, 0);
     rb_define_method(Class_Image, "normalized_maximum_error", Image_normalized_maximum_error, 0);
@@ -620,7 +616,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "write", Image_write, 1);
 
     /*-----------------------------------------------------------------------*/
-    /* Class Magick::ImageList methods (see also RMagick.rb)                 */
+    /* Class Magick::ImageList methods                                       */
     /*-----------------------------------------------------------------------*/
 
     Class_ImageList = rb_define_class_under(Module_Magick, "ImageList", rb_cObject);
@@ -735,8 +731,7 @@ Init_RMagick2(void)
     // include Comparable
     rb_include_module(Class_Pixel, rb_mComparable);
 
-    // Magick::Pixel has 4 constructors: "new" "from_color", "from_hsla",
-    // and the deprecated "from_HSL".
+    // Magick::Pixel has 3 constructors: "new" "from_color", "from_hsla"
     rb_define_alloc_func(Class_Pixel, Pixel_alloc);
     rb_define_singleton_method(Class_Pixel, "from_color", Pixel_from_color, 1);
     rb_define_singleton_method(Class_Pixel, "from_hsla", Pixel_from_hsla, -1);
@@ -878,7 +873,6 @@ Init_RMagick2(void)
     rb_define_method(Class_Info, "label=", Info_label_eq, 1);
     rb_define_method(Class_Info, "matte_color", Info_matte_color, 0);
     rb_define_method(Class_Info, "matte_color=", Info_matte_color_eq, 1);
-    rb_define_method(Class_Info, "monitor=", Info_monitor_eq, 1);
     rb_define_method(Class_Info, "monochrome", Info_monochrome, 0);
     rb_define_method(Class_Info, "monochrome=", Info_monochrome_eq, 1);
     rb_define_method(Class_Info, "number_scenes", Info_number_scenes, 0);
@@ -1852,7 +1846,7 @@ Init_RMagick2(void)
  *
  * Notes:
  *   - Bypass the test by defining the constant RMAGICK_BYPASS_VERSION_TEST to
- *     'true' at the top level, before requiring 'RMagick'
+ *     'true' at the top level, before requiring 'rmagick'
  */
 static void
 test_Magick_version(void)

data/ext/RMagick/rmutil.c

@@ -1025,15 +1025,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_warn("passing a block without an image argument is deprecated");
-            rb_obj_instance_eval(0, NULL, opt_args);
-        }
-        else
-        {
-            rb_yield(opt_args);
-        }
+        rb_yield(opt_args);
     }
 
     RB_GC_GUARD(optional_method_arguments);
@@ -1273,7 +1265,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)
@@ -1392,7 +1384,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)
@@ -1538,64 +1530,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.
  *
@@ -1901,20 +1835,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,5 @@
 module Magick
-  VERSION = '4.3.0'
+  VERSION = '5.0.0'
   MIN_RUBY_VERSION = '2.3.0'
   MIN_IM_VERSION = '6.7.7'
 end

data/lib/rmagick_internal.rb

@@ -24,8 +24,6 @@ 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
@@ -62,39 +60,6 @@ module Magick
         @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
-    #
-    # @deprecated Magick.trace_proc= is deprecated. This method will be removed in RMagick 5.0.
-    def trace_proc=(p)
-      warn 'Magick.trace_proc= is deprecated. This method will be removed in RMagick 5.0.'
-
-      if @trace_proc.nil? && !p.nil? && !@exit_block_set_up
-        at_exit { @trace_proc = nil }
-        @exit_block_set_up = true
-      end
-
-      @trace_proc = p
-    end
   end
 
   # Geometry class and related enum constants

data/rmagick.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   files = tracked_files.reject { |file| file[file_exclusion_regex] }
 
   s.files = files
-  s.require_paths << 'ext' << 'deprecated'
+  s.require_paths << 'ext'
 
   s.extensions = %w[ext/RMagick/extconf.rb]
   s.required_ruby_version = ">= #{Magick::MIN_RUBY_VERSION}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rmagick
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Tim Hunter
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -169,7 +169,6 @@ files:
 - Rakefile
 - before_install_linux.sh
 - before_install_osx.sh
-- deprecated/RMagick.rb
 - ext/RMagick/extconf.rb
 - ext/RMagick/rmagick.c
 - ext/RMagick/rmagick.h
@@ -212,7 +211,6 @@ rdoc_options: []
 require_paths:
 - lib
 - ext
-- deprecated
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/deprecated/RMagick.rb

@@ -1,6 +0,0 @@
-# This file is added to the require_paths in rmagick.gemspec
-# That should be removed as well when this file is removed
-
-warn '[DEPRECATION] requiring "RMagick" is deprecated. Use "rmagick" instead'
-
-require 'rmagick_internal'