rmagick 4.1.0.rc2 → 4.2.1

data/ext/RMagick/rmilist.c

@@ -16,7 +16,6 @@ static Image *clone_imagelist(Image *);
 static Image *images_from_imagelist(VALUE);
 static long imagelist_length(VALUE);
 static long check_imagelist_length(VALUE);
-static VALUE imagelist_scene_eq(VALUE, VALUE);
 static void imagelist_push(VALUE, VALUE);
 static VALUE ImageList_new(void);
 
@@ -26,17 +25,15 @@ static VALUE ImageList_new(void);
 
 /**
  * Repeatedly display the images in the images array to an XWindow screen. The
- * "delay" argument is the number of 1/100ths of a second (0 to 65535) to delay
+ * +delay+ argument is the number of 1/100ths of a second (0 to 65535) to delay
  * between images.
  *
- * Ruby usage:
- *   - @verbatim ImageList#animate @endverbatim
- *   - @verbatim ImageList#animate(delay) @endverbatim
+ * @overload animate
  *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return self
+ * @overload animate(delay)
+ *   @param delay [Numeric] the length of time between each image in an animation
+ *
+ * @return [Magick::ImageList] self
  */
 
 VALUE
@@ -78,12 +75,12 @@ 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);
+    AnimateImages(info, images, exception);
     rm_split(images);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 #else
-    (void) AnimateImages(info, images);
+    AnimateImages(info, images);
     rm_split(images);
     rm_check_image_exception(images, RetainOnError);
 #endif
@@ -95,14 +92,10 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
 
 
 /**
- * Append all the images by calling ImageAppend.
- *
- * Ruby usage:
- *   - @verbatim ImageList#append(stack) @endverbatim
+ * Append all the images
  *
- * @param self this object
- * @param stack_arg the stack of images
- * @return a Frame object for the result
+ * @param stack_arg [Magick::ImageList] the stack of images
+ * @return [Magick::Image] a frame object for the result
  */
 VALUE
 ImageList_append(VALUE self, VALUE stack_arg)
@@ -122,22 +115,16 @@ ImageList_append(VALUE self, VALUE stack_arg)
     new_image = AppendImages(images, stack, exception);
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_image);
+    DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
 }
 
 
 /**
- * Average all images together by calling AverageImages.
- *
- * Ruby usage:
- *   - @verbatim ImageList#average @endverbatim
+ * Average all images together
  *
- * @param self this object
- * @return a Frame object for the averaged image
+ * @return [Magick::Image] a frame object for the averaged image
  */
 VALUE
 ImageList_average(VALUE self)
@@ -153,26 +140,19 @@ ImageList_average(VALUE self)
 
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_image);
+    DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
 }
 
 
 /**
- * Call CoalesceImages.
- *
- * Ruby usage:
- *   - @verbatim ImageList#coalesce @endverbatim
+ * Composites a set of images while respecting any page offsets and disposal methods.
  *
- * Notes:
- *   - Respects the delay, matte, and start_loop fields in each image.
+ * - Respects the delay, matte, and start_loop fields in each image.
  *
- * @param self this object
- * @return a new Image with the coalesced image sequence return stored in the
- * images array
+ * @return [Magick::ImageList] a new image with the coalesced image sequence return stored in the
+ *   images array
  */
 VALUE
 ImageList_coalesce(VALUE self)
@@ -187,9 +167,7 @@ ImageList_coalesce(VALUE self)
     new_images = CoalesceImages(images, exception);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_images);
+    DestroyExceptionInfo(exception);
 
     return rm_imagelist_from_images(new_images);
 }
