rmagick 3.0.0 → 3.1.0

data/ext/RMagick/rmfill.c

@@ -19,8 +19,8 @@ typedef struct
     double y1; /**< y position of first point */
     double x2; /**< x position of second point */
     double y2; /**< y position of second point */
-    PixelPacket start_color; /**< the start color */
-    PixelPacket stop_color; /**< the stop color */
+    PixelColor start_color; /**< the start color */
+    PixelColor stop_color; /**< the stop color */
 } rm_GradientFill;
 
 /** Data associated with a TextureFill */
@@ -91,8 +91,8 @@ GradientFill_initialize(
     fill->y1 = NUM2DBL(y1);
     fill->x2 = NUM2DBL(x2);
     fill->y2 = NUM2DBL(y2);
-    Color_to_PixelPacket(&fill->start_color, start_color);
-    Color_to_PixelPacket(&fill->stop_color, stop_color);
+    Color_to_PixelColor(&fill->start_color, start_color);
+    Color_to_PixelColor(&fill->stop_color, stop_color);
 
     return self;
 }
@@ -113,17 +113,15 @@ point_fill(
           Image *image,
           double x0,
           double y0,
-          PixelPacket *start_color,
-          PixelPacket *stop_color)
+          PixelColor *start_color,
+          PixelColor *stop_color)
 {
     double steps, distance;
-    unsigned long x, y;
+    ssize_t x, y;
     MagickRealType red_step, green_step, blue_step;
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-#endif
 
     steps = sqrt((double)((image->columns-x0)*(image->columns-x0)
                           + (image->rows-y0)*(image->rows-y0)));
@@ -132,18 +130,14 @@ point_fill(
     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++)
+    for (y = 0; y < (ssize_t) image->rows; y++)
     {
         PixelPacket *row_pixels;
 
-#if defined(HAVE_QUEUEAUTHENTICPIXELS)
-        row_pixels = QueueAuthenticPixels(image, 0, (long int)y, image->columns, 1, exception);
+        row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
         CHECK_EXCEPTION()
-#else
-        row_pixels = SetImagePixels(image, 0, (long int)y, image->columns, 1);
-        rm_check_image_exception(image, RetainOnError);
-#endif
-        for (x = 0; x < image->columns; x++)
+
+        for (x = 0; x < (ssize_t) image->columns; x++)
         {
             distance = sqrt((double)((x-x0)*(x-x0)+(y-y0)*(y-y0)));
             row_pixels[x].red     = ROUND_TO_QUANTUM(start_color->red   + (distance * red_step));
@@ -152,18 +146,11 @@ point_fill(
             row_pixels[x].opacity = OpaqueOpacity;
         }
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
         SyncAuthenticPixels(image, exception);
         CHECK_EXCEPTION()
-#else
-        SyncImagePixels(image);
-        rm_check_image_exception(image, RetainOnError);
-#endif
     }
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     DestroyExceptionInfo(exception);
-#endif
 }
 
 /**
@@ -181,18 +168,16 @@ static void
 vertical_fill(
              Image *image,
              double x1,
-             PixelPacket *start_color,
-             PixelPacket *stop_color)
+             PixelColor *start_color,
+             PixelColor *stop_color)
 {
     double steps;
-    unsigned long x, y;
+    ssize_t x, y;
     PixelPacket *master;
     MagickRealType red_step, green_step, blue_step;
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-#endif
 
     steps = FMAX(x1, ((long)image->columns)-x1);
 
@@ -212,7 +197,7 @@ vertical_fill(
     // it to each actual row.
     master = ALLOC_N(PixelPacket, image->columns);
 
-    for (x = 0; x < image->columns; x++)
+    for (x = 0; x < (ssize_t) image->columns; x++)
     {
         double distance   = fabs(x1 - x);
         master[x].red     = ROUND_TO_QUANTUM(start_color->red   + (red_step * distance));
@@ -222,32 +207,28 @@ vertical_fill(
     }
 
     // Now copy the master row to each actual row.
-    for (y = 0; y < image->rows; y++)
+    for (y = 0; y < (ssize_t) image->rows; y++)
     {
         PixelPacket *row_pixels;
 
-#if defined(HAVE_QUEUEAUTHENTICPIXELS)
-        row_pixels = QueueAuthenticPixels(image, 0, (long int)y, image->columns, 1, exception);
-        CHECK_EXCEPTION()
-#else
-        row_pixels = SetImagePixels(image, 0, (long int)y, image->columns, 1);
-        rm_check_image_exception(image, RetainOnError);
-#endif
+        row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
+        if (rm_should_raise_exception(exception, RetainExceptionRetention))
+        {
+            xfree((void *)master);
+            rm_raise_exception(exception);
+        }
 
         memcpy(row_pixels, master, image->columns * sizeof(PixelPacket));
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
         SyncAuthenticPixels(image, exception);
-        CHECK_EXCEPTION()
-#else
-        SyncImagePixels(image);
-        rm_check_image_exception(image, RetainOnError);
-#endif
+        if (rm_should_raise_exception(exception, RetainExceptionRetention))
+        {
+            xfree((void *)master);
+            rm_raise_exception(exception);
+        }
     }
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     DestroyExceptionInfo(exception);
-#endif
 
     xfree((void *)master);
 }
@@ -266,18 +247,16 @@ static void
 horizontal_fill(
                Image *image,
                double y1,
-               PixelPacket *start_color,
-               PixelPacket *stop_color)
+               PixelColor *start_color,
+               PixelColor *stop_color)
 {
     double steps;
-    unsigned long x, y;
+    ssize_t x, y;
     PixelPacket *master;
     MagickRealType red_step, green_step, blue_step;
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-#endif
 
     steps = FMAX(y1, ((long)image->rows)-y1);
 
@@ -296,7 +275,7 @@ horizontal_fill(
     // each of the "real" columns.
     master = ALLOC_N(PixelPacket, image->rows);
 
-    for (y = 0; y < image->rows; y++)
+    for (y = 0; y < (ssize_t) image->rows; y++)
     {
         double distance   = fabs(y1 - y);
         master[y].red     = ROUND_TO_QUANTUM(start_color->red   + (distance * red_step));
@@ -305,32 +284,30 @@ horizontal_fill(
         master[y].opacity = OpaqueOpacity;
     }
 
-    for (x = 0; x < image->columns; x++)
+    for (x = 0; x < (ssize_t) image->columns; x++)
     {
         PixelPacket *col_pixels;
 
-#if defined(HAVE_QUEUEAUTHENTICPIXELS)
-        col_pixels = QueueAuthenticPixels(image, (long int)x, 0, 1, image->rows, exception);
-#else
-        col_pixels = SetImagePixels(image, (long int)x, 0, 1, image->rows);
-        rm_check_image_exception(image, RetainOnError);
-#endif
+        col_pixels = QueueAuthenticPixels(image, x, 0, 1, image->rows, exception);
+        if (rm_should_raise_exception(exception, RetainExceptionRetention))
+        {
+            xfree((void *)master);
+            rm_raise_exception(exception);
+        }
+
         memcpy(col_pixels, master, image->rows * sizeof(PixelPacket));
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
         SyncAuthenticPixels(image, exception);
-        CHECK_EXCEPTION()
-#else
-        SyncImagePixels(image);
-        rm_check_image_exception(image, RetainOnError);
-#endif
+        if (rm_should_raise_exception(exception, RetainExceptionRetention))
+        {
+            xfree((void *)master);
+            rm_raise_exception(exception);
+        }
     }
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     DestroyExceptionInfo(exception);
-#endif
 
-    xfree((PixelPacket *)master);
+    xfree((void *)master);
 }
 
 /**
@@ -354,18 +331,16 @@ v_diagonal_fill(
                double y1,
                double x2,
                double y2,
-               PixelPacket *start_color,
-               PixelPacket *stop_color)
+               PixelColor *start_color,
+               PixelColor *stop_color)
 {
-    unsigned long x, y;
+    ssize_t x, y;
     MagickRealType red_step, green_step, blue_step;
     double m, b, steps = 0.0;
     double d1, d2;
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-#endif
 
     // Compute the equation of the line: y=mx+b
     m = ((double)(y2 - y1))/((double)(x2 - x1));
@@ -393,7 +368,7 @@ v_diagonal_fill(
     // If the line is entirely > image->rows, swap the start & end color
     if (steps < 0)
     {
-        PixelPacket t = *stop_color;
+        PixelColor t = *stop_color;
         *stop_color = *start_color;
         *start_color = t;
         steps = -steps;
@@ -403,18 +378,14 @@ v_diagonal_fill(
     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++)
+    for (y = 0; y < (ssize_t) image->rows; y++)
     {
         PixelPacket *row_pixels;
 
-#if defined(HAVE_QUEUEAUTHENTICPIXELS)
-        row_pixels = QueueAuthenticPixels(image, 0, (long int)y, image->columns, 1, exception);
+        row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
         CHECK_EXCEPTION()
-#else
-        row_pixels = SetImagePixels(image, 0, (long int)y, image->columns, 1);
-        rm_check_image_exception(image, RetainOnError);
-#endif
-        for (x = 0; x < image->columns; x++)
+
+        for (x = 0; x < (ssize_t) image->columns; x++)
         {
             double distance = (double) abs((int)(y-(m * x + b)));
             row_pixels[x].red     = ROUND_TO_QUANTUM(start_color->red   + (distance * red_step));
@@ -423,19 +394,11 @@ v_diagonal_fill(
             row_pixels[x].opacity = OpaqueOpacity;
         }
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
         SyncAuthenticPixels(image, exception);
         CHECK_EXCEPTION()
-#else
-        SyncImagePixels(image);
-        rm_check_image_exception(image, RetainOnError);
-#endif
     }
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     DestroyExceptionInfo(exception);
-#endif
-
 }
 
 /**
@@ -459,18 +422,16 @@ h_diagonal_fill(
                double y1,
                double x2,
                double y2,
-               PixelPacket *start_color,
-               PixelPacket *stop_color)
+               PixelColor *start_color,
+               PixelColor *stop_color)
 {
-    unsigned long x, y;
+    ssize_t x, y;
     double m, b, steps = 0.0;
     MagickRealType red_step, green_step, blue_step;
     double d1, d2;
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-#endif
 
     // Compute the equation of the line: y=mx+b
     m = ((double)(y2 - y1))/((double)(x2 - x1));
@@ -500,7 +461,7 @@ h_diagonal_fill(
     // If the line is entirely > image->columns, swap the start & end color
     if (steps < 0)
     {
-        PixelPacket t = *stop_color;
+        PixelColor t = *stop_color;
         *stop_color = *start_color;
         *start_color = t;
         steps = -steps;
@@ -510,18 +471,14 @@ h_diagonal_fill(
     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++)
+    for (y = 0; y < (ssize_t) image->rows; y++)
     {
         PixelPacket *row_pixels;
 
-#if defined(HAVE_QUEUEAUTHENTICPIXELS)
-        row_pixels = QueueAuthenticPixels(image, 0, (long int)y, image->columns, 1, exception);
+        row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
         CHECK_EXCEPTION()
-#else
-        row_pixels = SetImagePixels(image, 0, (long int)y, image->columns, 1);
-        rm_check_image_exception(image, RetainOnError);
-#endif
-        for (x = 0; x < image->columns; x++)
+
+        for (x = 0; x < (ssize_t) image->columns; x++)
         {
             double distance = (double) abs((int)(x-((y-b)/m)));
             row_pixels[x].red     = ROUND_TO_QUANTUM(start_color->red   + (distance * red_step));
@@ -530,18 +487,11 @@ h_diagonal_fill(
             row_pixels[x].opacity = OpaqueOpacity;
         }
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS)
         SyncAuthenticPixels(image, exception);
         CHECK_EXCEPTION()
-#else
-        SyncImagePixels(image);
-        rm_check_image_exception(image, RetainOnError);
-#endif
     }
 
-#if defined(HAVE_SYNCAUTHENTICPIXELS) || defined(HAVE_QUEUEAUTHENTICPIXELS)
     DestroyExceptionInfo(exception);
-#endif
 }
 
 /**
@@ -560,7 +510,7 @@ GradientFill_fill(VALUE self, VALUE image_obj)
 {
     rm_GradientFill *fill;
     Image *image;
-    PixelPacket start_color, stop_color;
+    PixelColor start_color, stop_color;
     double x1, y1, x2, y2;          // points on the line
 
     Data_Get_Struct(self, rm_GradientFill, fill);

data/ext/RMagick/rmilist.c

@@ -45,7 +45,12 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
     Image *images;
     Info *info;
     VALUE info_obj;
+    unsigned int delay;
 
+    if (argc == 1)
+    {
+        delay = NUM2UINT(argv[0]);
+    }
     if (argc > 1)
     {
         rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 or 1)", argc);
@@ -60,9 +65,7 @@ ImageList_animate(int argc, VALUE *argv, VALUE self)
     if (argc == 1)
     {
         Image *img;
-        unsigned int delay;
 
-        delay = NUM2UINT(argv[0]);
         for (img = images; img; img = GetNextImageInList(img))
         {
             img->delay = delay;
@@ -135,11 +138,7 @@ ImageList_average(VALUE self)
     images = images_from_imagelist(self);
 
     exception = AcquireExceptionInfo();
-#if defined(HAVE_EVALUATEIMAGES)
     new_image = EvaluateImages(images, MeanEvaluateOperator, exception);
-#else
-    new_image = AverageImages(images, exception);
-#endif
 
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
@@ -333,11 +332,7 @@ ImageList_flatten_images(VALUE self)
     images = images_from_imagelist(self);
     exception = AcquireExceptionInfo();
 
-#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);
@@ -364,6 +359,7 @@ ImageList_flatten_images(VALUE self)
  * @param argv array of input arguments
  * @param self this object
  * @return a new image
+ * @deprecated This method has been deprecated. Please use Image_fx.
  */
 VALUE
 ImageList_fx(int argc, VALUE *argv, VALUE self)
@@ -373,6 +369,7 @@ ImageList_fx(int argc, VALUE *argv, VALUE self)
     ChannelType channels;
     ExceptionInfo *exception;
 
+    rb_warning("ImageList#fx is deprecated; use Image#fx");
 
     channels = extract_channels(&argc, argv);
 
@@ -426,10 +423,8 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
     VALUE scene, new_imagelist, t;
     ExceptionInfo *exception;
 
-#if defined(HAVE_REMAPIMAGES)
     QuantizeInfo quantize_info;
     rb_warning("ImageList#map is deprecated. Use ImageList#remap instead.");
-#endif
 
     switch (argc)
     {
@@ -446,9 +441,9 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
 
 
     // Convert image array to image sequence, clone image sequence.
-    exception = AcquireExceptionInfo();
-
     images = images_from_imagelist(self);
+
+    exception = AcquireExceptionInfo();
     new_images = CloneImageList(images, exception);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
@@ -457,13 +452,9 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
     rm_ensure_result(new_images);
 
     // Call ImageMagick
-#if defined(HAVE_REMAPIMAGES)
     GetQuantizeInfo(&quantize_info);
     quantize_info.dither = dither;
     (void) RemapImages(&quantize_info, new_images, map);
-#else
-    (void) MapImages(new_images, map, dither);
-#endif
     rm_check_image_exception(new_images, DestroyOnError);
 
     // Set @scene in new ImageList object to same value as in self.
@@ -568,8 +559,8 @@ ImageList_morph(VALUE self, VALUE nimages)
         rb_raise(rb_eArgError, "number of intervening images must be > 0");
     }
 
-    exception = AcquireExceptionInfo();
     images = images_from_imagelist(self);
+    exception = AcquireExceptionInfo();
     new_images = MorphImages(images, (unsigned long)number_images, exception);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
@@ -596,14 +587,10 @@ ImageList_mosaic(VALUE self)
     Image *images, *new_image;
     ExceptionInfo *exception;
 
-    exception = AcquireExceptionInfo();
     images = images_from_imagelist(self);
 
-#if defined(HAVE_ENUM_MOSAICLAYER)
+    exception = AcquireExceptionInfo();
     new_image = MergeImageLayers(images, MosaicLayer, exception);
-#else
-    new_image = MosaicImages(images, exception);
-#endif
 
     rm_split(images);
     rm_check_exception(exception, new_image, DestroyOnError);
@@ -629,20 +616,16 @@ VALUE
 ImageList_optimize_layers(VALUE self, VALUE method)
 {
     Image *images, *new_images, *new_images2;
-    LAYERMETHODTYPE mthd;
+    ImageLayerMethod mthd;
     ExceptionInfo *exception;
     QuantizeInfo quantize_info;
 
     new_images2 = NULL;     // defeat "unused variable" message
 
-    exception = AcquireExceptionInfo();
-#if defined(HAVE_TYPE_IMAGELAYERMETHOD)
     VALUE_TO_ENUM(method, mthd, ImageLayerMethod);
-#else
-    VALUE_TO_ENUM(method, mthd, MagickLayerMethod);
-#endif
     images = images_from_imagelist(self);
 
+    exception = AcquireExceptionInfo();
     switch (mthd)
     {
         case CoalesceLayer:
@@ -665,6 +648,7 @@ ImageList_optimize_layers(VALUE self, VALUE method)
             break;
         case CompositeLayer:
             rm_split(images);
+            (void) 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
@@ -683,12 +667,8 @@ ImageList_optimize_layers(VALUE self, VALUE method)
             OptimizeImageTransparency(new_images, exception);
             rm_check_exception(exception, new_images, DestroyOnError);
             // mogrify supports -dither here. We don't.
-#if defined(HAVE_REMAPIMAGE)
             GetQuantizeInfo(&quantize_info);
             (void) RemapImages(&quantize_info, new_images, NULL);
-#else
-            (void) MapImages(new_images, NULL, 0);
-#endif
             break;
         case OptimizePlusLayer:
             new_images = OptimizePlusImageLayers(images, exception);
@@ -698,28 +678,21 @@ ImageList_optimize_layers(VALUE self, VALUE method)
         case CompareOverlayLayer:
             new_images = CompareImageLayers(images, mthd, exception);
             break;
-#if defined(HAVE_ENUM_MOSAICLAYER)
         case MosaicLayer:
             new_images = MergeImageLayers(images, mthd, exception);
             break;
-#endif
-#if defined(HAVE_ENUM_FLATTENLAYER)
         case FlattenLayer:
             new_images = MergeImageLayers(images, mthd, exception);
             break;
-#endif
-#if defined(HAVE_ENUM_MERGELAYER)
         case MergeLayer:
             new_images = MergeImageLayers(images, mthd, exception);
             break;
-#endif
-#if defined(HAVE_ENUM_TRIMBOUNDSLAYER)
         case TrimBoundsLayer:
             new_images = MergeImageLayers(images, mthd, exception);
             break;
-#endif
         default:
             rm_split(images);
+            (void) DestroyExceptionInfo(exception);
             rb_raise(rb_eArgError, "undefined layer method");
             break;
     }
@@ -861,6 +834,10 @@ static long
 imagelist_length(VALUE imagelist)
 {
     VALUE images = rb_iv_get(imagelist, "@images");
+    if (!RB_TYPE_P(images, T_ARRAY))
+    {
+        rb_raise(Class_ImageMagickError, "@images is not of type Array");
+    }
 
     RB_GC_GUARD(images);
 
@@ -979,15 +956,15 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
         case 4:
             quantize_info.tree_depth = (unsigned long)NUM2INT(argv[3]);
         case 3:
-#if defined(HAVE_TYPE_DITHERMETHOD) && defined(HAVE_ENUM_NODITHERMETHOD)
             if (rb_obj_is_kind_of(argv[2], Class_DitherMethod))
             {
                 VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
                 quantize_info.dither = quantize_info.dither_method != NoDitherMethod;
             }
-#else
-            quantize_info.dither = (MagickBooleanType) RTEST(argv[2]);
-#endif
+            else
+            {
+                quantize_info.dither = (MagickBooleanType) RTEST(argv[2]);
+            }
         case 2:
             VALUE_TO_ENUM(argv[1], quantize_info.colorspace, ColorspaceType);
         case 1:
@@ -1001,8 +978,8 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
 
 
     // Convert image array to image sequence, clone image sequence.
-    exception = AcquireExceptionInfo();
     images = images_from_imagelist(self);
+    exception = AcquireExceptionInfo();
     new_images = CloneImageList(images, exception);
     rm_split(images);
     rm_check_exception(exception, new_images, DestroyOnError);
@@ -1054,7 +1031,6 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
 VALUE
 ImageList_remap(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_REMAPIMAGES) || defined(HAVE_AFFINITYIMAGES)
     Image *images, *remap_image = NULL;
     QuantizeInfo quantize_info;
 
@@ -1080,22 +1056,11 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
 
     images = images_from_imagelist(self);
 
-#if defined(HAVE_REMAPIMAGE)
     (void) RemapImages(&quantize_info, images, remap_image);
-#else
-    (void) AffinityImages(&quantize_info, images, remap_image);
-#endif
     rm_check_image_exception(images, RetainOnError);
     rm_split(images);
 
     return self;
-#else
-    self = self;
-    argc = argc;
-    argv = argv;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -1207,7 +1172,7 @@ ImageList_write(VALUE self, VALUE file)
 
     if (TYPE(file) == T_FILE)
     {
-        OpenFile *fptr;
+        rb_io_t *fptr;
 
         // Ensure file is open - raise error if not
         GetOpenFile(file, fptr);
@@ -1215,7 +1180,7 @@ ImageList_write(VALUE self, VALUE file)
         add_format_prefix(info, fptr->pathv);
         SetImageInfoFile(info, NULL);
 #else
-        SetImageInfoFile(info, GetReadFile(fptr));
+        SetImageInfoFile(info, rb_io_stdio_file(fptr));
 #endif
     }
     else
@@ -1245,7 +1210,7 @@ ImageList_write(VALUE self, VALUE file)
     (void) DestroyExceptionInfo(exception);
 
     // Tell WriteImage if we want a multi-images file.
-    if (imagelist_length(self) > 1L && m->adjoin)
+    if (imagelist_length(self) > 1L && GetMagickAdjoin(m))
     {
         info->adjoin = MagickTrue;
     }