rmagick 4.0.0 → 4.1.0.rc1

data/ext/RMagick/rmenum.c

@@ -82,6 +82,17 @@ rm_enum_to_cstr(VALUE enum_type)
    return rb_id2name(magick_enum->id);
 }
 
+/**
+ * Free Enum or Enum subclass object
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param magick_enum the enum
+ */
+static void rm_enum_free(void *magick_enum)
+{
+    xfree(magick_enum);
+}
 /**
  * Enum class alloc function.
  *
@@ -96,11 +107,9 @@ Enum_alloc(VALUE class)
    MagickEnum *magick_enum;
    VALUE enumr;
 
-   enumr = Data_Make_Struct(class, MagickEnum, NULL, NULL, magick_enum);
+   enumr = Data_Make_Struct(class, MagickEnum, NULL, rm_enum_free, magick_enum);
    rb_obj_freeze(enumr);
 
-   RB_GC_GUARD(enumr);
-
    return enumr;
 }
 

data/ext/RMagick/rmfill.c

@@ -132,7 +132,11 @@ point_fill(
 
     for (y = 0; y < (ssize_t) image->rows; y++)
     {
+#if defined(IMAGEMAGICK_7)
+        Quantum *row_pixels;
+#else
         PixelPacket *row_pixels;
+#endif
 
         row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
         CHECK_EXCEPTION()
@@ -140,10 +144,20 @@ point_fill(
         for (x = 0; x < (ssize_t) image->columns; x++)
         {
             distance = sqrt((double)((x-x0)*(x-x0)+(y-y0)*(y-y0)));
+
+#if defined(IMAGEMAGICK_7)
+            SetPixelRed(image,   ROUND_TO_QUANTUM(start_color->red   + (distance * red_step)), row_pixels);
+            SetPixelGreen(image, ROUND_TO_QUANTUM(start_color->green + (distance * green_step)), row_pixels);
+            SetPixelBlue(image,  ROUND_TO_QUANTUM(start_color->blue  + (distance * blue_step)), row_pixels);
+            SetPixelAlpha(image, OpaqueAlpha, row_pixels);
+
+            row_pixels += GetPixelChannels(image);
+#else
             row_pixels[x].red     = ROUND_TO_QUANTUM(start_color->red   + (distance * red_step));
             row_pixels[x].green   = ROUND_TO_QUANTUM(start_color->green + (distance * green_step));
             row_pixels[x].blue    = ROUND_TO_QUANTUM(start_color->blue  + (distance * blue_step));
             row_pixels[x].opacity = OpaqueOpacity;
+#endif
         }
 
         SyncAuthenticPixels(image, exception);
@@ -173,9 +187,11 @@ vertical_fill(
 {
     double steps;
     ssize_t x, y;
-    PixelPacket *master;
     MagickRealType red_step, green_step, blue_step;
     ExceptionInfo *exception;
+#if defined(IMAGEMAGICK_6)
+    PixelPacket *master;
+#endif
 
     exception = AcquireExceptionInfo();
 
@@ -193,6 +209,32 @@ vertical_fill(
     green_step = ((MagickRealType)stop_color->green - (MagickRealType)start_color->green) / steps;
     blue_step  = ((MagickRealType)stop_color->blue  - (MagickRealType)start_color->blue)  / steps;
 
+
+#if defined(IMAGEMAGICK_7)
+    for (y = 0; y < (ssize_t) image->rows; y++)
+    {
+        Quantum *row_pixels;
+
+        row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
+        CHECK_EXCEPTION()
+
+        for (x = 0; x < (ssize_t) image->columns; x++)
+        {
+            double distance = fabs(x1 - x);
+            SetPixelRed(image,   ROUND_TO_QUANTUM(start_color->red   + (distance * red_step)), row_pixels);
+            SetPixelGreen(image, ROUND_TO_QUANTUM(start_color->green + (distance * green_step)), row_pixels);
+            SetPixelBlue(image,  ROUND_TO_QUANTUM(start_color->blue  + (distance * blue_step)), row_pixels);
+            SetPixelAlpha(image, OpaqueAlpha, row_pixels);
+
+            row_pixels += GetPixelChannels(image);
+        }
+
+        SyncAuthenticPixels(image, exception);
+        CHECK_EXCEPTION()
+    }
+
+    (void) DestroyExceptionInfo(exception);
+#else
     // All the rows are the same. Make a "master row" and simply copy
     // it to each actual row.
     master = ALLOC_N(PixelPacket, image->columns);
@@ -231,6 +273,7 @@ vertical_fill(
     (void) DestroyExceptionInfo(exception);
 
     xfree((void *) master);
+#endif
 }
 
 /**
@@ -252,9 +295,11 @@ horizontal_fill(
 {
     double steps;
     ssize_t x, y;
-    PixelPacket *master;
     MagickRealType red_step, green_step, blue_step;
     ExceptionInfo *exception;
+#if defined(IMAGEMAGICK_6)
+    PixelPacket *master;
+#endif
 
     exception = AcquireExceptionInfo();
 
@@ -271,6 +316,31 @@ horizontal_fill(
     green_step = ((MagickRealType)stop_color->green - (MagickRealType)start_color->green) / steps;
     blue_step  = ((MagickRealType)stop_color->blue  - (MagickRealType)start_color->blue)  / steps;
 
+#if defined(IMAGEMAGICK_7)
+    for (y = 0; y < (ssize_t) image->rows; y++)
+    {
+        Quantum *row_pixels;
+
+        row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
+        CHECK_EXCEPTION()
+
+        double distance = fabs(y1 - y);
+        for (x = 0; x < (ssize_t) image->columns; x++)
+        {
+            SetPixelRed(image,   ROUND_TO_QUANTUM(start_color->red   + (distance * red_step)), row_pixels);
+            SetPixelGreen(image, ROUND_TO_QUANTUM(start_color->green + (distance * green_step)), row_pixels);
+            SetPixelBlue(image,  ROUND_TO_QUANTUM(start_color->blue  + (distance * blue_step)), row_pixels);
+            SetPixelAlpha(image, OpaqueAlpha, row_pixels);
+
+            row_pixels += GetPixelChannels(image);
+        }
+
+        SyncAuthenticPixels(image, exception);
+        CHECK_EXCEPTION()
+    }
+
+    (void) DestroyExceptionInfo(exception);
+#else
     // All the columns are the same, so make a master column and copy it to
     // each of the "real" columns.
     master = ALLOC_N(PixelPacket, image->rows);
@@ -308,6 +378,7 @@ horizontal_fill(
     (void) DestroyExceptionInfo(exception);
 
     xfree((void *) master);
+#endif
 }
 
 /**
@@ -380,7 +451,11 @@ v_diagonal_fill(
 
     for (y = 0; y < (ssize_t) image->rows; y++)
     {
+#if defined(IMAGEMAGICK_7)
+        Quantum *row_pixels;
+#else
         PixelPacket *row_pixels;
+#endif
 
         row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
         CHECK_EXCEPTION()
@@ -388,10 +463,19 @@ v_diagonal_fill(
         for (x = 0; x < (ssize_t) image->columns; x++)
         {
             double distance = (double) abs((int)(y-(m * x + b)));
+#if defined(IMAGEMAGICK_7)
+            SetPixelRed(image,   ROUND_TO_QUANTUM(start_color->red   + (distance * red_step)), row_pixels);
+            SetPixelGreen(image, ROUND_TO_QUANTUM(start_color->green + (distance * green_step)), row_pixels);
+            SetPixelBlue(image,  ROUND_TO_QUANTUM(start_color->blue  + (distance * blue_step)), row_pixels);
+            SetPixelAlpha(image, OpaqueAlpha, row_pixels);
+
+            row_pixels += GetPixelChannels(image);
+#else
             row_pixels[x].red     = ROUND_TO_QUANTUM(start_color->red   + (distance * red_step));
             row_pixels[x].green   = ROUND_TO_QUANTUM(start_color->green + (distance * green_step));
             row_pixels[x].blue    = ROUND_TO_QUANTUM(start_color->blue  + (distance * blue_step));
             row_pixels[x].opacity = OpaqueOpacity;
+#endif
         }
 
         SyncAuthenticPixels(image, exception);
@@ -473,7 +557,11 @@ h_diagonal_fill(
 
     for (y = 0; y < (ssize_t) image->rows; y++)
     {
+#if defined(IMAGEMAGICK_7)
+        Quantum *row_pixels;
+#else
         PixelPacket *row_pixels;
+#endif
 
         row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
         CHECK_EXCEPTION()
@@ -481,10 +569,19 @@ h_diagonal_fill(
         for (x = 0; x < (ssize_t) image->columns; x++)
         {
             double distance = (double) abs((int)(x-((y-b)/m)));
+#if defined(IMAGEMAGICK_7)
+            SetPixelRed(image,   ROUND_TO_QUANTUM(start_color->red   + (distance * red_step)), row_pixels);
+            SetPixelGreen(image, ROUND_TO_QUANTUM(start_color->green + (distance * green_step)), row_pixels);
+            SetPixelBlue(image,  ROUND_TO_QUANTUM(start_color->blue  + (distance * blue_step)), row_pixels);
+            SetPixelAlpha(image, OpaqueAlpha, row_pixels);
+
+            row_pixels += GetPixelChannels(image);
+#else
             row_pixels[x].red     = ROUND_TO_QUANTUM(start_color->red   + (distance * red_step));
             row_pixels[x].green   = ROUND_TO_QUANTUM(start_color->green + (distance * green_step));
             row_pixels[x].blue    = ROUND_TO_QUANTUM(start_color->blue  + (distance * blue_step));
             row_pixels[x].opacity = OpaqueOpacity;
+#endif
         }
 
         SyncAuthenticPixels(image, exception);
@@ -658,12 +755,22 @@ TextureFill_fill(VALUE self, VALUE image_obj)
 {
     rm_TextureFill *fill;
     Image *image;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     image = rm_check_destroyed(image_obj);
     Data_Get_Struct(self, rm_TextureFill, fill);
 
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    (void) TextureImage(image, fill->texture, exception);
+    CHECK_EXCEPTION()
+    (void) DestroyExceptionInfo(exception);
+#else
     (void) TextureImage(image, fill->texture);
     rm_check_image_exception(image, RetainOnError);
+#endif
 
     return self;
 }

data/ext/RMagick/rmilist.c

@@ -46,6 +46,9 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
     Info *info;
     VALUE info_obj;
     unsigned int delay;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     if (argc == 1)
     {
@@ -73,9 +76,17 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
     }
 
     Data_Get_Struct(info_obj, Info, info);
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    (void) AnimateImages(info, images, exception);
+    rm_split(images);
+    CHECK_EXCEPTION()
+    (void) DestroyExceptionInfo(exception);
+#else
     (void) AnimateImages(info, images);
-    rm_check_image_exception(images, RetainOnError);
     rm_split(images);
+    rm_check_image_exception(images, RetainOnError);
+#endif
 
     RB_GC_GUARD(info_obj);
 
@@ -201,7 +212,9 @@ ImageList_coalesce(VALUE self)
  */
 VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
 {
+#if defined(IMAGEMAGICK_6)
     ChannelType channel;
+#endif
     ColorspaceType colorspace, old_colorspace;
     long len;
     Image *images, *new_image;
@@ -222,6 +235,16 @@ VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
             break;
     }
 