@@ -198,24 +176,20 @@ ImageList_coalesce(VALUE self)
 /**
  * Combines the images using the specified colorspace.
  *
- * Ruby usage:
- *   - @verbatim new_image = ImageList#combine @endverbatim
- *   - @verbatim new_image = ImageList#combine(colorspace) @endverbatim
+ * @overload combine
  *
- * Notes:
- *   - Calls CombineImages.
+ * @overload combine(colorspace)
+ *   @param colorspace [Magick::ColorspaceType] the colorspace
  *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return a new image
+ * @return [Magick::Image] a new image
  */
 VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
 {
 #if defined(IMAGEMAGICK_6)
     ChannelType channel;
+    ColorspaceType old_colorspace;
 #endif
-    ColorspaceType colorspace, old_colorspace;
+    ColorspaceType colorspace;
     long len;
     Image *images, *new_image;
     ExceptionInfo *exception;
@@ -288,29 +262,24 @@ VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
     images->colorspace = old_colorspace;
 #endif
     rm_check_exception(exception, new_image, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_image);
+    DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
 }
 
 
 /**
- * Equivalent to convert's -layers composite option.
+ * An image from source images is composited over an image from receiver's list until one list is finished.
  *
- * Ruby usage:
- *   - @verbatim ImageList#composite_layers(images) @endverbatim
- *   - @verbatim ImageList#composite_layers(images,operator) @endverbatim
+ * @overload composite_layers(images)
+ *   @param images [Magick::ImageList] the source images
  *
- * Notes:
- *   - Default operator is OverCompositeOp
+ * @overload composite_layers(images, operator)
+ *   - Default operator is {Magick::OverCompositeOp}
+ *   @param images [Magick::ImageList] the source images
+ *   @param operator [Magick::CompositeOperator] the operator
  *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return a new imagelist
- * @see mogrify.c in ImageMagick
+ * @return [Magick::ImageList] a new imagelist
  */
 VALUE
 ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
@@ -340,20 +309,20 @@ ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
 
     source = images_from_imagelist(source_images);
 
-    SetGeometry(new_images,&geometry);
-    (void) ParseAbsoluteGeometry(new_images->geometry, &geometry);
+    SetGeometry(new_images, &geometry);
+    ParseAbsoluteGeometry(new_images->geometry, &geometry);
 
     geometry.width  = source->page.width != 0 ? source->page.width : source->columns;
     geometry.height = source->page.height != 0 ? source->page.height : source->rows;
-    GravityAdjustGeometry(new_images->page.width  != 0 ? new_images->page.width  : new_images->columns
-                        , new_images->page.height != 0 ? new_images->page.height : new_images->rows
-                        , new_images->gravity, &geometry);
+    GravityAdjustGeometry(new_images->page.width  != 0 ? new_images->page.width  : new_images->columns,
+                          new_images->page.height != 0 ? new_images->page.height : new_images->rows,
+                          new_images->gravity, &geometry);
 
     exception = AcquireExceptionInfo();
     CompositeLayers(new_images, operator, source, geometry.x, geometry.y, exception);
     rm_split(source);
     rm_check_exception(exception, new_images, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 
     RB_GC_GUARD(source_images);
 
@@ -365,11 +334,7 @@ ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
  * Compare each image with the next in a sequence and returns the maximum
  * bounding region of any pixel differences it discovers.
  *
- * Ruby usage:
- *   - @verbatim ImageList#deconstruct @endverbatim
- *
- * @param self this object
- * @return a new imagelist
+ * @return [Magick::ImageList] a new imagelist
  */
 VALUE
 ImageList_deconstruct(VALUE self)
@@ -386,9 +351,7 @@ ImageList_deconstruct(VALUE self)
 #endif
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_images);
+    DestroyExceptionInfo(exception);
 
     return rm_imagelist_from_images(new_images);
 }
@@ -397,11 +360,7 @@ ImageList_deconstruct(VALUE self)
 /**
  * Display all the images to an X window screen.
  *
- * Ruby usage:
- *   - @verbatim ImageList#display @endverbatim
- *
- * @param self this object
- * @return self
+ * @return [Magick::ImageList] self
  */
 VALUE
 ImageList_display(VALUE self)
@@ -421,12 +380,12 @@ ImageList_display(VALUE self)
     images = images_from_imagelist(self);
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    (void) DisplayImages(info, images, exception);
+    DisplayImages(info, images, exception);
     rm_split(images);
     CHECK_EXCEPTION();
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 #else
-    (void) DisplayImages(info, images);
+    DisplayImages(info, images);
     rm_split(images);
     rm_check_image_exception(images, RetainOnError);
 #endif
