rmagick 2.16.0 → 3.0.0

data/ext/RMagick/rmagick.c

@@ -188,6 +188,7 @@ Magick_init_formats(VALUE class)
                             , rb_str_new2(magick_info[x]->name)
                             , MagickInfo_to_format((const MagickInfo *)magick_info[x]));
     }
+    magick_free((void *)magick_info);
     RB_GC_GUARD(formats);
     return formats;
 }

data/ext/RMagick/rmagick.h

@@ -29,11 +29,7 @@
 #include <sys/types.h>
 #endif
 #include "ruby.h"
-#if defined(HAVE_RUBY_IO_H)
-#include "ruby/io.h"        // >= 1.9.0-5
-#else
-#include "rubyio.h"
-#endif
+#include "ruby/io.h"
 
 
 // Undef Ruby's versions of these symbols
@@ -85,7 +81,7 @@
 
 //! degrees to radians conversion
 #undef DegreesToRadians     // defined in ImageMagick.h in 6.0.2
-#define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0) 
+#define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0)
 
 //! pixel intensity calculation
 #define PIXEL_INTENSITY(q) ((Quantum)(0.299*(q)->red + 0.587*(q)->green + 0.114*(q)->blue + 0.5))
@@ -122,28 +118,6 @@
 #define OpenFile rb_io_t /**< Ruby open file */
 #endif
 
-// These macros are required in 1.9.1 but aren't defined prior to 1.8.6.
-#if !defined(RSTRING_LEN)
-#define RSTRING_LEN(s) (RSTRING((s))->len) /**< Ruby string length */
-#endif
-#if !defined(RSTRING_PTR)
-#define RSTRING_PTR(s) (RSTRING((s))->ptr) /**< Ruby string pointer */
-#endif
-
-// Backport these two macros to 1.8
-#if !defined(RARRAY_LEN)
-#define RARRAY_LEN(a) RARRAY((a))->len /**< Ruby array length */
-#endif
-// Matz says this macro is read-only! (see http://www.ruby-forum.com/topic/146072)
-#if !defined(RARRAY_PTR)
-#define RARRAY_PTR(a) RARRAY((a))->ptr /**< Ruby array pointer */
-#endif
-
-// Backport this macro to 1.8.6
-#if !defined(RB_GC_GUARD)
-#define RB_GC_GUARD(x) (x)
-#endif
-
 //! Convert a C string to a Ruby symbol. Used in marshal_dump/marshal_load methods
 #define CSTR2SYM(s) ID2SYM(rb_intern(s))
 //! Convert a C string to a Ruby String, or nil if the ptr is NULL
@@ -356,6 +330,7 @@ typedef enum _QuantumExpressionOperator
 EXTERN VALUE Module_Magick;
 EXTERN VALUE Class_ImageList;
 EXTERN VALUE Class_Info;
+EXTERN VALUE Class_KernelInfo;
 EXTERN VALUE Class_Draw;
 EXTERN VALUE Class_DrawOptions;
 EXTERN VALUE Class_Image;
@@ -421,6 +396,9 @@ EXTERN VALUE Class_StretchType;
 EXTERN VALUE Class_StyleType;
 EXTERN VALUE Class_WeightType;
 EXTERN VALUE Class_VirtualPixelMethod;
+EXTERN VALUE Class_GeometryFlags;
+EXTERN VALUE Class_MorphologyMethod;
+EXTERN VALUE Class_KernelInfoType;
 
 /**
 *   Commonly-used IDs
@@ -469,7 +447,7 @@ EXTERN ID rm_ID_y;                 /**< "y" */
 */
 //! attribute reader
 #define DCL_ATTR_READER(class, attr) \