+#if defined(IMAGEMAGICK_7)
+    if (len > 5)
+    {
+        rb_raise(rb_eArgError, "invalid number of images in this image list");
+    }
+    if (len == 5 && colorspace != CMYKColorspace)
+    {
+        rb_raise(rb_eArgError, "invalid number of images in this image list");
+    }
+#else
     channel = RedChannel;
     switch (len)
     {
@@ -248,15 +271,22 @@ VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
             rb_raise(rb_eArgError, "invalid number of images in this image list");
             break;
     }
+#endif
 
     images = images_from_imagelist(self);
+    exception = AcquireExceptionInfo();
+#if defined(IMAGEMAGICK_6)
     old_colorspace = images->colorspace;
     SetImageColorspace(images, colorspace);
-
-    exception = AcquireExceptionInfo();
     new_image = CombineImages(images, channel, exception);
+#else
+    new_image = CombineImages(images, colorspace, exception);
+#endif
+
     rm_split(images);
+#if defined(IMAGEMAGICK_6)
     images->colorspace = old_colorspace;
+#endif
     rm_check_exception(exception, new_image, DestroyOnError);
     (void) DestroyExceptionInfo(exception);
 
@@ -349,7 +379,11 @@ ImageList_deconstruct(VALUE self)
 
     images = images_from_imagelist(self);
     exception = AcquireExceptionInfo();