@@ -440,14 +399,7 @@ ImageList_display(VALUE self)
 /**
  * Merge all the images into a single image.
  *
- * Ruby usage:
- *   - @verbatim ImageList#flatten_images @endverbatim
- *
- * Notes:
- *   - Can't use "flatten" because that's an Array method
- *
- * @param self this object
- * @return the new image
+ * @return [Magick::ImageList] the new image
  */
 VALUE
 ImageList_flatten_images(VALUE self)
@@ -462,26 +414,23 @@ ImageList_flatten_images(VALUE self)
 
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_image);
+    DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
 }
 
 
 /**
- * Call MontageImages.
- *
- * Ruby usage:
- *   - @verbatim ImageList#montage <{parm block}> @endverbatim
+ * Tile one or more thumbnails across an image canvas.
  *
- * Notes:
- *   - Creates Montage object, yields to block if present in Montage object's
- *     scope.
+ * @overload montage
  *
- * @param self this object
- * @return a new image list
+ * @overload montage
+ *   Creates {Magick::ImageList::Montage} object, yields to block
+ *   if present in {Magick::ImageList::Montage} object's scope.
+ *   @yield []
+ * 
+ * @return [Magick::ImageList] a new image list
  */
 VALUE
 ImageList_montage(VALUE self)
@@ -497,7 +446,15 @@ ImageList_montage(VALUE self)
     {
         // Run the block in the instance's context, allowing the app to modify the
         // object's attributes.
-        (void) rb_obj_instance_eval(0, NULL, montage_obj);
+        if (rb_proc_arity(rb_block_proc()) == 0)
+        {
+            rb_warn("passing a block without an image argument is deprecated");
+            rb_obj_instance_eval(0, NULL, montage_obj);
+        }
+        else
+        {
+            rb_yield(montage_obj);
+        }
     }
 
     Data_Get_Struct(montage_obj, Montage, montage);
@@ -522,9 +479,7 @@ ImageList_montage(VALUE self)
     new_images = MontageImages(images, montage->info, exception);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_images);
+    DestroyExceptionInfo(exception);
 
     RB_GC_GUARD(montage_obj);
 
@@ -534,17 +489,11 @@ ImageList_montage(VALUE self)
 
 /**
  * Requires a minimum of two images. The first image is transformed into the
- * second by a number of intervening images as specified by "number_images".
- *
- * Ruby usage:
- *   - @verbatim ImageList#morph(number_images) @endverbatim
- *
- * Notes:
- *   - Sets \@scenes to 0
+ * second by a number of intervening images as specified by "nimages".
  *
- * @param self this object
- * @param nimages the number of images
- * @return a new image list with the images array set to the morph sequence.
+ * @note Sets +@scenes+ to 0
+ * @param nimages [Numeric] the number of images
+ * @return [Magick::ImageList] a new image list with the images array set to the morph sequence.
  */
 VALUE
 ImageList_morph(VALUE self, VALUE nimages)
@@ -566,9 +515,7 @@ ImageList_morph(VALUE self, VALUE nimages)
     new_images = MorphImages(images, (unsigned long)number_images, exception);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_images);
+    DestroyExceptionInfo(exception);
 
     return rm_imagelist_from_images(new_images);
 }
@@ -577,11 +524,7 @@ ImageList_morph(VALUE self, VALUE nimages)
 /**
  * Merge all the images into a single image.
  *
- * Ruby usage:
- *   - @verbatim ImageList#mosaic @endverbatim
- *
- * @param self this object
- * @return the new image
+ * @return [Magick::Image] the new image
  */
 VALUE
 ImageList_mosaic(VALUE self)
@@ -596,23 +539,18 @@ ImageList_mosaic(VALUE self)
 
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_image);
+    DestroyExceptionInfo(exception);
 
     return rm_image_new(new_image);
 }
 
 
 /**
- * Equivalent to -layers option in ImageMagick 6.2.6.
+ * Optimizes or compares the images in the list.
+ * Equivalent to the -layers option in ImageMagick's mogrify command.
  *
- * Ruby usage:
- *   - @verbatim ImageList#optimize_layers(method) @endverbatim
- *
- * @param self this object
- * @param method the method to use
- * @return a new imagelist
+ * @param method [Magick::LayerMethod] the method to use
+ * @return [Magick::ImageList] a new imagelist
  */
 VALUE
 ImageList_optimize_layers(VALUE self, VALUE method)
