rmagick 1.13.0 → 1.14.0

data/ext/RMagick/extconf.rb.in

@@ -6,7 +6,7 @@ require 'mkmf'
 # Pass along Ruby's version number
 VERSION_NUMBER = '0x'+RUBY_VERSION.tr('.','')
 
-$CFLAGS = "-Wall -g @CFLAGS@"
+$CFLAGS = "-Wall @CFLAGS@"
 $CPPFLAGS = "-DRUBY_VERSION=#{VERSION_NUMBER} @CPPFLAGS@"
 
 if RUBY_VERSION >= '1.8.0'

data/ext/RMagick/rmagick.h

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.116 2006/06/28 23:05:31 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.138 2006/09/27 21:26:35 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -74,6 +74,9 @@
 #undef DegreesToRadians     // defined in ImageMagick.h in 6.0.2
 #define DegreesToRadians(x) ((x)*3.14159265358979323846/180.0)
 
+#define PIXEL_INTENSITY(q) \
+        ((Quantum)(0.299*(q)->red + 0.587*(q)->green + 0.114*(q)->blue + 0.5))
+
 #define LMAX(a,b) ((((long)(a))>((long)(b)))?((long)(a)):((long)(b)))
 #define FMAX(a,b) ((((double)(a))>((double)(b)))?((double)(a)):((double)(b)))
 #define FMIN(a,b) ((((double)(a))<=((double)(b)))?((double)(a)):((double)(b)))
@@ -163,6 +166,8 @@ typedef enum _QuantumExpressionOperator
     AndQuantumOperator,
     DivideQuantumOperator,
     LShiftQuantumOperator,
+    MaxQuantumOperator,
+    MinQuantumOperator,
     MultiplyQuantumOperator,
     OrQuantumOperator,
     RShiftQuantumOperator,
@@ -289,6 +294,9 @@ EXTERN VALUE Class_FilterTypes;
 EXTERN VALUE Class_GravityType;
 EXTERN VALUE Class_ImageType;
 EXTERN VALUE Class_InterlaceType;
+#if defined(HAVE_INTERPOLATEPIXELCOLOR)
+EXTERN VALUE Class_InterpolatePixelMethod;
+#endif
 #if defined(HAVE_COMPAREIMAGELAYERS)
 EXTERN VALUE Class_MagickLayerMethod;
 #endif
@@ -545,6 +553,7 @@ ATTR_WRITER(Draw, rotation)
 ATTR_WRITER(Draw, stroke)
 ATTR_WRITER(Draw, stroke_width)
 ATTR_WRITER(Draw, text_antialias)