+#if defined(IMAGEMAGICK_7)
+    new_images = CompareImagesLayers(images, CompareAnyLayer, exception);
+#else
     new_images = DeconstructImages(images, exception);
+#endif
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
     (void) DestroyExceptionInfo(exception);
@@ -375,6 +409,9 @@ ImageList_display(VALUE self)
     Image *images;
     Info *info;
     VALUE info_obj;
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     // Create a new Info object to use with this call
     info_obj = rm_info_new();
@@ -382,10 +419,17 @@ ImageList_display(VALUE self)
 
     // Convert the images array to an images sequence.
     images = images_from_imagelist(self);
-
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    (void) DisplayImages(info, images, exception);
+    rm_split(images);
+    CHECK_EXCEPTION();
+    (void) DestroyExceptionInfo(exception);
+#else
     (void) DisplayImages(info, images);
     rm_split(images);
     rm_check_image_exception(images, RetainOnError);
+#endif
 
     RB_GC_GUARD(info_obj);
 
@@ -626,7 +670,11 @@ ImageList_optimize_layers(VALUE self, VALUE method)
             rm_check_exception(exception, new_images, DestroyOnError);
             // mogrify supports -dither here. We don't.
             GetQuantizeInfo(&quantize_info);
+#if defined(IMAGEMAGICK_7)
+            (void) RemapImages(&quantize_info, new_images, NULL, exception);
+#else
             (void) RemapImages(&quantize_info, new_images, NULL);