@@ -650,7 +588,7 @@ ImageList_optimize_layers(VALUE self, VALUE method)
             break;
         case CompositeLayer:
             rm_split(images);
-            (void) DestroyExceptionInfo(exception);
+            DestroyExceptionInfo(exception);
             rb_raise(rb_eNotImpError, "Magick::CompositeLayer is not supported. Use the composite_layers method instead.");
             break;
             // In 6.3.4-ish, OptimizeImageLayer replaced OptimizeLayer
@@ -671,9 +609,9 @@ ImageList_optimize_layers(VALUE self, VALUE method)
             // mogrify supports -dither here. We don't.
             GetQuantizeInfo(&quantize_info);
 #if defined(IMAGEMAGICK_7)
-            (void) RemapImages(&quantize_info, new_images, NULL, exception);
+            RemapImages(&quantize_info, new_images, NULL, exception);
 #else
-            (void) RemapImages(&quantize_info, new_images, NULL);
+            RemapImages(&quantize_info, new_images, NULL);
 #endif
             break;
         case OptimizePlusLayer:
@@ -702,16 +640,14 @@ ImageList_optimize_layers(VALUE self, VALUE method)
             break;
         default:
             rm_split(images);
-            (void) DestroyExceptionInfo(exception);
+            DestroyExceptionInfo(exception);
             rb_raise(rb_eArgError, "undefined layer method");
             break;
     }
 
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
-
-    rm_ensure_result(new_images);
+    DestroyExceptionInfo(exception);
 
     return rm_imagelist_from_images(new_images);
 }
@@ -750,22 +686,20 @@ VALUE
 rm_imagelist_from_images(Image *images)
 {
     VALUE new_imagelist;
-    Image *image;
 
-    if (!images)
-    {
-        rb_bug("rm_imagelist_from_images called with NULL argument");
-    }
+    rm_ensure_result(images);
 
     new_imagelist = ImageList_new();
 
     while (images)
     {
+        Image *image;
+
         image = RemoveFirstImageFromList(&images);
         imagelist_push(new_imagelist, rm_image_new(image));
     }
 
-    (void) rb_iv_set(new_imagelist, "@scene", INT2FIX(0));
+    rb_iv_set(new_imagelist, "@scene", INT2FIX(0));
 
     RB_GC_GUARD(new_imagelist);
 
@@ -803,6 +737,9 @@ images_from_imagelist(VALUE imagelist)
         if (head == image || GetPreviousImageInList(image) != NULL)
         {
             image = rm_clone_image(image);
+
+            // Wrap raw ImageMagick object by Ruby object to destroy using Ruby's GC.
+            rm_image_new(image);
         }
         AppendImageToList(&head, image);
     }
@@ -814,24 +751,6 @@ images_from_imagelist(VALUE imagelist)
 }
 
 
