rmagick 1.15.17 → 2.0.0

data/ext/RMagick/rmfill.c

@@ -1,6 +1,6 @@
-/* $Id: rmfill.c,v 1.17.2.1.2.1 2008/02/24 23:25:40 rmagick Exp $ */
+/* $Id: rmfill.c,v 1.25 2007/10/28 23:43:24 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2008 by Timothy P. Hunter
+|                Copyright (C) 2007 by Timothy P. Hunter
 | Name:     rmfill.c
 | Author:   Tim Hunter
 | Purpose:  GradientFill, TextureFill class definitions for RMagick
@@ -31,41 +31,9 @@ static void free_Fill(void *fill)
 }
 
 /*
-    Extern:     GradientFill.new(x1, y1, x2, y2, start_color, stop_color)
+    Extern:     GradientFill.allocate(x1, y1, x2, y2, start_color, stop_color)
     Purpose:    Create new GradientFill object
 */
-#if !defined(HAVE_RB_DEFINE_ALLOC_FUNC)
-VALUE
-GradientFill_new(
-    VALUE class,
-    VALUE x1,
-    VALUE y1,
-    VALUE x2,
-    VALUE y2,
-    VALUE start_color,
-    VALUE stop_color)
-{
-    rm_GradientFill *fill;
-    volatile VALUE new_fill;
-    VALUE argv[6];
-
-    argv[0] = x1;
-    argv[1] = y1;
-    argv[2] = x2;
-    argv[3] = y2;
-    argv[4] = start_color;
-    argv[5] = stop_color;
-
-    new_fill = Data_Make_Struct(class
-                              , rm_GradientFill
-                              , NULL
-                              , free_Fill
-                              , fill);
-
-    rb_obj_call_init((VALUE)new_fill, 6, argv);
-    return new_fill;
-}
-#else
 VALUE
 GradientFill_alloc(VALUE class)
 {
@@ -73,7 +41,7 @@ GradientFill_alloc(VALUE class)
 
     return Data_Make_Struct(class, rm_GradientFill, NULL, free_Fill, fill);
 }