+ATTR_WRITER(Draw, tile)
 ATTR_WRITER(Draw, undercolor)
 extern VALUE Draw_annotate(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Draw_clone(VALUE);
@@ -601,7 +610,7 @@ extern VALUE ImageList_coalesce(VALUE);
 extern VALUE ImageList_deconstruct(VALUE);
 extern VALUE ImageList_display(VALUE);
 extern VALUE ImageList_flatten_images(VALUE);
-extern VALUE ImageList_map(VALUE, VALUE, VALUE);
+extern VALUE ImageList_map(int, VALUE *, VALUE);
 extern VALUE ImageList_montage(VALUE);
 extern VALUE ImageList_morph(VALUE, VALUE);
 extern VALUE ImageList_mosaic(VALUE);
@@ -657,6 +666,7 @@ ATTR_ACCESSOR(Info, scene)
 ATTR_ACCESSOR(Info, server_name)
 ATTR_ACCESSOR(Info, subimage)
 ATTR_ACCESSOR(Info, subrange)
+ATTR_WRITER(Info, texture)
 ATTR_ACCESSOR(Info, tile)
 ATTR_ACCESSOR(Info, size)
 ATTR_ACCESSOR(Info, units)
@@ -672,6 +682,7 @@ extern VALUE Info_new(VALUE);
 extern VALUE Info_define(int, VALUE *, VALUE);
 extern VALUE Info_aset(VALUE, VALUE, VALUE, VALUE);
 extern VALUE Info_aref(VALUE, VALUE, VALUE);
+extern VALUE Info_channel(int, VALUE *, VALUE);
 extern VALUE Info_undefine(VALUE, VALUE, VALUE);
 extern VALUE Info_initialize(VALUE);
 extern VALUE rm_info_new(void);
@@ -682,12 +693,13 @@ ATTR_ACCESSOR(Image, background_color)
 ATTR_READER(Image, base_columns)
 ATTR_READER(Image, base_filename)
 ATTR_READER(Image, base_rows)
+ATTR_ACCESSOR(Image, bias)
+ATTR_ACCESSOR(Image, black_point_compensation)
 ATTR_ACCESSOR(Image, blur)
 ATTR_ACCESSOR(Image, border_color)
 ATTR_READER(Image, bounding_box)
 ATTR_ACCESSOR(Image, chromaticity)
 ATTR_ACCESSOR(Image, class_type)
-ATTR_WRITER(Image, clip_mask)
 ATTR_ACCESSOR(Image, color_profile)
 ATTR_READER(Image, colors)
 ATTR_ACCESSOR(Image, colorspace)
@@ -712,6 +724,7 @@ ATTR_ACCESSOR(Image, image_type)
 ATTR_ACCESSOR(Image, interlace)
 ATTR_ACCESSOR(Image, iptc_profile)
 ATTR_ACCESSOR(Image, iterations)
+ATTR_ACCESSOR(Image, mask)
 ATTR_ACCESSOR(Image, matte)
 ATTR_ACCESSOR(Image, matte_color)
 ATTR_READER(Image, mean_error_per_pixel)
@@ -725,6 +738,7 @@ ATTR_ACCESSOR(Image, offset)
 ATTR_WRITER(Image, opacity)
 ATTR_ACCESSOR(Image, orientation)
 ATTR_ACCESSOR(Image, page)
+ATTR_ACCESSOR(Image, pixel_interpolation_method)
 ATTR_READER(Image, quality)
 ATTR_READER(Image, quantum_depth)
 ATTR_ACCESSOR(Image, rendering_intent)
@@ -734,11 +748,15 @@ ATTR_ACCESSOR(Image, start_loop)
 ATTR_ACCESSOR(Image, ticks_per_second)
 ATTR_ACCESSOR(Image, tile_info)
 ATTR_READER(Image, total_colors)
+ATTR_ACCESSOR(Image, transparent_color)
 ATTR_ACCESSOR(Image, units)
 ATTR_ACCESSOR(Image, virtual_pixel_method)
 ATTR_ACCESSOR(Image, x_resolution)
 ATTR_ACCESSOR(Image, y_resolution)
 
+extern ChannelType extract_channels(int *, VALUE *);
+extern void raise_ChannelType_error(VALUE);
+
 #if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE Image_alloc(VALUE);
 extern VALUE Image_initialize(int, VALUE *, VALUE);
@@ -747,11 +765,15 @@ extern VALUE Image_new(int, VALUE *, VALUE);
 extern VALUE Image_initialize(VALUE, VALUE, VALUE, VALUE, VALUE);
 #endif
 
+extern VALUE Image_adaptive_blur(int, VALUE *, VALUE);
+extern VALUE Image_adaptive_blur_channel(int, VALUE *, VALUE);
+extern VALUE Image_adaptive_resize(int, VALUE *, VALUE);
 extern VALUE Image_adaptive_sharpen(int, VALUE *, VALUE);
 extern VALUE Image_adaptive_sharpen_channel(int, VALUE *, VALUE);
 extern VALUE Image_adaptive_threshold(int, VALUE *, VALUE);
 extern VALUE Image_add_noise(VALUE, VALUE);
 extern VALUE Image_add_noise_channel(int, VALUE *, VALUE);
+extern VALUE Image_add_profile(VALUE, VALUE);
 extern VALUE Image_affine_transform(VALUE, VALUE);
 extern VALUE Image_aref(VALUE, VALUE);
 extern VALUE Image_aset(VALUE, VALUE, VALUE);
@@ -760,6 +782,7 @@ extern VALUE Image_auto_orient_bang(VALUE);
 extern VALUE Image_properties(VALUE);
 extern VALUE Image_bilevel_channel(int, VALUE *, VALUE);
 extern VALUE Image_black_threshold(int, VALUE *, VALUE);
+extern VALUE Image_blend(int, VALUE *, VALUE);
 extern VALUE Image_blur_image(int, VALUE *, VALUE);
 extern VALUE Image_blur_channel(int, VALUE *, VALUE);
 extern VALUE Image_border(VALUE, VALUE, VALUE, VALUE);
@@ -795,10 +818,13 @@ extern VALUE Image_copy(VALUE);
 extern VALUE Image_crop(int, VALUE *, VALUE);
 extern VALUE Image_crop_bang(int, VALUE *, VALUE);
 extern VALUE Image_cycle_colormap(VALUE, VALUE);
+extern VALUE Image_delete_profile(VALUE, VALUE);
 extern VALUE Image_despeckle(VALUE);
 extern VALUE Image_difference(VALUE, VALUE);
 extern VALUE Image_dispatch(int, VALUE *, VALUE);
+extern VALUE Image_displace(int, VALUE *, VALUE);
 extern VALUE Image_display(VALUE);
+extern VALUE Image_dissolve(int, VALUE *, VALUE);
 extern VALUE Image_distortion_channel(int, VALUE *, VALUE);
 extern VALUE Image__dump(VALUE, VALUE);
 extern VALUE Image_dup(VALUE);
@@ -810,6 +836,7 @@ extern VALUE Image_equalize(VALUE);
 extern VALUE Image_erase_bang(VALUE);
 extern VALUE Image_export_pixels(int, VALUE *, VALUE);
 extern VALUE Image_export_pixels_to_str(int, VALUE *, VALUE);
+extern VALUE Image_find_similar_region(int, VALUE *, VALUE);
 extern VALUE Image_flip(VALUE);
 extern VALUE Image_flip_bang(VALUE);
 extern VALUE Image_flop(VALUE);
@@ -839,7 +866,7 @@ extern VALUE Image_minify(VALUE);
 extern VALUE Image_minify_bang(VALUE);
 extern VALUE Image_modulate(int, VALUE *, VALUE);
 extern VALUE Image_monochrome_q(VALUE);
-extern VALUE Image_motion_blur(VALUE, VALUE, VALUE, VALUE);
+extern VALUE Image_motion_blur(int, VALUE *, VALUE);
 extern VALUE Image_negate(int, VALUE *, VALUE);
 extern VALUE Image_negate_channel(int, VALUE *, VALUE);
 extern VALUE Image_normalize(VALUE);
@@ -869,8 +896,8 @@ extern VALUE Image_reduce_noise(VALUE, VALUE);
 extern VALUE Image_resize(int, VALUE *, VALUE);
 extern VALUE Image_resize_bang(int, VALUE *, VALUE);
 extern VALUE Image_roll(VALUE, VALUE, VALUE);
-extern VALUE Image_rotate(VALUE, VALUE);
-extern VALUE Image_rotate_bang(VALUE, VALUE);
+extern VALUE Image_rotate(int, VALUE *, VALUE);
+extern VALUE Image_rotate_bang(int, VALUE *, VALUE);
 extern VALUE Image_sample(int, VALUE *, VALUE);
 extern VALUE Image_sample_bang(int, VALUE *, VALUE);
 extern VALUE Image_scale(int, VALUE *, VALUE);
@@ -887,6 +914,7 @@ extern VALUE Image_shave_bang(VALUE, VALUE, VALUE);
 extern VALUE Image_shear(VALUE, VALUE, VALUE);
 extern VALUE Image_sigmoidal_contrast_channel(int, VALUE *, VALUE);
 extern VALUE Image_signature(VALUE);
+extern VALUE Image_sketch(int, VALUE *, VALUE);
 extern VALUE Image_solarize(int, VALUE *, VALUE);
 extern VALUE Image_spaceship(VALUE, VALUE);
 extern VALUE Image_splice(int, VALUE *, VALUE);
@@ -911,9 +939,11 @@ extern VALUE Image_transverse(VALUE);
 extern VALUE Image_transverse_bang(VALUE);
 extern VALUE Image_trim(VALUE);
 extern VALUE Image_trim_bang(VALUE);
+extern VALUE Image_unique_colors(VALUE);
 extern VALUE Image_unsharp_mask(int, VALUE *, VALUE);
 extern VALUE Image_unsharp_mask_channel(int, VALUE *, VALUE);
 extern VALUE Image_vignette(int, VALUE *, VALUE);
+extern VALUE Image_watermark(int, VALUE *, VALUE);
 extern VALUE Image_wave(int, VALUE *, VALUE);
 extern VALUE Image_white_threshold(int, VALUE *, VALUE);
 extern VALUE Image_write(VALUE, VALUE);
@@ -991,6 +1021,9 @@ extern VALUE  Pixel_to_s(VALUE);
 extern VALUE  PixelPacket_to_Color_Name(Image *, PixelPacket *);
 extern VALUE  PixelPacket_to_Color_Name_Info(Info *, PixelPacket *);
 extern VALUE  Pixel_from_PixelPacket(PixelPacket *);
+#if defined(HAVE_MAGICKPIXELPACKET)
+extern VALUE  Pixel_from_MagickPixelPacket(MagickPixelPacket *);
+#endif
 
 extern void   Point_to_PointInfo(PointInfo *, VALUE);
 extern VALUE  PointInfo_to_Point(PointInfo *);
@@ -1005,6 +1038,12 @@ extern VALUE  Segment_from_SegmentInfo(SegmentInfo *);
 extern void   AffineMatrix_to_AffineMatrix(AffineMatrix *, VALUE);
 extern void   ChromaticityInfo_to_ChromaticityInfo(ChromaticityInfo *, VALUE);
 extern void   Color_to_ColorInfo(ColorInfo *, VALUE);
+#if defined(HAVE_INTERPOLATEPIXELCOLOR)
+extern VALUE  InterpolatePixelMethod_new(InterpolatePixelMethod);
+#endif
+#if defined(HAVE_IMAGE_ORIENTATION)
+extern VALUE  OrientationType_new(OrientationType);
+#endif
 extern void   PrimaryInfo_to_PrimaryInfo(PrimaryInfo *, VALUE);
 extern void   Rectangle_to_RectangleInfo(RectangleInfo *, VALUE);
 extern void   Segment_to_SegmentInfo(SegmentInfo *, VALUE);
@@ -1016,11 +1055,8 @@ extern VALUE  TypeMetric_from_TypeMetric(TypeMetric *);
 #if defined(HAVE_GETIMAGESTATISTICS)
 extern VALUE  Statistics_new(ImageStatistics *);
 #endif
-#if defined(HAVE_IMAGE_ORIENTATION)
-extern VALUE   OrientationType_new(OrientationType);
-#endif
 extern const char *StorageType_name(StorageType);
-extern VALUE   VirtualPixelMethod_new(VirtualPixelMethod);
+extern VALUE  VirtualPixelMethod_new(VirtualPixelMethod);
 
 #if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
 extern VALUE  Enum_alloc(VALUE);
@@ -1060,6 +1096,7 @@ extern void   rm_not_implemented(void);
 extern void   rm_attr_write(VALUE, VALUE);
 extern void   rm_get_geometry(VALUE, long *, long *, unsigned long *, unsigned long *, int *);
 extern void   rm_split(Image *);
+extern void   rm_magick_error(const char *, const char *);
 
 typedef enum
 {

data/ext/RMagick/rmagick_config.h.in

@@ -1,6 +1,10 @@
 #undef GRAPHICSMAGICK
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_ACQUIREMAGICKMEMORY
+/* Introduced in IM 6.2.8-5 */
+#undef HAVE_ADAPTIVEBLURIMAGECHANNEL
+/* Introduced in IM 6.2.9 */
+#undef HAVE_ADAPTIVERESIZEIMAGE
 /* Introduced in IM 6.2.7 */
 #undef HAVE_ADAPTIVESHARPENIMAGE
 /* Introduced in IM 6.0.0 */
@@ -71,6 +75,8 @@
 #undef HAVE_GETIMAGECHANNELMEAN
 /* Introduced in IM 6.2.0 */
 #undef HAVE_GETIMAGECHANNELDISTORTION
+/* Not available in GM */
+#undef HAVE_GETIMAGECLIPMASK
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_GETIMAGEHISTOGRAM
 /* Introduced in IM 6.1.5 */
@@ -109,6 +115,8 @@
 /* Introduced in IM 6.0.0 - Not available in GM */
 #undef HAVE_INHERITEXCEPTION
 #undef HAVE_INDEXCHANNEL
+/* Introduced in IM 6.2.0 */
+#undef HAVE_IMAGE_BIAS
 /* Introduced in IM 5.5.6 - Not available in GM */
 #undef HAVE_IMAGE_EXTRACT_INFO
 /* Introduced in IM 6.0.0 */
@@ -118,13 +126,21 @@
 #undef HAVE_IMAGEINFO_ORIENTATION
 /* Introduced in IM 6.2.4 */
 #undef HAVE_IMAGE_TICKS_PER_SECOND
+/* Introduced in IM 6.2.9 */
+#undef HAVE_IMAGE_TRANSPARENT_COLOR
+/* Introduced in IM 6.2.0? */
+#undef HAVE_IMAGEINFO_CHANNEL
 /* Introduced in IM 5.5.7, GM 1.1 */
 #undef HAVE_IMPORTIMAGEPIXELS
+/* Introduced in IM 6.2.9 */
+#undef HAVE_INTERPOLATEPIXELCOLOR
 /* Introduced in IM 6.2.6-1 */
 #undef HAVE_INTERPRETIMAGEATTRIBUTES
 #undef HAVE_INTTYPES_H
 /* Introduced in IM 6.2.5 */
 #undef HAVE_ISCOLORSIMILAR
+/* Introduced in IM 6.2.8 */
+#undef HAVE_ISIMAGESIMILAR
 /* Introduced in IM 6.2.2 */
 #undef HAVE_JPEG2000COMPRESSION
 /* Introduced in GM 1.2 */
@@ -138,8 +154,12 @@
 #undef HAVE_MAGICK_UINT64_T
 /* Introduced in IM 6.0.0 */
 #undef HAVE_MAGICKOFFSETTYPE
+/* Only in ImageMagick */
+#undef HAVE_MAGICKPIXELPACKET
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_MAGICKSIZETYPE
+/* Introduced in IM 6.2.0 */
+#undef HAVE_MAXEVALUATEOPERATOR
 #undef HAVE_MEMORY_H
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_NEGATEIMAGECHANNEL
@@ -191,6 +211,8 @@
 #undef HAVE_SHARPENIMAGECHANNEL
 /* Introduced in IM 6.2.1 */
 #undef HAVE_SIGMOIDALCONTRASTIMAGECHANNEL
+/* Introduced in IM 6.2.8 */
+#undef HAVE_SKETCHIMAGE
 #undef HAVE_SNPRINTF
 #undef HAVE_SPLICEIMAGE
 #undef HAVE_STDINT_H
@@ -210,6 +232,8 @@
 #undef HAVE_TRANSVERSEIMAGE
 /* Introduced in IM 6.0.0 */
 #undef HAVE_UNDEFINEDGRAVITY
+/* Introduced in IM 6.2.9 */
+#undef HAVE_UNIQUEIMAGECOLORS
 #undef HAVE_UNISTD_H
 /* Introduced in IM 6.1.0 */
 #undef HAVE_UNSHARPMASKIMAGECHANNEL

data/ext/RMagick/rmdraw.c

@@ -1,4 +1,4 @@
-/* $Id: rmdraw.c,v 1.32 2006/05/07 21:58:32 rmagick Exp $ */
+/* $Id: rmdraw.c,v 1.34 2006/09/01 19:19:20 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmdraw.c
@@ -373,6 +373,36 @@ Draw_text_antialias_eq(VALUE self, VALUE text_antialias)
     return self;
 }
 
+/*
+    Method:     Draw#tile=
+    Purpose:    tile attribute writer
+*/
+VALUE
+Draw_tile_eq(VALUE self, VALUE image)
+{
+    Draw *draw;
+    Image *tile;
+
+    rm_check_frozen(self);
+    Data_Get_Struct(self, Draw, draw);
+
+    if (draw->info->fill_pattern)
+    {
+        DestroyImage(draw->info->fill_pattern);
+        draw->info->fill_pattern = NULL;
+    }
+
+    if (image == Qnil)
+    {
+        return self;
+    }
+
+    Data_Get_Struct(ImageList_cur_image(image), Image, tile);
+    draw->info->fill_pattern = rm_clone_image(tile);
+
+    return self;
+}
+
 /*
     Method:     Draw#undercolor=
     Purpose:    undercolor attribute writer
@@ -445,13 +475,8 @@ VALUE Draw_annotate(
     x      = NUM2LONG(x_arg);
     y      = NUM2LONG(y_arg);
 
-    // If either the width or height is 0, both must be 0.
-    if (width == 0 || height == 0)
+    if (width == 0 && height == 0)
     {
-        if (width != 0 || height != 0)
-        {
-            rb_raise(rb_eArgError, "invalid geometry %lux%lu%+ld%+ld", width, height, x, y);
-        }
         sprintf(geometry_str, "%+ld%+ld", x, y);
     }
 

data/ext/RMagick/rmilist.c

@@ -1,4 +1,4 @@
-/* $Id: rmilist.c,v 1.41 2006/06/20 23:33:07 rmagick Exp $ */
+/* $Id: rmilist.c,v 1.43 2006/08/29 22:33:25 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmilist.c
@@ -23,13 +23,14 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
     Info *info;
     volatile VALUE info_obj;
 
-    // Convert the images array to an images sequence.
-    images = rm_images_from_imagelist(self);
-
     if (argc > 1)
     {
         rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 or 1)", argc);
     }
+
+    // Convert the images array to an images sequence.
+    images = rm_images_from_imagelist(self);
+
     if (argc == 1)
     {
         Image *img;
@@ -174,13 +175,13 @@ ImageList_display(VALUE self)
     Info *info;
     volatile VALUE info_obj;
 
-    // Convert the images array to an images sequence.
-    images = rm_images_from_imagelist(self);
-
     // Create a new Info object to use with this call
     info_obj = rm_info_new();
     Data_Get_Struct(info_obj, Info, info);
 
+    // Convert the images array to an images sequence.
+    images = rm_images_from_imagelist(self);
+
     (void) DisplayImages(info, images);
     rm_split(images);
     rm_check_image_exception(images, RetainOnError);
@@ -215,21 +216,31 @@ ImageList_flatten_images(VALUE self)
 
 
 /*
-    Method:     ImageList#map
+    Method:     ImageList#map(reference, dither=false)
     Purpose:    Call MapImages
     Returns:    a new ImageList with mapped images. @scene is set to self.scene
 */
 VALUE
-ImageList_map(VALUE self, VALUE map_image, VALUE dither_arg)
+ImageList_map(int argc, VALUE *argv, VALUE self)
 {
     Image *images, *new_images = NULL;
     Image *map;
-    unsigned int dither;
-    volatile VALUE image, scene, new_imagelist;
+    unsigned int dither = False;
+    volatile VALUE scene, new_imagelist;
     ExceptionInfo exception;
 
-    image = ImageList_cur_image(map_image);
-    Data_Get_Struct(image, Image, map);
+    switch (argc)
+    {
+        case 2:
+            dither = RTEST(argv[1]);
+        case 1:
+            Data_Get_Struct(ImageList_cur_image(argv[0]), Image, map);
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
+            break;
+    }
+
 
     if (rm_imagelist_length(self) == 0)
     {
@@ -248,7 +259,6 @@ ImageList_map(VALUE self, VALUE map_image, VALUE dither_arg)
     rm_ensure_result(new_images);
 
     // Call ImageMagick
-    dither = !(dither_arg == Qfalse || dither_arg == Qnil);
     (void) MapImages(new_images, map, dither);
     rm_check_image_exception(new_images, DestroyOnError);
 
@@ -337,8 +347,8 @@ ImageList_morph(VALUE self, VALUE nimages)
         rb_raise(rb_eArgError, "number of intervening images must be > 0");
     }
 
-    images = rm_images_from_imagelist(self);
     GetExceptionInfo(&exception);
+    images = rm_images_from_imagelist(self);
     new_images = MorphImages(images, (unsigned long)number_images, &exception);
     rm_split(images);
     rm_check_exception(&exception, new_images, DestroyOnError);
@@ -360,8 +370,8 @@ ImageList_mosaic(VALUE self)
     Image *images, *new_image;
     ExceptionInfo exception;
 
-    images = rm_images_from_imagelist(self);
     GetExceptionInfo(&exception);
+    images = rm_images_from_imagelist(self);
     new_image = MosaicImages(images, &exception);
     rm_split(images);
     rm_check_exception(&exception, new_image, DestroyOnError);
@@ -386,29 +396,34 @@ ImageList_optimize_layers(VALUE self, VALUE method)
     MagickLayerMethod mthd;
     ExceptionInfo exception;
 
-    images = rm_images_from_imagelist(self);
     GetExceptionInfo(&exception);
     VALUE_TO_ENUM(method, mthd, MagickLayerMethod);
+    images = rm_images_from_imagelist(self);
 
     switch (mthd)
     {
 #if defined(HAVE_COALESCELAYER)
-      case CoalesceLayer:
-        new_images = CoalesceImages(images, &exception);
-        break;
-      case DisposeLayer:
-        new_images = DisposeImages(images, &exception);
-        break;
+        case CoalesceLayer:
+            new_images = CoalesceImages(images, &exception);
+            break;
+        case DisposeLayer:
+            new_images = DisposeImages(images, &exception);
+            break;
 #endif
-      case OptimizeLayer:
-        new_images = OptimizeImageLayers(images, &exception);
-        break;
-      case OptimizePlusLayer:
-        new_images = OptimizePlusImageLayers(images, &exception);
-        break;
-      default:
-        new_images = CompareImageLayers(images, mthd, &exception);
-        break;
+        case OptimizeLayer:
+            new_images = OptimizeImageLayers(images, &exception);
+            break;
+        case OptimizePlusLayer:
+            new_images = OptimizePlusImageLayers(images, &exception);
+            break;
+        case CompareAnyLayer:
+        case CompareClearLayer:
+        case CompareOverlayLayer:
+            new_images = CompareImageLayers(images, mthd, &exception);
+            break;
+        default:
+            rb_raise(rb_eArgError, "undefined layer method");
+            break;
     }
 
     rm_split(images);
@@ -631,7 +646,7 @@ ImageList_to_blob(VALUE self)
 
     GetExceptionInfo(&exception);
     (void) SetImageInfo(info, True, &exception);
-    CHECK_EXCEPTION()
+    rm_check_exception(&exception, images, RetainOnError);
 
     if (*info->magick != '\0')
     {
@@ -707,9 +722,6 @@ ImageList_write(VALUE self, VALUE file)
     Data_Get_Struct(info_obj, Info, info);
 
 
-    // Convert the images array to an images sequence.
-    images = rm_images_from_imagelist(self);
-
     if (TYPE(file) == T_FILE)
     {
         OpenFile *fptr;
@@ -731,6 +743,9 @@ ImageList_write(VALUE self, VALUE file)
         SetImageInfoFile(info, NULL);
     }
 
+    // Convert the images array to an images sequence.
+    images = rm_images_from_imagelist(self);
+
     // Copy the filename into each images. Set a scene number to be used if
     // writing multiple files. (Ref: ImageMagick's utilities/convert.c
     for (scene = 0, img = images; img; img = GetNextImageInList(img))
@@ -741,10 +756,13 @@ ImageList_write(VALUE self, VALUE file)
 
     GetExceptionInfo(&exception);
     (void) SetImageInfo(info, True, &exception);
+    rm_check_exception(&exception, images, RetainOnError);
+    DestroyExceptionInfo(&exception);
 
     // Find out if the format supports multi-images files.
+    GetExceptionInfo(&exception);
     m = GetMagickInfo(info->magick, &exception);
-    CHECK_EXCEPTION()
+    rm_check_exception(&exception, images, RetainOnError);
     DestroyExceptionInfo(&exception);
 
     // Tell WriteImage if we want a multi-images file.