-/**
- * \@scene attribute writer.
- *
- * No Ruby usage (internal function)
- *
- * @param imagelist the imagelist
- * @param scene the scene
- * @return the scene
- */
-static VALUE
-imagelist_scene_eq(VALUE imagelist, VALUE scene)
-{
-    rb_check_frozen(imagelist);
-    (void) rb_iv_set(imagelist, "@scene", scene);
-    return scene;
-}
-
-
 /**
  * return the # of images in an imagelist.
  *
@@ -890,7 +809,7 @@ static void
 imagelist_push(VALUE imagelist, VALUE image)
 {
     rb_check_frozen(imagelist);
-    (void) rb_funcall(imagelist, rm_ID_push, 1, image);
+    rb_funcall(imagelist, rm_ID_push, 1, image);
 }
 
 
@@ -905,7 +824,7 @@ imagelist_push(VALUE imagelist, VALUE image)
 static Image *
 clone_imagelist(Image *images)
 {
-    Image *new_imagelist = NULL, *image, *clone;
+    Image *new_imagelist = NULL, *image;
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
@@ -913,40 +832,31 @@ clone_imagelist(Image *images)
     image = GetFirstImageInList(images);
     while (image)
     {
+        Image *clone;
+
         clone = CloneImage(image, 0, 0, MagickTrue, exception);
         rm_check_exception(exception, new_imagelist, DestroyOnError);
         AppendImageToList(&new_imagelist, clone);
         image = GetNextImageInList(image);
     }
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
     return new_imagelist;
 }
 
 
 /**
- * Call QuantizeImages.
- *
- * Ruby usage:
- *   - @verbatim ImageList#quantize @endverbatim
- *   - @verbatim ImageList#quantize(number_colors) @endverbatim
- *   - @verbatim ImageList#quantize(number_colors, colorspace) @endverbatim
- *   - @verbatim ImageList#quantize(number_colors, colorspace, dither) @endverbatim
- *   - @verbatim ImageList#quantize(number_colors, colorspace, dither, tree_depth) @endverbatim
- *   - @verbatim ImageList#quantize(number_colors, colorspace, dither, tree_depth, measure_error) @endverbatim
- *
- * Notes:
- *   - Default number_colors is 256
- *   - Default coorspace is Magick::RGBColorsapce
- *   - Default dither is true
- *   - Default tree_depth is 0
- *   - Default measure_error is false
- *   - Sets \@scene to the same value as self.scene
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return a new ImageList with quantized images
+ * Analyzes the colors within a set of reference images and chooses a fixed number of colors to represent the set.
+ * The goal of the algorithm is to minimize the difference between the input and output images while minimizing the processing time.
+ *
+ * @overload quantize(number_colors = 256, colorspace = Magick::RGBColorsapce, dither = true, tree_depth = 0, measure_error = false)
+ *   @param number_colors [Numeric] the maximum number of colors to use in the output images.
+ *   @param colorspace [Magick::ColorspaceType] the colorspace to quantize in.
+ *   @param dither [Magick::DitherMethod, Boolean] a DitherMethod value or true if you want apply dither.
+ *   @param tree_depth [Numeric] specify the tree depth to use while quantizing.
+ *   @param measure_error [Boolean] calculate quantization errors when quantizing the image.
+ *   @return [Magick::ImageList] a new ImageList with quantized images
+ *   @note Sets +@scene+ to the same value as +self.scene+
  */
 VALUE
 ImageList_quantize(int argc, VALUE *argv, VALUE self)
@@ -971,6 +881,10 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
             {
                 VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
             }