-#endif
+
 
 /*
     Extern:     GradientFill#initialize(start_color, stop_color)
@@ -81,13 +49,13 @@ GradientFill_alloc(VALUE class)
 */
 VALUE
 GradientFill_initialize(
-    VALUE self,
-    VALUE x1,
-    VALUE y1,
-    VALUE x2,
-    VALUE y2,
-    VALUE start_color,
-    VALUE stop_color)
+                       VALUE self,
+                       VALUE x1,
+                       VALUE y1,
+                       VALUE x2,
+                       VALUE y2,
+                       VALUE start_color,
+                       VALUE stop_color)
 {
     rm_GradientFill *fill;
 
@@ -109,21 +77,22 @@ GradientFill_initialize(
 */
 static void
 point_fill(
-    Image *image,
-    double x0,
-    double y0,
-    PixelPacket *start_color,
-    PixelPacket *stop_color)
+          Image *image,
+          double x0,
+          double y0,
+          PixelPacket *start_color,
+          PixelPacket *stop_color)
 {
     double steps, distance;
     unsigned long x, y;
-    double red_step, green_step, blue_step;
+    MagickRealType red_step, green_step, blue_step;
 
     steps = sqrt((double)((image->columns-x0)*(image->columns-x0)
-                + (image->rows-y0)*(image->rows-y0)));
-    red_step = ((double)(stop_color->red - start_color->red)) / steps;
-    green_step = ((double)(stop_color->green - start_color->green)) / steps;
-    blue_step = ((double)(stop_color->blue - start_color->blue)) / steps;
+                          + (image->rows-y0)*(image->rows-y0)));
+
+    red_step   = ((MagickRealType)stop_color->red   - (MagickRealType)start_color->red)   / steps;
+    green_step = ((MagickRealType)stop_color->green - (MagickRealType)start_color->green) / steps;
+    blue_step  = ((MagickRealType)stop_color->blue  - (MagickRealType)start_color->blue)  / steps;
 
     for (y = 0; y < image->rows; y++)
     {
@@ -155,15 +124,15 @@ point_fill(
 */
 static void
 vertical_fill(
-    Image *image,
-    double x1,
-    PixelPacket *start_color,
-    PixelPacket *stop_color)
+             Image *image,
+             double x1,
+             PixelPacket *start_color,
+             PixelPacket *stop_color)
 {
     double steps;
     unsigned long x, y;
     volatile PixelPacket *master;
-    double red_step, green_step, blue_step;
+    MagickRealType red_step, green_step, blue_step;
 
     // Keep in mind that x1 could be < 0 or > image->columns. If steps
     // is negative, swap the start and end colors and use the absolute
@@ -185,9 +154,9 @@ vertical_fill(
         steps -= x1;
     }
 
-    red_step = (stop_color->red - start_color->red) / steps;
-    green_step = (stop_color->green - start_color->green) / steps;
-    blue_step = (stop_color->blue - start_color->blue) / steps;
+    red_step   = ((MagickRealType)stop_color->red   - (MagickRealType)start_color->red)   / steps;
+    green_step = ((MagickRealType)stop_color->green - (MagickRealType)start_color->green) / steps;
+    blue_step  = ((MagickRealType)stop_color->blue  - (MagickRealType)start_color->blue)  / steps;
 
     // All the rows are the same. Make a "master row" and simply copy
     // it to each actual row.
@@ -228,15 +197,15 @@ vertical_fill(
 */
 static void
 horizontal_fill(
-    Image *image,
-    double y1,
-    PixelPacket *start_color,
-    PixelPacket *stop_color)
+               Image *image,
+               double y1,
+               PixelPacket *start_color,
+               PixelPacket *stop_color)
 {
     double steps;
     unsigned long x, y;
     volatile PixelPacket *master;
-    double red_step, green_step, blue_step;
+    MagickRealType red_step, green_step, blue_step;
 
     // Bear in mind that y1 could be < 0 or > image->rows. If steps is
     // negative, swap the start and end colors and use the absolute value.
@@ -256,9 +225,9 @@ horizontal_fill(
         steps -= y1;
     }
 
-    red_step = (stop_color->red - start_color->red) / steps;
-    green_step = (stop_color->green - start_color->green) / steps;
-    blue_step = (stop_color->blue - start_color->blue) / steps;
+    red_step   = ((MagickRealType)stop_color->red   - (MagickRealType)start_color->red)   / steps;
+    green_step = ((MagickRealType)stop_color->green - (MagickRealType)start_color->green) / steps;
+    blue_step  = ((MagickRealType)stop_color->blue  - (MagickRealType)start_color->blue)  / steps;
 
     // All the columns are the same, so make a master column and copy it to
     // each of the "real" columns.
@@ -298,16 +267,16 @@ horizontal_fill(
 */
 static void
 v_diagonal_fill(
-    Image *image,
-    double x1,
-    double y1,
-    double x2,
-    double y2,
-    PixelPacket *start_color,
-    PixelPacket *stop_color)
+               Image *image,
+               double x1,
+               double y1,
+               double x2,
+               double y2,
+               PixelPacket *start_color,
+               PixelPacket *stop_color)
 {
     unsigned long x, y;
-    double red_step, green_step, blue_step;
+    MagickRealType red_step, green_step, blue_step;
     double m, b, steps = 0.0;
     double d1, d2;
 
@@ -343,9 +312,9 @@ v_diagonal_fill(
         steps = -steps;
     }
 
-    red_step = (stop_color->red - start_color->red) / steps;
-    green_step = (stop_color->green - start_color->green) / steps;
-    blue_step = (stop_color->blue - start_color->blue) / steps;
+    red_step =   ((MagickRealType)stop_color->red   - (MagickRealType)start_color->red)   / steps;
+    green_step = ((MagickRealType)stop_color->green - (MagickRealType)start_color->green) / steps;
+    blue_step =  ((MagickRealType)stop_color->blue  - (MagickRealType)start_color->blue)  / steps;
 
     for (y = 0; y < image->rows; y++)
     {
@@ -377,17 +346,17 @@ v_diagonal_fill(
 */
 static void
 h_diagonal_fill(
-    Image *image,
-    double x1,
-    double y1,
-    double x2,
-    double y2,
-    PixelPacket *start_color,
-    PixelPacket *stop_color)
+               Image *image,
+               double x1,
+               double y1,
+               double x2,
+               double y2,
+               PixelPacket *start_color,
+               PixelPacket *stop_color)
 {
     unsigned long x, y;
     double m, b, steps = 0.0;
-    double red_step, green_step, blue_step;
+    MagickRealType red_step, green_step, blue_step;
     double d1, d2;
 
     // Compute the equation of the line: y=mx+b
@@ -424,9 +393,9 @@ h_diagonal_fill(
         steps = -steps;
     }
 
-    red_step = (stop_color->red - start_color->red) / steps;
-    green_step = (stop_color->green - start_color->green) / steps;
-    blue_step = (stop_color->blue - start_color->blue) / steps;
+    red_step =   ((MagickRealType)stop_color->red   - (MagickRealType)start_color->red)   / steps;
+    green_step = ((MagickRealType)stop_color->green - (MagickRealType)start_color->green) / steps;
+    blue_step =  ((MagickRealType)stop_color->blue  - (MagickRealType)start_color->blue)  / steps;
 
     for (y = 0; y < image->rows; y++)
     {
@@ -466,7 +435,7 @@ GradientFill_fill(VALUE self, VALUE image_obj)
     double x1, y1, x2, y2;          // points on the line
 
     Data_Get_Struct(self, rm_GradientFill, fill);
-    Data_Get_Struct(image_obj, Image, image);
+    image = rm_check_destroyed(image_obj);
 
     x1 = fill->x1;
     y1 = fill->y1;
@@ -529,44 +498,26 @@ free_TextureFill(void *fill_obj)
 {
     rm_TextureFill *fill = (rm_TextureFill *)fill_obj;
 
+    // Do not trace destruction
     (void) DestroyImage(fill->texture);
     xfree(fill);
 }
 
 /*
-    Extern:     TextureFill.new(texture)
+    Extern:     TextureFill.allocate(texture)
     Purpose:    Create new TextureFill object
     Notes:      the texture is an Image or Image *object
 */
-#if !defined(HAVE_RB_DEFINE_ALLOC_FUNC)
-VALUE
-TextureFill_new(VALUE class, VALUE texture)
-{
-    rm_TextureFill *fill;
-    VALUE argv[1];
-    volatile VALUE new_fill;
-
-    new_fill = Data_Make_Struct(class
-                              , rm_TextureFill
-                              , NULL
-                              , free_TextureFill
-                              , fill);
-    argv[0] = texture;
-    rb_obj_call_init((VALUE)new_fill, 1, argv);
-    return new_fill;
-}
-#else
 VALUE
 TextureFill_alloc(VALUE class)
 {
     rm_TextureFill *fill;
     return Data_Make_Struct(class
-                        , rm_TextureFill
-                        , NULL
-                        , free_TextureFill
-                        , fill);
+                            , rm_TextureFill
+                            , NULL
+                            , free_TextureFill
+                            , fill);
 }
-#endif
 
 /*
     Extern:     TextureFill#initialize
@@ -584,7 +535,7 @@ TextureFill_initialize(VALUE self, VALUE texture_arg)
     texture_image = ImageList_cur_image(texture_arg);
 
     // Bump the reference count on the texture image.
-    Data_Get_Struct(texture_image, Image, texture);
+    texture = rm_check_destroyed(texture_image);
     (void) ReferenceImage(texture);
 
     fill->texture = texture;
@@ -601,7 +552,7 @@ TextureFill_fill(VALUE self, VALUE image_obj)
     rm_TextureFill *fill;
     Image *image;
 
-    Data_Get_Struct(image_obj, Image, image);
+    image = rm_check_destroyed(image_obj);
     Data_Get_Struct(self, rm_TextureFill, fill);
 
     (void) TextureImage(image, fill->texture);

data/ext/RMagick/rmilist.c

@@ -1,6 +1,6 @@
-/* $Id: rmilist.c,v 1.46.2.1.2.3 2008/09/10 23:25:13 rmagick Exp $ */
+/* $Id: rmilist.c,v 1.65 2007/12/26 21:41:24 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2008 by Timothy P. Hunter
+|                Copyright (C) 2007 by Timothy P. Hunter
 | Name:     rmilist.c
 | Author:   Tim Hunter
 | Purpose:  ImageList class method definitions for RMagick
@@ -8,6 +8,13 @@
 
 #include "rmagick.h"
 
+static Image *clone_imagelist(Image *);
+static Image *images_from_imagelist(VALUE);
+static long imagelist_length(VALUE);
+static VALUE imagelist_scene_eq(VALUE, VALUE);
+static void imagelist_push(VALUE, VALUE);
+static VALUE ImageList_new(void);
+
 
 /*
     Method:     ImageList#animate(<delay>)
@@ -29,7 +36,7 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
     }
 
     // Convert the images array to an images sequence.
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
 
     if (argc == 1)
     {
@@ -68,7 +75,7 @@ ImageList_append(VALUE self, VALUE stack_arg)
     ExceptionInfo exception;
 
     // Convert the image array to an image sequence.
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
 
     // If stack == true, stack rectangular images top-to-bottom,
     // otherwise left-to-right.
@@ -97,7 +104,7 @@ ImageList_average(VALUE self)
     ExceptionInfo exception;
 
     // Convert the images array to an images sequence.
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
 
     GetExceptionInfo(&exception);
     new_image = AverageImages(images, &exception);
@@ -125,7 +132,7 @@ ImageList_coalesce(VALUE self)
     ExceptionInfo exception;
 
     // Convert the image array to an image sequence.
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
 
     GetExceptionInfo(&exception);
     new_images = CoalesceImages(images, &exception);
@@ -139,6 +146,69 @@ ImageList_coalesce(VALUE self)
 }
 
 
+/*
+    Method:     ImageList#composite_layers
+    Purpose:    Equivalent to convert's -layers composite option
+    Notes:      see mogrify.c
+*/
+VALUE
+ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_COMPOSITELAYERS)
+    volatile VALUE source_images;
+    Image *dest, *source, *new_images;
+    RectangleInfo geometry;
+    CompositeOperator operator = OverCompositeOp;
+    ExceptionInfo exception;
+
+    switch (argc)
+    {
+        case 2:
+            VALUE_TO_ENUM(argv[1], operator, CompositeOperator);
+        case 1:
+            source_images = argv[0];
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (expected 1 or 2, got %d)", argc);
+            break;
+    }
+
+    // Convert ImageLists to image sequences.
+    dest = images_from_imagelist(self);
+    new_images = clone_imagelist(dest);
+    rm_split(dest);
+
+    source = images_from_imagelist(source_images);
+
+    SetGeometry(new_images,&geometry);
+    (void) 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);
+
+    GetExceptionInfo(&exception);
+    CompositeLayers(new_images, operator, source, geometry.x, geometry.y, &exception);
+    rm_split(source);
+    rm_check_exception(&exception, new_images, DestroyOnError);
+    (void) DestroyExceptionInfo(&exception);
+
+    return rm_imagelist_from_images(new_images);
+
+#else
+
+    self = self;
+    argc = argc;
+    argv = argv;
+    rm_not_implemented();
+    return (VALUE)0;
+
+#endif
+}
+
+
 /*
     Method:     ImageList#deconstruct
     Purpose:    compares each image with the next in a sequence and returns
@@ -152,7 +222,7 @@ ImageList_deconstruct(VALUE self)
     Image *new_images, *images;
     ExceptionInfo exception;
 
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
     GetExceptionInfo(&exception);
     new_images = DeconstructImages(images, &exception);
     rm_split(images);
@@ -180,7 +250,7 @@ ImageList_display(VALUE self)
     Data_Get_Struct(info_obj, Info, info);
 
     // Convert the images array to an images sequence.
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
 
     (void) DisplayImages(info, images);
     rm_split(images);
@@ -201,9 +271,15 @@ ImageList_flatten_images(VALUE self)
     Image *images, *new_image;
     ExceptionInfo exception;
 
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
     GetExceptionInfo(&exception);
+
+#if defined(HAVE_ENUM_FLATTENLAYER)
+    new_image = MergeImageLayers(images, FlattenLayer, &exception);
+#else
     new_image = FlattenImages(images, &exception);
+#endif
+
     rm_split(images);
     rm_check_exception(&exception, new_image, DestroyOnError);
     (void) DestroyExceptionInfo(&exception);
@@ -220,7 +296,6 @@ ImageList_flatten_images(VALUE self)
 VALUE
 ImageList_fx(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_FXIMAGECHANNEL)
     Image *images, *new_image;
     char *expression;
     ChannelType channels;
@@ -239,9 +314,9 @@ ImageList_fx(int argc, VALUE *argv, VALUE self)
         raise_ChannelType_error(argv[argc-1]);
     }
 
-    expression = STRING_PTR(argv[0]);
+    expression = StringValuePtr(argv[0]);
 
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
     GetExceptionInfo(&exception);
     new_image = FxImageChannel(images, channels, expression, &exception);
     rm_split(images);
@@ -251,10 +326,6 @@ ImageList_fx(int argc, VALUE *argv, VALUE self)
     rm_ensure_result(new_image);
 
     return rm_image_new(new_image);
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-#endif
 }
 
 
@@ -270,7 +341,7 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
     Image *images, *new_images = NULL;
     Image *map;
     unsigned int dither = False;
-    volatile VALUE scene, new_imagelist;
+    volatile VALUE scene, new_imagelist, t;
     ExceptionInfo exception;
 
     switch (argc)
@@ -278,7 +349,8 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
         case 2:
             dither = RTEST(argv[1]);
         case 1:
-            Data_Get_Struct(ImageList_cur_image(argv[0]), Image, map);
+            t = ImageList_cur_image(argv[0]);
+            map = rm_check_destroyed(t);
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
@@ -286,7 +358,7 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
     }
 
 
-    if (rm_imagelist_length(self) == 0)
+    if (imagelist_length(self) == 0L)
     {
         rb_raise(rb_eArgError, "no images in this image list");
     }
@@ -294,7 +366,7 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
     // Convert image array to image sequence, clone image sequence.
     GetExceptionInfo(&exception);
 
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
     new_images = CloneImageList(images, &exception);
     rm_split(images);
     rm_check_exception(&exception, new_images, DestroyOnError);
@@ -309,7 +381,7 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
     // Set @scene in new ImageList object to same value as in self.
     new_imagelist = rm_imagelist_from_images(new_images);
     scene = rb_iv_get(self, "@scene");
-    (void) rm_imagelist_scene_eq(new_imagelist, scene);
+    (void) imagelist_scene_eq(new_imagelist, scene);
 
     return new_imagelist;
 }
@@ -339,7 +411,7 @@ ImageList_montage(VALUE self)
 
     Data_Get_Struct(montage_obj, Montage, montage);
 
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
 
     // If app specified a non-default composition operator, use it for all images.
     if (montage->compose != UndefinedCompositeOp)
@@ -379,7 +451,7 @@ ImageList_morph(VALUE self, VALUE nimages)
     ExceptionInfo exception;
     long number_images;
 
-    if (rm_imagelist_length(self) < 1)
+    if (imagelist_length(self) < 1L)
     {
         rb_raise(rb_eArgError, "no images in this image list");
     }
@@ -392,7 +464,7 @@ ImageList_morph(VALUE self, VALUE nimages)
     }
 
     GetExceptionInfo(&exception);
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
     new_images = MorphImages(images, (unsigned long)number_images, &exception);
     rm_split(images);
     rm_check_exception(&exception, new_images, DestroyOnError);
@@ -415,8 +487,14 @@ ImageList_mosaic(VALUE self)
     ExceptionInfo exception;
 
     GetExceptionInfo(&exception);
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
+
+#if defined(HAVE_ENUM_MOSAICLAYER)
+    new_image = MergeImageLayers(images, MosaicLayer, &exception);
+#else
     new_image = MosaicImages(images, &exception);
+#endif
+
     rm_split(images);
     rm_check_exception(&exception, new_image, DestroyOnError);
     (void) DestroyExceptionInfo(&exception);
@@ -435,28 +513,75 @@ ImageList_mosaic(VALUE self)
 VALUE
 ImageList_optimize_layers(VALUE self, VALUE method)
 {
-#if defined(HAVE_COMPAREIMAGELAYERS)
-    Image *images, *new_images;
-    MagickLayerMethod mthd;
+    Image *images, *new_images, *new_images2;
+    LAYERMETHODTYPE mthd;
     ExceptionInfo exception;
 
+    new_images2 = NULL;     // defeat "unused variable" message
+
     GetExceptionInfo(&exception);
+#if defined(HAVE_TYPE_IMAGELAYERMETHOD)
+    VALUE_TO_ENUM(method, mthd, ImageLayerMethod);
+#else
     VALUE_TO_ENUM(method, mthd, MagickLayerMethod);
-    images = rm_images_from_imagelist(self);
+#endif
+    images = 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;
+#if defined(HAVE_ENUM_OPTIMIZETRANSLAYER)
+        case OptimizeTransLayer:
+            new_images = clone_imagelist(images);
+            OptimizeImageTransparency(new_images, &exception);
+            break;
+#endif
+#if defined(HAVE_ENUM_REMOVEDUPSLAYER)
+        case RemoveDupsLayer:
+            new_images = clone_imagelist(images);
+            RemoveDuplicateLayers(&new_images, &exception);
+            break;
 #endif
+#if defined(HAVE_ENUM_REMOVEZEROLAYER)
+        case RemoveZeroLayer:
+            new_images = clone_imagelist(images);
+            RemoveZeroDelayLayers(&new_images, &exception);
+            break;
+#endif
+#if defined(HAVE_ENUM_COMPOSITELAYER)
+        case CompositeLayer:
+            rb_raise(rb_eNotImpError, "Magick::CompositeLayer is not yet supported.");
+            break;
+#endif
+#if defined(HAVE_ENUM_OPTIMIZEIMAGELAYER)
+            // In 6.3.4-ish, OptimizeImageLayer replaced OptimizeLayer
+        case OptimizeImageLayer:
+            new_images = OptimizeImageLayers(images, &exception);
+            break;
+            // and OptimizeLayer became a "General Purpose, GIF Animation Optimizer" (ref. mogrify.c)
+        case OptimizeLayer:
+            new_images = CoalesceImages(images, &exception);
+            rm_split(images);
+            rm_check_exception(&exception, new_images, DestroyOnError);
+            new_images2 = OptimizeImageLayers(new_images, &exception);
+            DestroyImageList(new_images);
+            rm_check_exception(&exception, new_images2, DestroyOnError);
+            new_images = new_images2;
+            OptimizeImageTransparency(new_images, &exception);
+            rm_check_exception(&exception, new_images, DestroyOnError);
+            // mogrify supports -dither here. We don't.
+            (void) MapImages(new_images, NULL, 0);
+            break;
+#else
         case OptimizeLayer:
             new_images = OptimizeImageLayers(images, &exception);
             break;
+#endif
         case OptimizePlusLayer:
             new_images = OptimizePlusImageLayers(images, &exception);
             break;
@@ -477,27 +602,21 @@ ImageList_optimize_layers(VALUE self, VALUE method)
     rm_ensure_result(new_images);
 
     return rm_imagelist_from_images(new_images);
-
-#else
-    rm_not_implemented();
-    return (VALUE)0;
-#endif
 }
 
 
 /*
-    External:   rm_imagelist_new
+    Static:     ImageList_new
     Purpose:    create a new ImageList object with no images
     Notes:      this simply calls ImageList.new() in RMagick.rb
 */
-VALUE
-rm_imagelist_new(void)
+static VALUE
+ImageList_new()
 {
     return rb_funcall(Class_ImageList, rm_ID_new, 0);
 }
 
 
-
 /*
      Extern:   rm_imagelist_from_images
      Purpose:  Construct a new imagelist object from a list of images
@@ -506,51 +625,53 @@ rm_imagelist_new(void)
 VALUE
 rm_imagelist_from_images(Image *images)
 {
-     volatile VALUE new_imagelist;
-     Image *image;
+    volatile VALUE new_imagelist;
+    Image *image;
 
-     if (!images)
-     {
-         rb_bug("rm_imagelist_from_images called with NULL argument");
-     }
+    if (!images)
+    {
+        rb_bug("rm_imagelist_from_images called with NULL argument");
+    }
 
-     new_imagelist = rm_imagelist_new();
+    new_imagelist = ImageList_new();
 
-     while (images)
-     {
-          image = RemoveFirstImageFromList(&images);
-          rm_imagelist_push(new_imagelist, rm_image_new(image));
-     }
+    while (images)
+    {
+        image = RemoveFirstImageFromList(&images);
+        imagelist_push(new_imagelist, rm_image_new(image));
+    }
 
-     (void) rb_iv_set(new_imagelist, "@scene", INT2FIX(0));
-     return new_imagelist;
+    (void) rb_iv_set(new_imagelist, "@scene", INT2FIX(0));
+    return new_imagelist;
 }
 
 
 /*
-    Extern:     rm_images_from_imagelist
+    Extern:     images_from_imagelist
     Purpose:    Convert an array of Image *s to an ImageMagick scene
                 sequence (i.e. a doubly-linked list of Images)
     Returns:    a pointer to the head of the scene sequence list
 */
-Image *
-rm_images_from_imagelist(VALUE imagelist)
+static Image *
+images_from_imagelist(VALUE imagelist)
 {
     long x, len;
     Image *head = NULL;
+    volatile VALUE images, t;
 
-    Check_Type(imagelist, T_ARRAY);
-    len = rm_imagelist_length(imagelist);
+    len = imagelist_length(imagelist);
     if (len == 0)
     {
         rb_raise(rb_eArgError, "no images in this image list");
     }
 
+    images = rb_iv_get(imagelist, "@images");
     for (x = 0; x < len; x++)
     {
         Image *image;
 
-        Data_Get_Struct(rb_ary_entry(imagelist, x), Image, image);
+        t = rb_ary_entry(images, x);
+        image = rm_check_destroyed(t);
         AppendImageToList(&head, image);
     }
 
@@ -559,41 +680,66 @@ rm_images_from_imagelist(VALUE imagelist)
 
 
 /*
- *   Extern:   rm_imagelist_scene_eq(imagelist, scene)
+ *   Static:   imagelist_scene_eq(imagelist, scene)
  *   Purpose:  @scene attribute writer
 */
-VALUE
-rm_imagelist_scene_eq(VALUE imagelist, VALUE scene)
+static VALUE
+imagelist_scene_eq(VALUE imagelist, VALUE scene)
 {
-     rm_check_frozen(imagelist);
-     (void) rb_iv_set(imagelist, "@scene", scene);
-     return scene;
+    rb_check_frozen(imagelist);
+    (void) rb_iv_set(imagelist, "@scene", scene);
+    return scene;
 }
 
 /*
-    External:   rm_imagelist_length
-    Purpose:    return the # of images in an imagelist
+    Static:    imagelist_length
+    Purpose:   return the # of images in an imagelist
 */
-int
-rm_imagelist_length(VALUE imagelist)
+static long
+imagelist_length(VALUE imagelist)
 {
-    volatile VALUE len;
-
-    len = rb_funcall(imagelist, rm_ID_length, 0);
-    return FIX2INT(len);
+    volatile VALUE images = rb_iv_get(imagelist, "@images");
+    return RARRAY(images)->len;
 }
 
 /*
-    External:   rm_imagelist_push
+    Static:     imagelist_push
     Purpose:    push an image onto the end of the imagelist
 */
-void
-rm_imagelist_push(VALUE imagelist, VALUE image)
+static void
+imagelist_push(VALUE imagelist, VALUE image)
 {
-    rm_check_frozen(imagelist);
+    rb_check_frozen(imagelist);
     (void) rb_funcall(imagelist, rm_ID_push, 1, image);
 }
 
+
+/*
+ *  Static:     clone_imagelist
+ *  Purpose:    clone a list of images, handle errors
+ */
+static Image *
+clone_imagelist(Image *images)
+{
+    Image *new_imagelist = NULL, *image, *clone;
+    ExceptionInfo exception;
+
+    GetExceptionInfo(&exception);
+
+    image = GetFirstImageInList(images);
+    while (image)
+    {
+        clone = CloneImage(image, 0, 0, MagickTrue, &exception);
+        rm_check_exception(&exception, new_imagelist, DestroyOnError);
+        AppendImageToList(&new_imagelist, clone);
+        image = GetNextImageInList(image);
+    }
+
+    (void) DestroyExceptionInfo(&exception);
+    return new_imagelist;
+}
+
+
 /*
     Method:     ImageList#quantize(<number_colors<, colorspace<, dither<, tree_depth<, measure_error>>>>>)
                      defaults: 256, Magick::RGBColorspace, true, 0, false
@@ -631,14 +777,14 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
             break;
     }
 
-    if (rm_imagelist_length(self) == 0)
+    if (imagelist_length(self) == 0L)
     {
         rb_raise(rb_eArgError, "no images in this image list");
     }
 
     // Convert image array to image sequence, clone image sequence.
     GetExceptionInfo(&exception);
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
     new_images = CloneImageList(images, &exception);
     rm_split(images);
     rm_check_exception(&exception, new_images, DestroyOnError);
@@ -652,10 +798,10 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
 
     // Create new ImageList object, convert mapped image sequence to images,
     // append to images array.
-    new_imagelist = rm_imagelist_new();
-    while ((new_image = RemoveFirstImageFromList(&new_images)))
+    new_imagelist = ImageList_new();
+    while ((new_image = ShiftImageList(&new_images)))
     {
-        rm_imagelist_push(new_imagelist, rm_image_new(new_image));
+        imagelist_push(new_imagelist, rm_image_new(new_image));
     }
 
     // Set @scene in new ImageList object to same value as in self.
@@ -686,7 +832,7 @@ ImageList_to_blob(VALUE self)
     Data_Get_Struct(info_obj, Info, info);
 
     // Convert the images array to an images sequence.
-    images = rm_images_from_imagelist(self);
+    images = images_from_imagelist(self);
 
     GetExceptionInfo(&exception);
     (void) SetImageInfo(info, MagickTrue, &exception);
@@ -705,16 +851,10 @@ ImageList_to_blob(VALUE self)
     // can happen is that there's only one image or the format
     // doesn't support multi-image files.
     info->adjoin = MagickTrue;
-#if defined(HAVE_IMAGESTOBLOB)
     blob = ImagesToBlob(info, images, &length, &exception);
-#else
-    blob = ImageToBlob(info, images, &length, &exception);
-#endif
-    if (blob && exception.severity >= ErrorException)
+    if (exception.severity != UndefinedException)
     {
         magick_free((void*)blob);
-        blob = NULL;
-        length = 0;
     }
     rm_split(images);
     CHECK_EXCEPTION()
@@ -740,7 +880,7 @@ ImageList_to_blob(VALUE self)
 static VALUE file_arg_rescue(VALUE arg)
 {
     rb_raise(rb_eTypeError, "argument must be path name or open file (%s given)",
-            rb_class2name(CLASS_OF(arg)));
+             rb_class2name(CLASS_OF(arg)));
 }
 
 
@@ -782,7 +922,7 @@ ImageList_write(VALUE self, VALUE file)
         file = rb_rescue(rb_String, file, file_arg_rescue, file);
 
         // Copy the filename to the Info and to the Image.
-        filename = STRING_PTR_LEN(file, filenameL);
+        filename = rb_str2cstr(file, &filenameL);
         filenameL = min(filenameL, MaxTextExtent-1);
         memcpy(info->filename, filename, (size_t)filenameL);
         info->filename[filenameL] = '\0';
@@ -790,7 +930,7 @@ ImageList_write(VALUE self, VALUE file)
     }
 
     // Convert the images array to an images sequence.
-    images = rm_images_from_imagelist(self);
+    images = 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
@@ -812,7 +952,7 @@ ImageList_write(VALUE self, VALUE file)
     (void) DestroyExceptionInfo(&exception);
 
     // Tell WriteImage if we want a multi-images file.
-    if (rm_imagelist_length(self) > 1 && m->adjoin)
+    if (imagelist_length(self) > 1L && m->adjoin)
     {
         info->adjoin = MagickTrue;
     }