-    rb_define_method(Class_##class, #attr, class##_##attr, 0); 
+    rb_define_method(Class_##class, #attr, class##_##attr, 0);
 //! attribute writer
 #define DCL_ATTR_WRITER(class, attr) \
     rb_define_method(Class_##class, #attr "=", class##_##attr##_eq, 1);
@@ -843,6 +821,21 @@ extern VALUE rm_info_new(void);
 extern DisposeType rm_dispose_to_enum(const char *);
 extern GravityType rm_gravity_to_enum(const char *);
 
+// rmkinfo.c
+
+extern VALUE KernelInfo_alloc(VALUE);
+
+extern VALUE KernelInfo_initialize(VALUE, VALUE);
+extern VALUE KernelInfo_zero_nans(VALUE);
+extern VALUE KernelInfo_unity_add(VALUE, VALUE);
+extern VALUE KernelInfo_show(VALUE);
+extern VALUE KernelInfo_scale(VALUE, VALUE, VALUE);
+extern VALUE KernelInfo_scale_geometry(VALUE, VALUE);
+extern VALUE KernelInfo_clone(VALUE);
+
+extern VALUE KernelInfo_builtin(VALUE, VALUE, VALUE);
+
+
 // rmimage.c
 ATTR_WRITER(Image, alpha)
 ATTR_ACCESSOR(Image, background_color)
@@ -954,6 +947,7 @@ extern VALUE Image_compare_channel(int, VALUE *, VALUE);
 extern VALUE Image_channel_depth(int, VALUE *, VALUE);
 extern VALUE Image_channel_extrema(int, VALUE *, VALUE);
 extern VALUE Image_channel_mean(int, VALUE *, VALUE);
+extern VALUE Image_channel_entropy(int, VALUE *, VALUE);
 extern VALUE Image_charcoal(int, VALUE *, VALUE);
 extern VALUE Image_chop(VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_clone(VALUE);
@@ -977,6 +971,8 @@ extern VALUE Image_contrast(int, VALUE *, VALUE);
 extern VALUE Image_contrast_stretch_channel(int, VALUE *, VALUE);
 extern VALUE Image_convolve(VALUE, VALUE, VALUE);
 extern VALUE Image_convolve_channel(int, VALUE *, VALUE);
+extern VALUE Image_morphology(VALUE, VALUE, VALUE, VALUE);
+extern VALUE Image_morphology_channel(VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_copy(VALUE);
 extern VALUE Image_crop(int, VALUE *, VALUE);
 extern VALUE Image_crop_bang(int, VALUE *, VALUE);
@@ -1197,6 +1193,7 @@ extern VALUE  Enum_initialize(VALUE, VALUE, VALUE);
 extern VALUE  Enum_to_s(VALUE);
 extern VALUE  Enum_to_i(VALUE);
 extern VALUE  Enum_spaceship(VALUE, VALUE);
+extern VALUE  Enum_bitwise_or(VALUE, VALUE);
 extern VALUE  Enum_case_eq(VALUE, VALUE);
 extern VALUE  Enum_type_initialize(VALUE, VALUE, VALUE);
 extern VALUE  Enum_type_each(VALUE);

data/ext/RMagick/rmdraw.c

@@ -670,13 +670,6 @@ Draw_marshal_load(VALUE self, VALUE ddraw)
 
     Data_Get_Struct(self, Draw, draw);
 
-    draw->info = magick_malloc(sizeof(DrawInfo));
-    if (!draw->info)
-    {
-        rb_raise(rb_eNoMemError, "not enough memory to continue");
-    }
-    GetDrawInfo(NULL, draw->info);
-
     OBJ_TO_MAGICK_STRING(draw->info->geometry, rb_hash_aref(ddraw, CSTR2SYM("geometry")));
 
     //val = rb_hash_aref(ddraw, CSTR2SYM("viewbox"));
@@ -1727,7 +1720,7 @@ DrawOptions_initialize(VALUE self)
     Draw *draw_options;
 
     Data_Get_Struct(self, Draw, draw_options);
-    draw_options->info = magick_malloc(sizeof(DrawInfo));
+    draw_options->info = AcquireDrawInfo();
     if (!draw_options->info)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
@@ -1804,6 +1797,8 @@ PolaroidOptions_initialize(VALUE self)
     (void) QueryColorDatabase("gray75", &draw->shadow_color, exception);
     CHECK_EXCEPTION()
     (void) QueryColorDatabase("#dfdfdf", &draw->info->border_color, exception);
+    CHECK_EXCEPTION()
+    DestroyExceptionInfo(exception);
 
     if (rb_block_given_p())
     {
@@ -1935,8 +1930,6 @@ get_type_metrics(
                 VALUE self,
                 get_type_metrics_func_t getter)
 {
-    static char attrs[] = "OPbcdefghiklmnopqrstuwxyz[@#%";
- #define ATTRS_L ((int)(sizeof(attrs)-1))
     Image *image;
     Draw *draw;
     VALUE t;
@@ -1950,34 +1943,6 @@ get_type_metrics(
     {
         case 1:                   // use default image
             text = rm_str2cstr(argv[0], &text_l);
-
-            for (x = 0; x < text_l-1; x++)
-            {
-                // Ensure text string doesn't refer to image attributes.
-                if (text[x] == '%')
-                {
-                    int y;
-                    char spec = text[x+1];
-
-                    if (spec == '%')
-                    {
-                        x++;
-                    }
-                    else
-                    {
-                        for (y = 0; y < ATTRS_L; y++)
-                        {
-                            if (spec == attrs[y])
-                            {
-                                rb_raise(rb_eArgError,
-                                         "text string contains image attribute reference `%%%c'",
-                                         spec);
-                            }
-                        }
-                    }
-                }
-            }
-
             Data_Get_Struct(get_dummy_tm_img(CLASS_OF(self)), Image, image);
             break;
         case 2:

data/ext/RMagick/rmenum.c

@@ -198,6 +198,42 @@ Enum_spaceship(VALUE self, VALUE other)
     return INT2FIX(0);
 }
 
+/**
+ * Bitwise OR for enums
+ * 
+ * Ruby usage:
+ *   - @verbatim Enum1 | Enum2 @endverbatim
+ * 
+ * Notes:
+ *   - Enums must be instances of the same class.
+ *
+ * @param Enum1 this object
+ * @param Enum2 another enum
+ * @return new Enum instance
+ */
+VALUE
+Enum_bitwise_or(VALUE self, VALUE another)
+{
+  VALUE new_enum, cls;
+  MagickEnum *this, *that, *new_enum_data;
+
+  cls = CLASS_OF(self);
+  if (CLASS_OF(another) != cls)
+  {
+    rb_raise(rb_eArgError, "Expected class %s but got %s", rb_class2name(cls), rb_class2name(CLASS_OF(another)));
+  }
+
+  new_enum = Enum_alloc(cls);
+
+  Data_Get_Struct(self, MagickEnum, this);
+  Data_Get_Struct(another, MagickEnum, that);
+  Data_Get_Struct(new_enum, MagickEnum, new_enum_data);
+
+  new_enum_data->id = rb_to_id(rb_sprintf("%s|%s", rb_id2name(this->id), rb_id2name(that->id)));
+  new_enum_data->val = this->val | that->val;
+
+  return new_enum;
+}
 
 /**
  * Return the name of an enum.

data/ext/RMagick/rmimage.c

@@ -2328,6 +2328,62 @@ Image_channel_mean(int argc, VALUE *argv, VALUE self)
     return ary;
 }
 
+/**
+ * Return an array of the entropy for the channel.
+ *
+ * Ruby usage:
+ *   - @verbatim Image#channel_entropy @endverbatim
+ *   - @verbatim Image#channel_entropy(channel) @endverbatim
+ *
+ * Notes:
+ *   - Default channel is AllChannels
+ *
+ * @param argc number of input arguments
+ * @param argv array of input arguments
+ * @param self this object
+ * @return an array [mean, std. deviation]
+ */
+VALUE
+Image_channel_entropy(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_GETIMAGECHANNELENTROPY)
+    Image *image;
+    ChannelType channels;
+    ExceptionInfo *exception;
+    double entropy;
+    VALUE ary;
+
+    image = rm_check_destroyed(self);
+
+    channels = extract_channels(&argc, argv);
+
+    // Ensure all arguments consumed.
+    if (argc > 0)
+    {
+        raise_ChannelType_error(argv[argc-1]);
+    }
+
+    exception = AcquireExceptionInfo();
+    (void) GetImageChannelEntropy(image, channels, &entropy, exception);
+    CHECK_EXCEPTION()
+
+    (void) DestroyExceptionInfo(exception);
+
+    ary = rb_ary_new2(1);
+    rb_ary_store(ary, 0, rb_float_new(entropy));
+
+    RB_GC_GUARD(ary);
+
+    return ary;
+#else
+    rm_not_implemented();
+    return (VALUE) 0;
+    argc = argc;
+    argv = argv;
+    self = self;
+#endif
+}
+
 
 /**
  * Return a new image that is a copy of the input image with the edges
@@ -3107,6 +3163,7 @@ VALUE Image_combine(int argc, VALUE *argv, VALUE self)
     ReverseImageList(&images);
     new_image = CombineImages(images, channel, exception);
     rm_check_exception(exception, images, RetainOnError);
+    (void) DestroyExceptionInfo(exception);
     rm_split(images);
 
     rm_ensure_result(new_image);
@@ -4119,6 +4176,78 @@ Image_contrast_stretch_channel(int argc, VALUE *argv, VALUE self)
     return rm_image_new(new_image);
 }
 
+/** Apply a user supplied kernel to the image according to the given mophology method.
+ *
+ *  Ruby Usage:
+ *    - @verbatim Image#morphology(method, iterations, kernel) @endverbatim
+ *
+ *  @param self this object
+ *  @param method is one of morphology methods defined by Magick::MorphologyMethod 
+ *  @param iterations apply the operation this many times (or no change).
+ *                    A value of -1 means loop until no change found.
+ *                    How this is applied may depend on the morphology method.
+ *                    Typically this is a value of 1.
+ *  @param kernel morphology kernel to apply
+ */
+
+VALUE
+Image_morphology(VALUE self, VALUE method_v, VALUE iterations, VALUE kernel_v)
+{
+  static VALUE default_channels_const = 0;
+
+  if(!default_channels_const)
+    default_channels_const = rb_const_get(Module_Magick, rb_intern("DefaultChannels"));
+
+  return Image_morphology_channel(self, default_channels_const, method_v, iterations, kernel_v);
+}
+
+/** Apply a user supplied kernel to the image channel according to the given mophology method.
+ *
+ *  Ruby Usage:
+ *    - @verbatim Image#morphology_channel(channel, method, iterations, kernel) @endverbatim
+ *
+ *  @param self this object
+ *  @param channel is a channel type defined by Magick::ChannelType
+ *  @param method is one of morphology methods defined by Magick::MorphologyMethod 
+ *  @param iterations apply the operation this many times (or no change).
+ *                    A value of -1 means loop until no change found.
+ *                    How this is applied may depend on the morphology method.
+ *                    Typically this is a value of 1. 
+ *  @param kernel morphology kernel to apply
+ */
+
+VALUE
+Image_morphology_channel(VALUE self, VALUE channel_v, VALUE method_v, VALUE iterations, VALUE kernel_v)
+{
+  Image *image, *new_image;
+  ExceptionInfo *exception;
+  MorphologyMethod method;
+  ChannelType channel;
+  KernelInfo *kernel;
+
+  VALUE_TO_ENUM(method_v, method, MorphologyMethod);
+  VALUE_TO_ENUM(channel_v, channel, ChannelType);
+  Check_Type(iterations, T_FIXNUM);
+
+  if (TYPE(kernel_v) == T_STRING)
+    kernel_v = rb_class_new_instance(1, &kernel_v, Class_KernelInfo);
+
+  if (!rb_obj_is_kind_of(kernel_v, Class_KernelInfo))
+    rb_raise(rb_eArgError, "expected String or Magick::KernelInfo");
+
+  Data_Get_Struct(kernel_v, KernelInfo, kernel);
+
+  image = rm_check_destroyed(self);
+  exception = AcquireExceptionInfo();
+
+  new_image = MorphologyImageChannel(image, channel, method, NUM2LONG(iterations), kernel, exception);
+  rm_check_exception(exception, new_image, DestroyOnError);
+  DestroyExceptionInfo(exception);
+
+  rm_ensure_result(new_image);
+  return rm_image_new(new_image);
+}
+
 /**
  * Apply a custom convolution kernel to the image.
  *
@@ -6602,7 +6731,7 @@ Image_frame(int argc, VALUE *argv, VALUE self)
  *   - @verbatim Image.from_blob(blob) <{ parm block }> @endverbatim
  *
  * @param class the Ruby Image class (unused)
- * @param blob_arg the blog as a Ruby string
+ * @param blob_arg the blob as a Ruby string
  * @return an array of new images
  */
 VALUE
@@ -7111,6 +7240,7 @@ has_attribute(VALUE self, MagickBooleanType (attr_test)(const Image *, Exception
 
     r = (attr_test)(image, exception);
     CHECK_EXCEPTION()
+    (void) DestroyExceptionInfo(exception);
 
     return r ? Qtrue : Qfalse;
 }
@@ -8931,6 +9061,9 @@ Image_monitor_eq(VALUE self, VALUE monitor)
         (void) SetImageProgressMonitor(image, rm_progress_monitor, (void *)monitor);
     }
 
+#if defined(_WIN32)
+    rb_warn("Image#monitor= does not work on Windows");
+#endif
 
     return self;
 }
@@ -10766,6 +10899,11 @@ rd_image(VALUE class, VALUE file, reader_t reader)
 
         filename = rm_str2cstr(file, &filename_l);
         filename_l = min(filename_l, MaxTextExtent-1);
+        if (filename_l == 0)
+        {
+            rb_raise(rb_eArgError, "invalid path");
+        }
+
         memcpy(info->filename, filename, (size_t)filename_l);
         info->filename[filename_l] = '\0';
         SetImageInfoFile(info, NULL);
@@ -12685,6 +12823,7 @@ Image_sparse_color(int argc, VALUE *argv, VALUE self)
     new_image = SparseColorImage(image, channels, method, nargs, args, exception);
     xfree(args);
     CHECK_EXCEPTION();
+    (void) DestroyExceptionInfo(exception);
     rm_ensure_result(new_image);
 
     RB_GC_GUARD(args);
@@ -12988,6 +13127,9 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg
     long x, y;
     unsigned long cols, rows;
     unsigned int okay;
+#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_GETAUTHENTICPIXELS)
+    ExceptionInfo *exception;
+#endif
 
     image = rm_check_destroyed(self);
 
@@ -13014,14 +13156,12 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg
     // Get a pointer to the pixels. Replace the values with the PixelPackets
     // from the pixels argument.
     {
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_GETAUTHENTICPIXELS)
-        ExceptionInfo *exception;
+#if defined(HAVE_GETAUTHENTICPIXELS)
         exception = AcquireExceptionInfo();
-#endif
 
-#if defined(HAVE_GETAUTHENTICPIXELS)
         pixels = GetAuthenticPixels(image, x, y, cols, rows, exception);
         CHECK_EXCEPTION()
+        DestroyExceptionInfo(exception);
 #else
         pixels = GetImagePixels(image, x, y, cols, rows);
         rm_check_image_exception(image, RetainOnError);
@@ -13036,17 +13176,16 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg
                 pixels[n] = *pixel;
             }
 #if defined(HAVE_SYNCAUTHENTICPIXELS)
+            exception = AcquireExceptionInfo();
+
             SyncAuthenticPixels(image, exception);
             CHECK_EXCEPTION()
+            DestroyExceptionInfo(exception);
 #else
             SyncImagePixels(image);
             rm_check_image_exception(image, RetainOnError);
 #endif
         }
-
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_GETAUTHENTICPIXELS)
-        DestroyExceptionInfo(exception);
-#endif
     }
 
     RB_GC_GUARD(new_pixel);
@@ -15386,6 +15525,23 @@ static void call_trace_proc(Image *image, const char *which)
 }
 
 
+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);
+    return Qnil; /* not reachable */
+}
+
 /**
  * Trace image creation
  *
@@ -15396,7 +15552,7 @@ static void call_trace_proc(Image *image, const char *which)
  */
 void rm_trace_creation(Image *image)
 {
-    call_trace_proc(image, "c");
+    rb_rescue(rm_trace_creation_body, (VALUE)image, rm_trace_creation_handle_exception, (VALUE)image);
 }