+            else
+            {
+                quantize_info.dither_method = RTEST(argv[2]) ? UndefinedDitherMethod : NoDitherMethod;
+            }
 #else
             if (rb_obj_is_kind_of(argv[2], Class_DitherMethod))
             {
@@ -1004,12 +918,12 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
     rm_ensure_result(new_images);
 
 #if defined(IMAGEMAGICK_7)
-    (void) QuantizeImages(&quantize_info, new_images, exception);
+    QuantizeImages(&quantize_info, new_images, exception);
 #else
-    (void) QuantizeImages(&quantize_info, new_images);
+    QuantizeImages(&quantize_info, new_images);
 #endif
     rm_check_exception(exception, new_images, DestroyOnError);
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 
     // Create new ImageList object, convert mapped image sequence to images,
     // append to images array.
@@ -1021,7 +935,7 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
 
     // Set @scene in new ImageList object to same value as in self.
     scene = rb_iv_get(self, "@scene");
-    (void) rb_iv_set(new_imagelist, "@scene", scene);
+    rb_iv_set(new_imagelist, "@scene", scene);
 
     RB_GC_GUARD(new_imagelist);
     RB_GC_GUARD(scene);
@@ -1031,22 +945,14 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
 
 
 /**
- * Call RemapImages.
- *
- * Ruby usage:
- *   - @verbatim ImageList#remap @endverbatim
- *   - @verbatim ImageList#remap(remap_image) @endverbatim
- *   - @verbatim ImageList#remap(remap_image, dither_method) @endverbatim
- *
- * Notes:
- *   - Default remap_image is nil
- *   - Default dither_method is RiemersmaDitherMethod
- *   - Modifies images in-place.
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @see Image_remap
+ * Reduce the colors used in the image list to the set of colors in +remap_image+.
+ *
+ * @overload remap(remap_image = nil, dither_method = Magick::RiemersmaDitherMethod)
+ *   @param remap_image [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *     imagelist, uses the current image.
+ *   @param dither_method [Magick::DitherMethod] a DitherMethod value.
+ *   @return [Magick::ImageList] self
+ *   @note Modifies images in-place.
  */
 VALUE
 ImageList_remap(int argc, VALUE *argv, VALUE self)
@@ -1082,11 +988,12 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    (void) RemapImages(&quantize_info, images, remap_image, exception);
+    RemapImages(&quantize_info, images, remap_image, exception);
     rm_split(images);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 #else
+    RemapImages(&quantize_info, images, remap_image);
     rm_split(images);
     rm_check_image_exception(images, RetainOnError);
 #endif
@@ -1098,15 +1005,13 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
 /**
  * Return the imagelist as a blob (a String).
  *
- * Ruby usage:
- *   - @verbatim ImageList#to_blob @endverbatim
+ * @overload to_blob
  *
- * Notes:
- *   - Runs an info parm block if present - the user can specify the image
- *     format and depth
+ * @overload to_blob
+ *   Runs an info parm block if present - the user can specify the image format and depth
+ *   @yield []
  *
- * @param self this object
- * @return the blob
+ * @return [String] the blob
  */
 VALUE
 ImageList_to_blob(VALUE self)
@@ -1126,7 +1031,7 @@ ImageList_to_blob(VALUE self)
     images = images_from_imagelist(self);
 
     exception = AcquireExceptionInfo();
-    (void) SetImageInfo(info, MagickTrue, exception);
+    SetImageInfo(info, MagickTrue, exception);
     rm_check_exception(exception, images, RetainOnError);
 
     if (*info->magick != '\0')
@@ -1134,7 +1039,7 @@ ImageList_to_blob(VALUE self)
         Image *img;
         for (img = images; img; img = GetNextImageInList(img))
         {
-            strncpy(img->magick, info->magick, sizeof(info->magick)-1);
+            strlcpy(img->magick, info->magick, sizeof(img->magick));
         }
     }
 
@@ -1155,8 +1060,8 @@ ImageList_to_blob(VALUE self)
         length = 0;
     }
     rm_split(images);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 
 
     if (length == 0 || !blob)
@@ -1180,12 +1085,7 @@ ImageList_to_blob(VALUE self)
  * the images will be written as a single multi-image file. Otherwise each image
  * will be written to a separate file.
  *
- * Ruby usage:
- *   - @verbatim ImageList#write(file) @endverbatim
- *
- * @param self this object
- * @param file the file
- * @return self
+ * @param file [File, String] the file
  */
 VALUE
 ImageList_write(VALUE self, VALUE file)
@@ -1228,18 +1128,18 @@ ImageList_write(VALUE self, VALUE file)
     for (scene = 0, img = images; img; img = GetNextImageInList(img))
     {
         img->scene = scene++;
-        strcpy(img->filename, info->filename);
+        strlcpy(img->filename, info->filename, sizeof(img->filename));
     }
 
     // Find out if the format supports multi-images files.
     exception = AcquireExceptionInfo();
-    (void) SetImageInfo(info, MagickTrue, exception);
+    SetImageInfo(info, MagickTrue, exception);
     rm_check_exception(exception, images, RetainOnError);
 
     m = GetMagickInfo(info->magick, exception);
     rm_check_exception(exception, images, RetainOnError);
 #if defined(IMAGEMAGICK_6)
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 #endif
 
     // Tell WriteImage if we want a multi-images file.
@@ -1252,10 +1152,10 @@ ImageList_write(VALUE self, VALUE file)
     {
         rm_sync_image_options(img, info);
 #if defined(IMAGEMAGICK_7)
-        (void) WriteImage(info, img, exception);
+        WriteImage(info, img, exception);
         rm_check_exception(exception, img, RetainOnError);
 #else
-        (void) WriteImage(info, img);
+        WriteImage(info, img);
         // images will be split before raising an exception
         rm_check_image_exception(images, RetainOnError);
 #endif
@@ -1266,7 +1166,7 @@ ImageList_write(VALUE self, VALUE file)
     }
 
 #if defined(IMAGEMAGICK_7)
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 #endif
 
     rm_split(images);