rmagick 6.2.0 → 7.0.0

data/ext/RMagick/rmimage.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
- * Image class method definitions for RMagick.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * Image class methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmimage.cpp
- * @version  $Id: rmimage.cpp,v 1.361 2010/05/03 03:34:48 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 #include <signal.h>
@@ -224,6 +223,7 @@ DEFINE_GVL_STUB3(GammaImageChannel, Image *, const ChannelType, const double);
 DEFINE_GVL_STUB5(GaussianBlurImageChannel, const Image *, const ChannelType, const double, const double, ExceptionInfo *);
 DEFINE_GVL_STUB3(GetImageChannelDepth, const Image *, const ChannelType, ExceptionInfo *);
 DEFINE_GVL_STUB6(GetImageChannelDistortion, Image *, const Image *, const ChannelType, const MetricType, double *, ExceptionInfo *);
+DEFINE_GVL_STUB4(GetImageChannelEntropy, const Image *, const ChannelType, double *, ExceptionInfo *);
 DEFINE_GVL_STUB5(GetImageChannelExtrema, const Image *, const ChannelType, size_t *, size_t *, ExceptionInfo *);
 DEFINE_GVL_STUB5(GetImageChannelMean, const Image *, const ChannelType, double *, double *, ExceptionInfo *);
 DEFINE_GVL_STUB2(GetImageClipMask, const Image *, ExceptionInfo *);
@@ -284,10 +284,6 @@ DEFINE_GVL_STUB2(WhiteThresholdImage, Image *, const char *);
 DEFINE_GVL_STUB2(WriteImage, const ImageInfo *, Image *);
 #endif
 
-#if defined(HAVE_GETIMAGECHANNELENTROPY)
-DEFINE_GVL_STUB4(GetImageChannelEntropy, const Image *, const ChannelType, double *, ExceptionInfo *);
-#endif
-
 DEFINE_GVL_STUB3(RotationalBlurImage, const Image *, const double, ExceptionInfo *);
 
 #if defined(IMAGEMAGICK_7)
