rmagick 1.10.1 → 1.11.0

data/ext/RMagick/MANIFEST

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-1.10.1 - 09:54:53 02/25/06
+MANIFEST for RMagick-1.11.0 - 17:57:50 05/11/06
 
 configure
 README.html
@@ -28,12 +28,13 @@ examples/identify.rb
 examples/histogram.rb
 examples/describe.rb
 uninstall.rb
+setup.rb
 rmagick.gemspec
 post-setup.rb
 post-install.rb
 post-clean.rb
 metaconfig.in
-install.rb
+gem_config.rb
 configure.ac
 README.txt
 README-Mac-OSX.txt

data/ext/RMagick/rmagick.h

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.105 2006/02/19 17:12:20 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.109 2006/05/07 21:41:11 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -115,8 +115,7 @@ typedef enum
 {
     False = 0,
     True = 1
-}
-boolean;
+} boolean;
 
 typedef enum {
     AnyWeight,
@@ -274,6 +273,9 @@ EXTERN VALUE Class_FilterTypes;
 EXTERN VALUE Class_GravityType;
 EXTERN VALUE Class_ImageType;
 EXTERN VALUE Class_InterlaceType;
+#if defined(HAVE_COMPAREIMAGELAYERS)
+EXTERN VALUE Class_MagickLayerMethod;
+#endif
 EXTERN VALUE Class_NoiseType;
 #if defined(HAVE_IMAGE_ORIENTATION)
 EXTERN VALUE Class_OrientationType;
@@ -324,14 +326,8 @@ EXTERN ID ID_y;                 // "y"
 
 /*
    Handle warnings & errors
-
-   For ExceptionInfo structures in auto storage. Destroys the
-   ExceptionInfo structure (releasing any IM storage) before
-   calling rb_raise.
 */
-#define HANDLE_ERROR rm_handle_error(&exception);
-// For ExceptionInfo structures in images.
-#define HANDLE_ERROR_IMG(img) rm_handle_error(&((img)->exception));
+#define CHECK_EXCEPTION() rm_check_exception(&exception, NULL, RetainOnError);
 
 /*
     Map the QuantumDepth to a StorageType.
@@ -593,6 +589,7 @@ extern VALUE ImageList_map(VALUE, VALUE, VALUE);
 extern VALUE ImageList_montage(VALUE);
 extern VALUE ImageList_morph(VALUE, VALUE);
 extern VALUE ImageList_mosaic(VALUE);
+extern VALUE ImageList_optimize_layers(VALUE, VALUE);
 extern VALUE ImageList_quantize(int, VALUE*, VALUE);
 extern VALUE ImageList_to_blob(VALUE);
 extern VALUE ImageList_write(VALUE, VALUE);
@@ -769,6 +766,7 @@ extern VALUE Image_composite_affine(VALUE, VALUE, VALUE);
 extern VALUE Image_compress_colormap_bang(VALUE);
 extern VALUE Image_constitute(VALUE, VALUE, VALUE, VALUE, VALUE);
 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_copy(VALUE);
@@ -1022,18 +1020,28 @@ extern char  *rm_string_value_ptr_len(volatile VALUE *, long *);
 extern int    rm_strcasecmp(const char *, const char *);
 extern void   rm_check_ary_len(VALUE, int);
 extern void   rm_check_frozen(VALUE);
+extern int    rm_check_num2dbl(VALUE);
 extern double rm_fuzz_to_dbl(VALUE);
 extern double rm_percentage(VALUE);
+extern double rm_str_to_pct(VALUE);
 extern VALUE  rm_define_enum_type(char *);
 extern void   rm_write_temp_image(Image *, char *);
 extern void   rm_delete_temp_image(char *);
 extern void   rm_not_implemented(void);
-extern void   rm_handle_error(ExceptionInfo *);
-extern void   rm_handle_all_errors(Image *);
 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 *);
 
+typedef enum
+{
+    RetainOnError = 0,
+    DestroyOnError = 1
+} ErrorRetention;
+
+extern void   rm_check_image_exception(Image *, ErrorRetention);
+extern void   rm_check_exception(ExceptionInfo *, Image *, ErrorRetention);
+extern void   rm_ensure_result(Image *);
+extern Image *rm_clone_image(Image *);
 #if defined(HAVE_SETIMAGEPROGRESSMONITOR)
 extern MagickBooleanType rm_progress_monitor(const char *, const MagickOffsetType, const MagickSizeType, void *);
 #endif

data/ext/RMagick/rmagick_config.h.in

@@ -15,12 +15,20 @@
 #undef HAVE_BLACKTHRESHOLDIMAGE
 /* Introduced in IM 6.0.1 */
 #undef HAVE_BLURIMAGECHANNEL
+/* Introduced in IM 6.2.7 */
+#undef HAVE_COALESCELAYER
 /* Introduced in GM 1.2 */
 #undef HAVE_CINEONLOGRGBCOLORSPACE
+/* Introduced in IM 6.2.6 - Not available in GM */
+#undef HAVE_CLEARMAGICKEXCEPTION
 /* Introduced in IM 6.0.0 */
 #undef HAVE_COLORDODGECOMPOSITEOP
 /* Introduced in IM 6.0.0, GM 1.1 */
 #undef HAVE_COMPAREIMAGECHANNELS
+/* Introduced in IM 6.2.6 */
+#undef HAVE_COMPAREIMAGELAYERS
+/* Introduced in IM 6.2.6 */
+#undef HAVE_CONTRASTSTRETCHIMAGECHANNEL
 /* Introduced in IM 6.0.1 */
 #undef HAVE_CONVOLVEIMAGECHANNEL
 /* Introduced in IM 5.5.7, GM 1.1 */
@@ -75,10 +83,12 @@
 #undef HAVE_GETMAGICKINFOARRAY
 /* Introduced in IM 6.0.1 */
 #undef HAVE_GETMAGICKINFOLIST
-/* Introduced in IM 6.1.5 */
-#undef HAVE_GETMULTILINETYPEMETRICS
 /* API changed in IM 6.1.3 */
 #undef HAVE_OLD_GETMAGICKINFOLIST
+/* Introduced in IM 6.2.5 */
+#undef HAVE_GETMAGICKRESOURCELIMIT
+/* Introduced in IM 6.1.5 */
+#undef HAVE_GETMULTILINETYPEMETRICS
 /* Introduced in IM 6.2.1 */
 #undef HAVE_GETNEXTIMAGEATTRIBUTE
 /* Introduced in IM 6.0.0 */
@@ -92,6 +102,8 @@
 #undef HAVE_GRAYSCALEPSEUDOCLASSIMAGE
 /* Introduced in IM 6.0.0 - Not available in GM */
 #undef HAVE_HSBCOLORSPACE
+/* Introduced in IM 6.0.0 - Not available in GM */
+#undef HAVE_INHERITEXCEPTION
 #undef HAVE_INDEXCHANNEL
 /* Introduced in IM 5.5.6 - Not available in GM */
 #undef HAVE_IMAGE_EXTRACT_INFO

data/ext/RMagick/rmdraw.c

@@ -1,4 +1,4 @@
-/* $Id: rmdraw.c,v 1.29 2006/02/19 17:12:20 rmagick Exp $ */
+/* $Id: rmdraw.c,v 1.32 2006/05/07 21:58:32 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmdraw.c
@@ -467,7 +467,7 @@ VALUE Draw_annotate(
 
     draw->info->affine = keep;
 
-    HANDLE_ERROR_IMG(image)
+    rm_check_image_exception(image, RetainOnError);
 
     return self;
 }
@@ -640,7 +640,7 @@ Draw_draw(VALUE self, VALUE image_arg)
     magick_clone_string(&(draw->info->primitive), STRING_PTR(draw->primitives));
 
     (void) DrawImage(image, draw->info);
-    HANDLE_ERROR_IMG(image)
+    rm_check_image_exception(image, RetainOnError);
 
     magick_free(draw->info->primitive);
     draw->info->primitive = NULL;
@@ -761,6 +761,10 @@ Draw_initialize(VALUE self)
     // Use the Info structure to create the DrawInfo structure
     Data_Get_Struct(info_obj, Info, info);
     draw->info = CloneDrawInfo(info, NULL);
+    if (!draw->info)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue");
+    }
 
     draw->primitives = (VALUE)0;
     draw->tmpfile_ary = NULL;
@@ -1337,6 +1341,9 @@ get_type_metrics(
 
      if (!okay)
      {
+         rm_check_image_exception(image, RetainOnError);
+
+         // Shouldn't get here...
          rb_raise(rb_eRuntimeError, "Can't measure text. Are the fonts installed? "
                   "Is the FreeType library installed?");
      }

data/ext/RMagick/rmfill.c

@@ -1,4 +1,4 @@
-/* $Id: rmfill.c,v 1.13 2005/12/31 14:40:50 rmagick Exp $ */
+/* $Id: rmfill.c,v 1.14 2006/05/07 23:46:19 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmfill.c
@@ -131,7 +131,7 @@ point_fill(
 
         if (!(row_pixels = SetImagePixels(image, 0, y, image->columns, 1)))
         {
-            rb_raise(rb_eNoMemError, "not enough memory to continue");
+            rm_check_image_exception(image, RetainOnError);
         }
         for (x = 0; x < image->columns; x++)
         {
@@ -143,7 +143,7 @@ point_fill(
         }
         if (!SyncImagePixels(image))
         {
-            rb_raise(Class_ImageMagickError, "can't set image pixels");
+            rm_check_image_exception(image, RetainOnError);
         }
     }
 }
@@ -209,13 +209,13 @@ vertical_fill(
 
         if (!(row_pixels = SetImagePixels(image, 0, y, image->columns, 1)))
         {
-            rb_raise(rb_eNoMemError, "not enough memory to continue");
+            rm_check_image_exception(image, RetainOnError);
         }
 
         memcpy(row_pixels, (PixelPacket *)master, image->columns * sizeof(PixelPacket));
         if (!SyncImagePixels(image))
         {
-            rb_raise(Class_ImageMagickError, "can't set image pixels");
+            rm_check_image_exception(image, RetainOnError);
         }
     }
 
@@ -279,12 +279,12 @@ horizontal_fill(
 
         if (!(col_pixels = SetImagePixels(image, x, 0, 1, image->rows)))
         {
-            rb_raise(rb_eNoMemError, "not enough memory to continue");
+            rm_check_image_exception(image, RetainOnError);
         }
         memcpy(col_pixels, (PixelPacket *)master, image->rows * sizeof(PixelPacket));
         if (!SyncImagePixels(image))
         {
-            rb_raise(Class_ImageMagickError, "can't set image pixels");
+            rm_check_image_exception(image, RetainOnError);
         }
     }
 
@@ -353,7 +353,7 @@ v_diagonal_fill(
 
         if (!(row_pixels = SetImagePixels(image, 0, y, image->columns, 1)))
         {
-            rb_raise(rb_eNoMemError, "not enough memory to continue");
+            rm_check_image_exception(image, RetainOnError);
         }
         for (x = 0; x < image->columns; x++)
         {
@@ -365,7 +365,7 @@ v_diagonal_fill(
         }
         if (!SyncImagePixels(image))
         {
-            rb_raise(Class_ImageMagickError, "can't set image pixels");
+            rm_check_image_exception(image, RetainOnError);
         }
     }
 }
@@ -434,7 +434,7 @@ h_diagonal_fill(
 
         if (!(row_pixels = SetImagePixels(image, 0, y, image->columns, 1)))
         {
-            rb_raise(rb_eNoMemError, "not enough memory to continue");
+            rm_check_image_exception(image, RetainOnError);
         }
         for (x = 0; x < image->columns; x++)
         {
@@ -446,7 +446,7 @@ h_diagonal_fill(
         }
         if (!SyncImagePixels(image))
         {
-            rb_raise(Class_ImageMagickError, "can't set image pixels");
+            rm_check_image_exception(image, RetainOnError);
         }
     }
 }
@@ -605,5 +605,8 @@ TextureFill_fill(VALUE self, VALUE image_obj)
     Data_Get_Struct(self, TextureFill, fill);
 
     TextureImage(image, fill->texture);
+    rm_check_image_exception(image, RetainOnError);
+
     return self;
 }
+

data/ext/RMagick/rmilist.c

@@ -1,4 +1,4 @@
-/* $Id: rmilist.c,v 1.31 2006/02/03 23:26:05 rmagick Exp $ */
+/* $Id: rmilist.c,v 1.39 2006/05/08 22:45:27 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmilist.c
@@ -48,7 +48,7 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
     Data_Get_Struct(info_obj, Info, info);
 
     (void) AnimateImages(info, images);
-    rm_handle_all_errors(images);
+    rm_check_image_exception(images, RetainOnError);
     rm_split(images);
 
     return self;
@@ -62,7 +62,7 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
 VALUE
 ImageList_append(VALUE self, VALUE stack_arg)
 {
-    Image *images, *result;
+    Image *images, *new_image;
     unsigned int stack;
     ExceptionInfo exception;
 
@@ -74,11 +74,12 @@ ImageList_append(VALUE self, VALUE stack_arg)
     stack = RTEST(stack_arg);
 
     GetExceptionInfo(&exception);
-    result = AppendImages(images, stack, &exception);
+    new_image = AppendImages(images, stack, &exception);
     rm_split(images);
-    HANDLE_ERROR
+    rm_check_exception(&exception, new_image, DestroyOnError);
+    rm_ensure_result(new_image);
 
-    return rm_image_new(result);
+    return rm_image_new(new_image);
 }
 
 /*
@@ -89,18 +90,19 @@ ImageList_append(VALUE self, VALUE stack_arg)
 VALUE
 ImageList_average(VALUE self)
 {
-    Image *images, *result;
+    Image *images, *new_image;
     ExceptionInfo exception;
 
     // Convert the images array to an images sequence.
     images = rm_images_from_imagelist(self);
 
     GetExceptionInfo(&exception);
-    result = AverageImages(images, &exception);
-    rm_handle_all_errors(images);
+    new_image = AverageImages(images, &exception);
     rm_split(images);
+    rm_check_exception(&exception, new_image, DestroyOnError);
+    rm_ensure_result(new_image);
 
-    return rm_image_new(result);
+    return rm_image_new(new_image);
 }
 
 /*
@@ -114,18 +116,19 @@ ImageList_average(VALUE self)
 VALUE
 ImageList_coalesce(VALUE self)
 {
-    Image *images, *results;
+    Image *images, *new_images;
     ExceptionInfo exception;
 
     // Convert the image array to an image sequence.
     images = rm_images_from_imagelist(self);
 
     GetExceptionInfo(&exception);
-    results = CoalesceImages(images, &exception);
+    new_images = CoalesceImages(images, &exception);
     rm_split(images);
-    HANDLE_ERROR
+    rm_check_exception(&exception, new_images, DestroyOnError);
+    rm_ensure_result(new_images);
 
-    return rm_imagelist_from_images(results);
+    return rm_imagelist_from_images(new_images);
 }
 
 
@@ -146,7 +149,8 @@ ImageList_deconstruct(VALUE self)
     GetExceptionInfo(&exception);
     new_images = DeconstructImages(images, &exception);
     rm_split(images);
-    HANDLE_ERROR
+    rm_check_exception(&exception, new_images, DestroyOnError);
+    rm_ensure_result(new_images);
 
     return rm_imagelist_from_images(new_images);
 }
@@ -161,7 +165,6 @@ ImageList_display(VALUE self)
     Image *images;
     Info *info;
     volatile VALUE info_obj;
-    unsigned int ok;
 
     // Convert the images array to an images sequence.
     images = rm_images_from_imagelist(self);
@@ -170,12 +173,9 @@ ImageList_display(VALUE self)
     info_obj = rm_info_new();
     Data_Get_Struct(info_obj, Info, info);
 
-    ok = DisplayImages(info, images);
-    if (!ok)
-    {
-        rm_handle_all_errors(images);
-    }
+    (void) DisplayImages(info, images);
     rm_split(images);
+    rm_check_image_exception(images, RetainOnError);
 
     return self;
 }
@@ -196,12 +196,14 @@ ImageList_flatten_images(VALUE self)
     GetExceptionInfo(&exception);
     new_image = FlattenImages(images, &exception);
     rm_split(images);
-    HANDLE_ERROR
+    rm_check_exception(&exception, new_image, DestroyOnError);
+    rm_ensure_result(new_image);
 
     return rm_image_new(new_image);
 }
 
 
+
 /*
     Method:     ImageList#map
     Purpose:    Call MapImages
@@ -210,7 +212,7 @@ ImageList_flatten_images(VALUE self)
 VALUE
 ImageList_map(VALUE self, VALUE map_image, VALUE dither_arg)
 {
-    Image *images, *clone_images = NULL;
+    Image *images, *new_images = NULL;
     Image *map;
     unsigned int dither;
     volatile VALUE image, scene, new_imagelist;
@@ -225,19 +227,21 @@ ImageList_map(VALUE self, VALUE map_image, VALUE dither_arg)
     }
 
     // Convert image array to image sequence, clone image sequence.
-    images = rm_images_from_imagelist(self);
     GetExceptionInfo(&exception);
-    clone_images = CloneImageList(images, &exception);
+
+    images = rm_images_from_imagelist(self);
+    new_images = CloneImageList(images, &exception);
     rm_split(images);
-    HANDLE_ERROR
+    rm_check_exception(&exception, new_images, DestroyOnError);
+    rm_ensure_result(new_images);
 
     // Call ImageMagick
     dither = !(dither_arg == Qfalse || dither_arg == Qnil);
-    (void) MapImages(clone_images, map, dither);
-    HANDLE_ERROR_IMG(clone_images)
+    (void) MapImages(new_images, map, dither);
+    rm_check_image_exception(new_images, DestroyOnError);
 
     // Set @scene in new ImageList object to same value as in self.
-    new_imagelist = rm_imagelist_from_images(clone_images);
+    new_imagelist = rm_imagelist_from_images(new_images);
     scene = rb_iv_get(self, "@scene");
     (void) rm_imagelist_scene_eq(new_imagelist, scene);
 
@@ -255,7 +259,7 @@ ImageList_montage(VALUE self)
 {
     volatile VALUE montage_obj;
     Montage *montage;
-    Image *montage_seq, *image_list;
+    Image *new_images, *images;
     ExceptionInfo exception;
 
     // Create a new instance of the Magick::Montage class
@@ -269,13 +273,13 @@ ImageList_montage(VALUE self)
 
     Data_Get_Struct(montage_obj, Montage, montage);
 
-    image_list = rm_images_from_imagelist(self);
+    images = rm_images_from_imagelist(self);
 
     // If app specified a non-default composition operator, use it for all images.
     if (montage->compose != UndefinedCompositeOp)
     {
         Image *i;
-        for (i = image_list; i; i = GetNextImageInList(i))
+        for (i = images; i; i = GetNextImageInList(i))
         {
             i->compose = montage->compose;
         }
@@ -284,11 +288,12 @@ ImageList_montage(VALUE self)
     GetExceptionInfo(&exception);
 
     // MontageImage can return more than one image.
-    montage_seq = MontageImages(image_list, montage->info, &exception);
-    rm_split(image_list);
-    HANDLE_ERROR
+    new_images = MontageImages(images, montage->info, &exception);
+    rm_split(images);
+    rm_check_exception(&exception, new_images, DestroyOnError);
+    rm_ensure_result(new_images);
 
-    return rm_imagelist_from_images(montage_seq);
+    return rm_imagelist_from_images(new_images);
 }
 
 /*
@@ -322,7 +327,8 @@ ImageList_morph(VALUE self, VALUE nimages)
     GetExceptionInfo(&exception);
     new_images = MorphImages(images, (unsigned long)number_images, &exception);
     rm_split(images);
-    HANDLE_ERROR
+    rm_check_exception(&exception, new_images, DestroyOnError);
+    rm_ensure_result(new_images);
 
     return rm_imagelist_from_images(new_images);
 }
@@ -342,11 +348,64 @@ ImageList_mosaic(VALUE self)
     GetExceptionInfo(&exception);
     new_image = MosaicImages(images, &exception);
     rm_split(images);
-    HANDLE_ERROR
+    rm_check_exception(&exception, new_image, DestroyOnError);
+    rm_ensure_result(new_image);
 
     return rm_image_new(new_image);
 }
 
+
+/*
+    Method:     ImageList#optimize_layers
+    Purpose:    Equivalent to -layers option in 6.2.6
+    Returns:    a new imagelist
+*/
+VALUE
+ImageList_optimize_layers(VALUE self, VALUE method)
+{
+#if defined(HAVE_COMPAREIMAGELAYERS)
+    Image *images, *new_images;
+    MagickLayerMethod mthd;
+    ExceptionInfo exception;
+
+    images = rm_images_from_imagelist(self);
+    GetExceptionInfo(&exception);
+    VALUE_TO_ENUM(method, mthd, MagickLayerMethod);
+
+    switch (mthd)
+    {
+#if defined(HAVE_COALESCELAYER)
+      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;
+    }
+
+    rm_split(images);
+    rm_check_exception(&exception, new_images, DestroyOnError);
+    rm_ensure_result(new_images);
+
+    return rm_imagelist_from_images(new_images);
+
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
+
 /*
     External:   rm_imagelist_new
     Purpose:    create a new ImageList object with no images
@@ -371,6 +430,11 @@ rm_imagelist_from_images(Image *images)
      volatile VALUE new_imagelist;
      Image *image;
 
+     if (!images)
+     {
+         rb_bug("rm_imagelist_from_images called with NULL argument");
+     }
+
      new_imagelist = rm_imagelist_new();
 
      while (images)
@@ -498,9 +562,12 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
     images = rm_images_from_imagelist(self);
     new_images = CloneImageList(images, &exception);
     rm_split(images);
-    HANDLE_ERROR
+    rm_check_exception(&exception, new_images, DestroyOnError);
+    rm_ensure_result(new_images);
+
 
     QuantizeImages(&quantize_info, new_images);
+    rm_check_exception(&exception, new_images, DestroyOnError);
 
     // Create new ImageList object, convert mapped image sequence to images,
     // append to images array.
@@ -529,7 +596,7 @@ ImageList_to_blob(VALUE self)
     Image *images;
     Info *info;
     volatile VALUE info_obj;
-	volatile VALUE blob_str;
+    volatile VALUE blob_str;
     void *blob = NULL;
     size_t length = 0;
     ExceptionInfo exception;
@@ -542,7 +609,8 @@ ImageList_to_blob(VALUE self)
 
     GetExceptionInfo(&exception);
     (void) SetImageInfo(info, True, &exception);
-    HANDLE_ERROR
+    CHECK_EXCEPTION()
+
     if (*info->magick != '\0')
     {
         Image *img;
@@ -562,8 +630,12 @@ ImageList_to_blob(VALUE self)
 #else
     blob = ImageToBlob(info, images, &length, &exception);
 #endif
+    if (exception.severity != UndefinedException)
+    {
+        magick_free((void*)blob);
+    }
     rm_split(images);
-    HANDLE_ERROR
+    CHECK_EXCEPTION()
 
     if (length == 0 || !blob)
     {
@@ -571,7 +643,7 @@ ImageList_to_blob(VALUE self)
     }
 
     blob_str = rb_str_new(blob, length);
- 	magick_free((void*)blob);
+    magick_free((void*)blob);
 
     return blob_str;
 }
@@ -649,7 +721,7 @@ ImageList_write(VALUE self, VALUE file)
 
     // Find out if the format supports multi-images files.
     m = GetMagickInfo(info->magick, &exception);
-    HANDLE_ERROR
+    CHECK_EXCEPTION()
 
     // Tell WriteImage if we want a multi-images file.
     if (rm_imagelist_length(self) > 1 && m->adjoin)
@@ -661,7 +733,7 @@ ImageList_write(VALUE self, VALUE file)
     {
         (void) WriteImage(info, img);
         // images will be split before raising an exception
-        rm_handle_all_errors(images);
+        rm_check_image_exception(images, RetainOnError);
         if (info->adjoin)
         {
             break;