+#endif
             break;
         case OptimizePlusLayer:
             new_images = OptimizePlusImageLayers(images, exception);
@@ -634,7 +682,11 @@ ImageList_optimize_layers(VALUE self, VALUE method)
         case CompareAnyLayer:
         case CompareClearLayer:
         case CompareOverlayLayer:
+#if defined(IMAGEMAGICK_7)
+            new_images = CompareImagesLayers(images, mthd, exception);
+#else
             new_images = CompareImageLayers(images, mthd, exception);
+#endif
             break;
         case MosaicLayer:
             new_images = MergeImageLayers(images, mthd, exception);
@@ -914,6 +966,12 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
         case 4:
             quantize_info.tree_depth = (unsigned long)NUM2INT(argv[3]);
         case 3:
+#if defined(IMAGEMAGICK_7)
+            if (rb_obj_is_kind_of(argv[2], Class_DitherMethod))
+            {
+                VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
+            }
+#else
             if (rb_obj_is_kind_of(argv[2], Class_DitherMethod))
             {
                 VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
@@ -923,6 +981,7 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
             {
                 quantize_info.dither = (MagickBooleanType) RTEST(argv[2]);
             }
+#endif
         case 2:
             VALUE_TO_ENUM(argv[1], quantize_info.colorspace, ColorspaceType);
         case 1:
@@ -944,8 +1003,11 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
 
     rm_ensure_result(new_images);
 
-
+#if defined(IMAGEMAGICK_7)
+    (void) QuantizeImages(&quantize_info, new_images, exception);
+#else
     (void) QuantizeImages(&quantize_info, new_images);
+#endif
     rm_check_exception(exception, new_images, DestroyOnError);
     (void) DestroyExceptionInfo(exception);
 
@@ -991,7 +1053,9 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
 {
     Image *images, *remap_image = NULL;
     QuantizeInfo quantize_info;
-
+#if defined(IMAGEMAGICK_7)
+    ExceptionInfo *exception;
+#endif
 
     if (argc > 0 && argv[0] != Qnil)
     {
@@ -1005,7 +1069,9 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
     if (argc > 1)
     {
         VALUE_TO_ENUM(argv[1], quantize_info.dither_method, DitherMethod);
+#if defined(IMAGEMAGICK_6)
         quantize_info.dither = MagickTrue;
+#endif
     }
     if (argc > 2)
     {
@@ -1014,9 +1080,16 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
 
     images = images_from_imagelist(self);
 
-    (void) RemapImages(&quantize_info, images, remap_image);
-    rm_check_image_exception(images, RetainOnError);
+#if defined(IMAGEMAGICK_7)
+    exception = AcquireExceptionInfo();
+    (void) RemapImages(&quantize_info, images, remap_image, exception);
+    rm_split(images);
+    CHECK_EXCEPTION()
+    (void) DestroyExceptionInfo(exception);
+#else
     rm_split(images);
+    rm_check_image_exception(images, RetainOnError);
+#endif
 
     return self;
 }
@@ -1165,7 +1238,9 @@ ImageList_write(VALUE self, VALUE file)
 
     m = GetMagickInfo(info->magick, exception);
     rm_check_exception(exception, images, RetainOnError);
+#if defined(IMAGEMAGICK_6)
     (void) DestroyExceptionInfo(exception);
+#endif
 
     // Tell WriteImage if we want a multi-images file.
     if (imagelist_length(self) > 1L && GetMagickAdjoin(m))
@@ -1176,15 +1251,24 @@ ImageList_write(VALUE self, VALUE file)
     for (img = images; img; img = GetNextImageInList(img))
     {
         rm_sync_image_options(img, info);
+#if defined(IMAGEMAGICK_7)
+        (void) WriteImage(info, img, exception);
+        rm_check_exception(exception, img, RetainOnError);
+#else
         (void) WriteImage(info, img);
         // images will be split before raising an exception
         rm_check_image_exception(images, RetainOnError);
+#endif
         if (info->adjoin)
         {
             break;
         }
     }
 
+#if defined(IMAGEMAGICK_7)
+    (void) DestroyExceptionInfo(exception);
+#endif
+
     rm_split(images);
 
     RB_GC_GUARD(info_obj);