@@ -300,22 +296,15 @@ DEFINE_GVL_STUB4(RotationalBlurImageChannel, const Image *, const ChannelType, c
  *
  * No Ruby usage (internal function)
  *
- * @hash the hash
+ * @kwargs the keyword arguments
  */
 static Quantum
-get_named_alpha_value(VALUE hash)
+get_named_alpha_value(VALUE kwargs)
 {
-    if (TYPE(hash) != T_HASH)
-    {
-        rb_raise(rb_eArgError, "missing keyword: alpha");
-    }
-
-    if (FIX2ULONG(rb_hash_size(hash)) != 1)
-    {
-        rb_raise(rb_eArgError, "wrong number of arguments");
-    }
+    ID keyword_ids[] = { rb_intern("alpha") };
+    VALUE alpha;
 
-    VALUE alpha = rb_hash_aref(hash, ID2SYM(rb_intern("alpha")));
+    rb_get_kwargs(kwargs, keyword_ids, 1, 0, &alpha);
     if (NIL_P(alpha))
     {
         rb_raise(rb_eArgError, "missing keyword: alpha");
@@ -2600,7 +2589,6 @@ Image_channel_mean(int argc, VALUE *argv, VALUE self)
  *
  * @return [Array<Float>] The first element in the array is the average entropy of the selected channels.
  */
-#if defined(HAVE_GETIMAGECHANNELENTROPY) || defined(IMAGEMAGICK_7)
 VALUE
 Image_channel_entropy(int argc, VALUE *argv, VALUE self)
 {
@@ -2641,13 +2629,7 @@ Image_channel_entropy(int argc, VALUE *argv, VALUE self)
 
     return ary;
 }
-#else
-VALUE
-Image_channel_entropy(int argc ATTRIBUTE_UNUSED, VALUE *argv ATTRIBUTE_UNUSED, VALUE self ATTRIBUTE_UNUSED)
-{
-    rm_not_implemented();
-}
-#endif
+
 
 /**
  * Return a new image that is a copy of the input image with the edges highlighted.
@@ -9366,25 +9348,23 @@ Image_matte_flood_fill(int argc, VALUE *argv, VALUE self)
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
+    VALUE color_obj, x_obj, y_obj, method_obj, kwargs;
 
     image = rm_check_destroyed(self);
 
-    if (argc != 5)
-    {
-        rb_raise(rb_eArgError, "wrong number of arguments (%d for 5)", argc);
-    }
+    rb_scan_args(argc, argv, "4:", &color_obj, &x_obj, &y_obj, &method_obj, &kwargs);
 
-    alpha = get_named_alpha_value(argv[4]);
+    alpha = get_named_alpha_value(kwargs);
 
-    Color_to_PixelColor(&target, argv[0]);
-    VALUE_TO_ENUM(argv[3], method, PaintMethod);
+    Color_to_PixelColor(&target, color_obj);
+    VALUE_TO_ENUM(method_obj, method, PaintMethod);
     if (!(method == FloodfillMethod || method == FillToBorderMethod))
     {
         rb_raise(rb_eArgError, "paint method_obj must be FloodfillMethod or "
                  "FillToBorderMethod (%d given)", method);
     }
-    x = NUM2LONG(argv[1]);
-    y = NUM2LONG(argv[2]);
+    x = NUM2LONG(x_obj);
+    y = NUM2LONG(y_obj);
     if ((unsigned long)x > image->columns || (unsigned long)y > image->rows)
     {
         rb_raise(rb_eArgError, "target out of range. %ldx%ld given, image is %" RMIuSIZE "x%" RMIuSIZE "",
@@ -10479,41 +10459,18 @@ Image_paint_transparent(int argc, VALUE *argv, VALUE self)
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
+    VALUE color_obj, invert_obj, fuzz_obj, kwargs;
 
     image = rm_check_destroyed(self);
 
-    // Default fuzz value is image's fuzz attribute.
-    fuzz = image->fuzz;
-    invert = MagickFalse;
+    rb_scan_args(argc, argv, "12:", &color_obj, &invert_obj, &fuzz_obj, &kwargs);
 
-    switch (argc)
+    Color_to_MagickPixel(image, &color, color_obj);
+    invert = (invert_obj != Qnil) ? (MagickBooleanType)RTEST(invert_obj) : MagickFalse;
+    fuzz = (fuzz_obj != Qnil) ? NUM2DBL(fuzz_obj) : image->fuzz;
+    if (RTEST(kwargs))
     {
-        case 4:
-            if (TYPE(argv[argc - 1]) == T_HASH)
-            {
-                fuzz = NUM2DBL(argv[2]);
-            }
-            else
-            {
-                fuzz = NUM2DBL(argv[3]);
-            }
-        case 3:
-            if (TYPE(argv[argc - 1]) == T_HASH)
-            {
-                invert = (MagickBooleanType)RTEST(argv[1]);
-            }
-            else
-            {
-                invert = (MagickBooleanType)RTEST(argv[2]);
-            }
-        case 2:
-            alpha = get_named_alpha_value(argv[argc - 1]);
-        case 1:
-            Color_to_MagickPixel(image, &color, argv[0]);
-            break;
-        default:
-            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 to 4)", argc);
-            break;
+        alpha = get_named_alpha_value(kwargs);
     }
 
     new_image = rm_clone_image(image);
@@ -14215,31 +14172,33 @@ threshold_image(int argc, VALUE *argv, VALUE self, gvl_function_t fp)
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
+    VALUE red_obj, green_obj, blue_obj, kwargs;
 
     image = rm_check_destroyed(self);
 
+    rb_scan_args(argc, argv, "12:", &red_obj, &green_obj, &blue_obj, &kwargs);
     switch (argc)
     {
         case 4:
-            red     = NUM2DBL(argv[0]);
-            green   = NUM2DBL(argv[1]);
-            blue    = NUM2DBL(argv[2]);
-            alpha   = get_named_alpha_value(argv[3]);
+            red     = NUM2DBL(red_obj);
+            green   = NUM2DBL(green_obj);
+            blue    = NUM2DBL(blue_obj);
+            alpha   = get_named_alpha_value(kwargs);
             snprintf(ctarg, sizeof(ctarg), "%f,%f,%f,%f", red, green, blue, QuantumRange - alpha);
             break;
         case 3:
-            red     = NUM2DBL(argv[0]);
-            green   = NUM2DBL(argv[1]);
-            blue    = NUM2DBL(argv[2]);
+            red     = NUM2DBL(red_obj);
+            green   = NUM2DBL(green_obj);
+            blue    = NUM2DBL(blue_obj);
             snprintf(ctarg, sizeof(ctarg), "%f,%f,%f", red, green, blue);
             break;
         case 2:
-            red     = NUM2DBL(argv[0]);
-            green   = NUM2DBL(argv[1]);
+            red     = NUM2DBL(red_obj);
+            green   = NUM2DBL(green_obj);
             snprintf(ctarg, sizeof(ctarg), "%f,%f", red, green);
             break;
         case 1:
-            red     = NUM2DBL(argv[0]);
+            red     = NUM2DBL(red_obj);
             snprintf(ctarg, sizeof(ctarg), "%f", red);
             break;
         default:
@@ -14704,20 +14663,15 @@ Image_transparent(int argc, VALUE *argv, VALUE self)
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
-
+    VALUE color_obj, kwargs;
 
     image = rm_check_destroyed(self);
 
-    switch (argc)
+    rb_scan_args(argc, argv, "1:", &color_obj, &kwargs);
+    Color_to_MagickPixel(image, &color, color_obj);
+    if (RTEST(kwargs))
     {
-        case 2:
-            alpha = get_named_alpha_value(argv[1]);
-        case 1:
-            Color_to_MagickPixel(image, &color, argv[0]);
-            break;
-        default:
-            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
-            break;
+        alpha = get_named_alpha_value(kwargs);
     }
 
     new_image = rm_clone_image(image);
@@ -14773,29 +14727,21 @@ Image_transparent_chroma(int argc, VALUE *argv, VALUE self)
 #if defined(IMAGEMAGICK_7)
     ExceptionInfo *exception;
 #endif
+    VALUE low_obj, high_obj, invert_obj, kwargs;
 
     image = rm_check_destroyed(self);
 
-    switch (argc)
+    rb_scan_args(argc, argv, "21:", &low_obj, &high_obj, &invert_obj, &kwargs);
+
+    Color_to_MagickPixel(image, &low, low_obj);
+    Color_to_MagickPixel(image, &high, high_obj);
+    if (invert_obj != Qnil)
     {
-        case 4:
-            if (TYPE(argv[argc - 1]) == T_HASH)
-            {
-                invert = (MagickBooleanType)RTEST(argv[3]);
-            }
-            else
-            {
-                invert = (MagickBooleanType)RTEST(argv[2]);
-            }
-        case 3:
-            alpha = get_named_alpha_value(argv[argc - 1]);
-        case 2:
-            Color_to_MagickPixel(image, &high, argv[1]);
-            Color_to_MagickPixel(image, &low, argv[0]);
-            break;
-        default:
-            rb_raise(rb_eArgError, "wrong number of arguments (%d for 2, 3 or 4)", argc);
-            break;
+        invert = (MagickBooleanType)RTEST(invert_obj);
+    }
+    if (RTEST(kwargs))
+    {
+        alpha = get_named_alpha_value(kwargs);
     }
 
     new_image = rm_clone_image(image);

data/ext/RMagick/rminfo.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
- * Info class method definitions for RMagick.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * Info class methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rminfo.cpp
- * @version  $Id: rminfo.cpp,v 1.79 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 
@@ -2417,4 +2416,3 @@ Info_initialize(VALUE self)
     }
     return self;
 }
-

data/ext/RMagick/rmkinfo.cpp

@@ -1,12 +1,13 @@
-/************************************************************************//**
- * KernelInfo class definitions for RMagick.
+/**
+ * KernelInfo class methods.
  *
- * Copyright © RMagick Project
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
- * @file rmkinfo.cpp
- * @version $Id: rmkinfo.cpp,v 1.0 2011/11/29 15:33:14 naquad Exp $
- * @author Naquad
- ****************************************************************************/
+ * @file     rmkinfo.cpp
+ * @author   Tim Hunter
+ */
 
 #include "rmagick.h"
 

data/ext/RMagick/rmmain.cpp

@@ -1,15 +1,14 @@
-/**************************************************************************//**
- * Contains all module, class, method declarations. Defines all constants.
- * Contains Magick module methods.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * All module, class, method declarations. Defines all constants.
+ * Magick module methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmmain.cpp
- * @version  $Id: rmmain.cpp,v 1.303 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #define MAIN                        // Define external variables
 #include "rmagick.h"
@@ -209,18 +208,7 @@ static void set_managed_memory(void)
         return;
     }
 
-#if defined(_WIN32)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_9_0)
-    managed_memory_enable(Qtrue);
-#else
-    // Disable managed memory feature with ImageMagick 6.8.x or below because causes crash.
-    // Refer https://ci.appveyor.com/project/mockdeep/rmagick/builds/24706171
-    managed_memory_enable(Qfalse);
-#endif
-#else
-    // Not Windows
     managed_memory_enable(Qtrue);
-#endif
 }
 
 
@@ -1106,12 +1094,8 @@ Init_RMagick2(void)
         ENUMERATOR(YDbDrColorspace)
         ENUMERATORV(XyYColorspace, xyYColorspace)
 #if defined(IMAGEMAGICK_7)
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_0_8)
         ENUMERATOR(LinearGRAYColorspace)
-#endif
-#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_7_0_10)
         ENUMERATOR(JzazbzColorspace)
-#endif
 #elif defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_9_10)
         ENUMERATOR(LinearGRAYColorspace)
 #endif

data/ext/RMagick/rmmontage.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
- * Contains Montage class methods.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * Montage class methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmmontage.cpp
- * @version  $Id: rmmontage.cpp,v 1.5 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 
@@ -471,4 +470,3 @@ rm_montage_new(void)
 {
     return Montage_initialize(Montage_alloc(Class_Montage));
 }
-

data/ext/RMagick/rmpixel.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
- * Contains Pixel class methods.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * Pixel class methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmpixel.cpp
- * @version  $Id: rmpixel.cpp,v 1.7 2009/12/21 10:34:58 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 

data/ext/RMagick/rmstruct.cpp

@@ -1,20 +1,17 @@
-/**************************************************************************//**
- * Contains various Struct class methods.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * Various Struct class methods.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmstruct.cpp
- * @version  $Id: rmstruct.cpp,v 1.5 2009/12/20 02:33:34 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 
 
-
-
 /**
  * Given a C AffineMatrix, create the equivalent AffineMatrix object.
  *
@@ -560,7 +557,7 @@ VALUE
 Import_PointInfo(PointInfo *p)
 {
     return rb_funcall(Class_Point, rm_ID_new, 2,
-                      INT2FIX(p->x), INT2FIX(p->y));
+                      rb_float_new(p->x), rb_float_new(p->y));
 }
 
 
@@ -605,7 +602,7 @@ VALUE
 Import_PrimaryInfo(PrimaryInfo *p)
 {
     return rb_funcall(Class_Primary, rm_ID_new, 3,
-                      INT2FIX(p->x), INT2FIX(p->y), INT2FIX(p->z));
+                      rb_float_new(p->x), rb_float_new(p->y), rb_float_new(p->z));
 }
 
 
@@ -941,4 +938,3 @@ TypeMetric_to_s(VALUE self)
 
     return str;
 }
-

data/ext/RMagick/rmutil.cpp

@@ -1,14 +1,13 @@
-/**************************************************************************//**
- * Utility functions for RMagick.
- *
- * Copyright © 2002 - 2009 by Timothy P. Hunter
+/**
+ * Utility functions.
  *
- * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2002 - 2009 Timothy P. Hunter
+ * Copyright (c) 2009 -      Benjamin Thomas and Omer Bar-or
+ * Copyright (c) 2009 -      RMagick contributors
  *
  * @file     rmutil.cpp
- * @version  $Id: rmutil.cpp,v 1.182 2009/12/21 10:34:58 baror Exp $
  * @author   Tim Hunter
- ******************************************************************************/
+ */
 
 #include "rmagick.h"
 #include <errno.h>
@@ -777,26 +776,6 @@ rm_delete_temp_image(char *temp_name)
 }
 
 
-/**
- * Raise NotImplementedError.
- *
- * No Ruby usage (internal function)
- *
- * Notes:
- *   - Called when a xMagick API is not available.
- *   - Replaces Ruby's rb_notimplement function.
- *
- * @throw NotImpError
- */
-void
-rm_not_implemented(void)
-{
-
-    rb_raise(rb_eNotImpError, "the `%s' method is not supported by ImageMagick "
-            MagickLibVersionText, rb_id2name(rb_frame_this_func()));
-}
-
-
 /**
  * Create a new ImageMagickError object and raise an exception.
  *

data/lib/rmagick/version.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 module Magick
-  VERSION = '6.2.0'
-  MIN_RUBY_VERSION = '3.0.0'
-  MIN_IM_VERSION = '6.8.9'
+  VERSION = '7.0.0'
+  MIN_RUBY_VERSION = '3.2.0'
+  MIN_IM6_VERSION = '6.9.0'
+  MIN_IM7_VERSION = '7.1.0'
 end