rmagick 2.9.2 → 2.10.0

data/ext/RMagick/rmdraw.c

@@ -1,4 +1,4 @@
-/* $Id: rmdraw.c,v 1.77 2009/02/28 23:50:35 rmagick Exp $ */
+/* $Id: rmdraw.c,v 1.80 2009/06/19 22:07:40 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmdraw.c
@@ -774,11 +774,7 @@ VALUE Draw_annotate(
     }
 
     // Translate & store in Draw structure
-#if defined(HAVE_INTERPRETIMAGEPROPERTIES)
     draw->info->text = InterpretImageProperties(NULL, image, StringValuePtr(text));
-#else
-    draw->info->text = InterpretImageAttributes(NULL, image, StringValuePtr(text));
-#endif
     if (!draw->info->text)
     {
         rb_raise(rb_eArgError, "no text");
@@ -885,15 +881,17 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case BlendCompositeOp:
                 op = "Blend";
                 break;
+#if defined(HAVE_ENUM_BLURCOMPOSITEOP)
+            case BlurCompositeOp:
+                op = "Blur";
+                break;
+#endif
             case BumpmapCompositeOp:
                 op = "Bumpmap";
                 break;
-
-#if defined(HAVE_ENUM_CHANGEMASKCOMPOSITEOP)
             case ChangeMaskCompositeOp:
                 op = "ChangeMask";
                 break;
-#endif
             case ClearCompositeOp:
                 op = "Clear";
                 break;
@@ -936,11 +934,14 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case DarkenCompositeOp:
                 op = "Darken";
                 break;
-#if defined(HAVE_ENUM_DIVIDECOMPOSITEOP)
+#if defined(HAVE_ENUM_DISTORTCOMPOSITEOP)
+            case DistortCompositeOp:
+                op = "Distort";
+                break;
+#endif
             case DivideCompositeOp:
                 op = "Divide";
                 break;
-#endif
             case DstCompositeOp:
                 op = "Dst";
                 break;
@@ -980,11 +981,9 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case LightenCompositeOp:
                 op = "Lighten";
                 break;
-#if defined(HAVE_ENUM_LINEARLIGHTCOMPOSITEOP)
             case LinearLightCompositeOp:
                 op = "LinearLight";
                 break;
-#endif
             case LuminizeCompositeOp:
                 op = "Luminize";
                 break;
@@ -1565,11 +1564,7 @@ get_type_metrics(
     }
 
     Data_Get_Struct(self, Draw, draw);
-#if defined(HAVE_INTERPRETIMAGEPROPERTIES)
     draw->info->text = InterpretImageProperties(NULL, image, text);
-#else
-    draw->info->text = InterpretImageAttributes(NULL, image, text);
-#endif
     if (!draw->info->text)
     {
         rb_raise(rb_eArgError, "no text to measure");

data/ext/RMagick/rmenum.c

@@ -1,4 +1,4 @@
-/* $Id: rmenum.c,v 1.3 2009/03/18 22:40:41 rmagick Exp $ */
+/* $Id: rmenum.c,v 1.6 2009/06/19 22:07:40 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmenum.c
@@ -352,11 +352,9 @@ ColorspaceType_new(ColorspaceType cs)
         case LogColorspace:
             name = "LogColorspace";
             break;
-#if defined(HAVE_ENUM_CMYCOLORSPACE)
         case CMYColorspace:
             name = "CMYColorspace";
             break;
-#endif
     }
 
     return rm_enum_new(Class_ColorspaceType, ID2SYM(rb_intern(name)), INT2FIX(cs));
@@ -377,10 +375,11 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(NoCompositeOp)
         ENUM_TO_NAME(AddCompositeOp)
         ENUM_TO_NAME(AtopCompositeOp)
+#if defined(HAVE_ENUM_BLURCOMPOSITEOP)
+        ENUM_TO_NAME(BlurCompositeOp)
+#endif
         ENUM_TO_NAME(BumpmapCompositeOp)
-#if defined(HAVE_ENUM_CHANGEMASKCOMPOSITEOP)
         ENUM_TO_NAME(ChangeMaskCompositeOp)
-#endif
         ENUM_TO_NAME(ClearCompositeOp)
         ENUM_TO_NAME(ColorBurnCompositeOp)
         ENUM_TO_NAME(BlendCompositeOp)
@@ -399,9 +398,10 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(CopyOpacityCompositeOp)
         ENUM_TO_NAME(CopyRedCompositeOp)
         ENUM_TO_NAME(DarkenCompositeOp)
-#if defined(HAVE_ENUM_DIVIDECOMPOSITEOP)
-        ENUM_TO_NAME(DivideCompositeOp)
+#if defined(HAVE_ENUM_DISTORTCOMPOSITEOP)
+        ENUM_TO_NAME(DistortCompositeOp)
 #endif
+        ENUM_TO_NAME(DivideCompositeOp)
         ENUM_TO_NAME(DstAtopCompositeOp)
         ENUM_TO_NAME(DstCompositeOp)
         ENUM_TO_NAME(DstInCompositeOp)
@@ -413,9 +413,7 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(HueCompositeOp)
         ENUM_TO_NAME(InCompositeOp)
         ENUM_TO_NAME(LightenCompositeOp)
-#if defined(HAVE_ENUM_LINEARLIGHTCOMPOSITEOP)
         ENUM_TO_NAME(LinearLightCompositeOp)
-#endif
         ENUM_TO_NAME(LuminizeCompositeOp)
         ENUM_TO_NAME(MinusCompositeOp)
         ENUM_TO_NAME(ModulateCompositeOp)
@@ -714,15 +712,9 @@ InterlaceType_name(InterlaceType interlace)
     switch(interlace)
     {
         ENUM_TO_NAME(UndefinedInterlace)
-#if defined(HAVE_ENUM_GIFINTERLACE)
         ENUM_TO_NAME(GIFInterlace)
-#endif
-#if defined(HAVE_ENUM_JPEGINTERLACE)
         ENUM_TO_NAME(JPEGInterlace)
-#endif
-#if defined(HAVE_ENUM_PNGINTERLACE)
         ENUM_TO_NAME(PNGInterlace)
-#endif
         ENUM_TO_NAME(NoInterlace)
         ENUM_TO_NAME(LineInterlace)
         ENUM_TO_NAME(PlaneInterlace)
@@ -762,9 +754,7 @@ InterpolatePixelMethod_name(InterpolatePixelMethod interpolate)
         ENUM_TO_NAME(IntegerInterpolatePixel)
         ENUM_TO_NAME(MeshInterpolatePixel)
         ENUM_TO_NAME(NearestNeighborInterpolatePixel)
-#if defined(HAVE_ENUM_SPLINEINTERPOLATEPIXEL)
         ENUM_TO_NAME(SplineInterpolatePixel)
-#endif
     }
 
     return "UndefinedInterpolatePixel";
@@ -800,21 +790,11 @@ LAYERMETHODTYPE_NAME(LAYERMETHODTYPE method)
         ENUM_TO_NAME(OptimizePlusLayer)
         ENUM_TO_NAME(CoalesceLayer)
         ENUM_TO_NAME(DisposeLayer)
-#if defined(HAVE_ENUM_OPTIMIZETRANSLAYER)
         ENUM_TO_NAME(OptimizeTransLayer)
-#endif
-#if defined(HAVE_ENUM_OPTIMIZEIMAGELAYER)
         ENUM_TO_NAME(OptimizeImageLayer)
-#endif
-#if defined(HAVE_ENUM_REMOVEDUPSLAYER)
         ENUM_TO_NAME(RemoveDupsLayer)
-#endif
-#if defined(HAVE_ENUM_REMOVEZEROLAYER)
         ENUM_TO_NAME(RemoveZeroLayer)
-#endif
-#if defined(HAVE_ENUM_COMPOSITELAYER)
         ENUM_TO_NAME(CompositeLayer)
-#endif
 #if defined(HAVE_ENUM_MERGELAYER)
         ENUM_TO_NAME(MergeLayer)
 #endif
@@ -980,18 +960,10 @@ VirtualPixelMethod_name(VirtualPixelMethod method)
         ENUM_TO_NAME(DitherVirtualPixelMethod)
         ENUM_TO_NAME(RandomVirtualPixelMethod)
         ENUM_TO_NAME(ConstantVirtualPixelMethod)
-#if defined(HAVE_ENUM_MASKVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(MaskVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_BLACKVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(BlackVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_GRAYVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(GrayVirtualPixelMethod)
-#endif
-#if defined(HAVE_ENUM_WHITEVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(WhiteVirtualPixelMethod)
-#endif
 #if defined(HAVE_ENUM_HORIZONTALTILEVIRTUALPIXELMETHOD)
         ENUM_TO_NAME(HorizontalTileVirtualPixelMethod)
 #endif

data/ext/RMagick/rmilist.c

@@ -1,4 +1,4 @@
-/* $Id: rmilist.c,v 1.91 2009/02/28 23:50:35 rmagick Exp $ */
+/* $Id: rmilist.c,v 1.92 2009/06/03 23:08:30 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmilist.c
@@ -160,7 +160,6 @@ ImageList_coalesce(VALUE self)
 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;
@@ -202,16 +201,6 @@ ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
     (void) DestroyExceptionInfo(&exception);
 
     return rm_imagelist_from_images(new_images);
-
-#else
-
-    self = self;
-    argc = argc;
-    argv = argv;
-    rm_not_implemented();
-    return (VALUE)0;
-
-#endif
 }
 
 
@@ -540,31 +529,22 @@ ImageList_optimize_layers(VALUE self, VALUE method)
         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:
             rm_split(images);
             rb_raise(rb_eNotImpError, "Magick::CompositeLayer is not supported. Use the composite_layers method instead.");
             break;
-#endif
-#if defined(HAVE_ENUM_OPTIMIZEIMAGELAYER)
             // In 6.3.4-ish, OptimizeImageLayer replaced OptimizeLayer
         case OptimizeImageLayer:
             new_images = OptimizeImageLayers(images, &exception);
@@ -583,11 +563,6 @@ ImageList_optimize_layers(VALUE self, VALUE method)
             // 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;

data/ext/RMagick/rmimage.c

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.346 2009/03/04 00:35:19 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.349 2009/06/05 22:30:40 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -284,22 +284,8 @@ Image_add_compose_mask(VALUE self, VALUE mask)
 
     // Delete any previously-existing mask image.
     // Store a clone of the new mask image.
-#if defined(HAVE_SETIMAGEMASK)
     (void) SetImageMask(image, mask_image);
     (void) NegateImage(image->mask, MagickFalse);
-#else
-    if (image->clip_mask)
-    {
-        image->clip_mask = DestroyImage(image->clip_mask);
-    }
-    image->clip_mask = NewImageList();
-    if (SetImageStorageClass(image, DirectClass) == MagickFalse)
-    {
-        rm_magick_error("SetImageStorageClass failed", NULL);
-    }
-    image->clip_mask = rm_clone_image(mask_image);
-    (void) NegateImage(image->clip_mask, MagickFalse);
-#endif
 
     // Since both Set and GetImageMask clone the mask image I don't see any
     // way to negate the mask without referencing it directly. Sigh.
@@ -403,15 +389,11 @@ Image_add_profile(VALUE self, VALUE name)
     {
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
-#if defined(HAVE_ST_PROFILE)
     profile = GetImageProfile(image, "iptc");
     if (profile)
     {
         info->profile = (void *)CloneStringInfo(profile);
     }
-#else
-    info->client_data = GetImageProfile(image, "8bim");
-#endif
     strncpy(info->filename, profile_filename, min((size_t)profile_filename_l, sizeof(info->filename)));
     info->filename[MaxTextExtent-1] = '\0';
 
@@ -462,7 +444,6 @@ Image_add_profile(VALUE self, VALUE name)
 VALUE
 Image_alpha(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_TYPE_ALPHACHANNELTYPE)
     Image *image;
     AlphaChannelType alpha;
 
@@ -516,14 +497,6 @@ Image_alpha(int argc, VALUE *argv, VALUE self)
 #endif
 
     return argv[0];
-
-#else   // HAVE_ALPHACHANNELTYPE
-    argc = argc;
-    argv =argv;
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -555,17 +528,10 @@ Image_alpha_q(VALUE self)
 VALUE
 Image_alpha_eq(VALUE self, VALUE type)
 {
-#if defined(HAVE_TYPE_ALPHACHANNELTYPE)
     VALUE argv[1];
     argv[0] = type;
     Image_alpha(1, argv, self);
     return type;
-#else
-    self = self;
-    type = type;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -1814,7 +1780,6 @@ Image_clone(VALUE self)
 VALUE
 Image_clut_channel(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_CLUTIMAGECHANNEL)
     Image *image, *clut;
     ChannelType channels;
     MagickBooleanType okay;
@@ -1847,14 +1812,6 @@ Image_clut_channel(int argc, VALUE *argv, VALUE self)
     }
 
     return self;
-
-#else
-    argc = argc;
-    argv = argv;
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -3437,18 +3394,8 @@ Image_delete_compose_mask(VALUE self)
     Image *image = rm_check_frozen(self);
 
     // Store a clone of the mask image
-#if defined(HAVE_SETIMAGEMASK)
-    {
-        (void) SetImageMask(image, NULL);
-        rm_check_image_exception(image, RetainOnError);
-    }
-#else
-    if (image->clip_mask)
-    {
-        image->clip_mask = DestroyImage(image->clip_mask);
-    }
-    image->clip_mask = NewImageList();
-#endif
+    (void) SetImageMask(image, NULL);
+    rm_check_image_exception(image, RetainOnError);
 
     return self;
 }
@@ -3898,7 +3845,6 @@ Image_dissolve(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_distort(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_DISTORTIMAGE)
     Image *image, *new_image;
     volatile VALUE pts;
     unsigned long n, npoints;
@@ -3942,13 +3888,6 @@ Image_distort(int argc, VALUE *argv, VALUE self)
     rm_ensure_result(new_image);
 
     return rm_image_new(new_image);
-#else
-    self = self;        // defeat "unused parameter" message
-    argv = argv;
-    argc = argc;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -4382,7 +4321,6 @@ Image_erase_bang(VALUE self)
 static VALUE
 excerpt(int bang, VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
 {
-#if defined(HAVE_EXCERPTIMAGE)
     Image *image, *new_image;
     RectangleInfo rect;
     ExceptionInfo exception;
@@ -4409,14 +4347,6 @@ excerpt(int bang, VALUE self, VALUE x, VALUE y, VALUE width, VALUE height)
     }
 
     return rm_image_new(new_image);
-
-#else
-    bang = bang; self = self;
-    x = x; y = y;
-    width = width; height = height;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -4525,7 +4455,6 @@ Image_export_pixels(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_extent(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_EXTENTIMAGE)
     Image *image, *new_image;
     RectangleInfo geometry;
     long height, width;
@@ -4574,13 +4503,6 @@ Image_extent(int argc, VALUE *argv, VALUE self)
     (void) DestroyExceptionInfo(&exception);
     rm_ensure_result(new_image);
     return rm_image_new(new_image);
-#else
-    argc = argc;
-    argv = argv;
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -5346,13 +5268,7 @@ Image_gray_q(VALUE self)
 VALUE
 Image_histogram_q(VALUE self)
 {
-#if defined(HAVE_ISHISTOGRAMIMAGE)
     return has_attribute(self, IsHistogramImage);
-#else
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -6020,7 +5936,6 @@ Image_levelize_channel(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_linear_stretch(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_LINEARSTRETCHIMAGE)
     Image *image, *new_image;
     double black_point, white_point;
 
@@ -6032,13 +5947,6 @@ Image_linear_stretch(int argc, VALUE *argv, VALUE self)
     rm_check_image_exception(new_image, DestroyOnError);
 
     return rm_image_new(new_image);
-#else
-    argc = argc;    // defeat "unused parameter" messages
-    argv = argv;
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -6519,7 +6427,7 @@ Image_matte(VALUE self)
 VALUE
 Image_matte_eq(VALUE self, VALUE matte)
 {
-#if defined(HAVE_TYPE_ALPHACHANNELTYPE) || defined(HAVE_SETIMAGEALPHACHANNEL)
+#if defined(HAVE_SETIMAGEALPHACHANNEL)
     VALUE alpha_channel_type;
 
     if (RTEST(matte))
@@ -7656,7 +7564,6 @@ Image_pixel_interpolation_method_eq(VALUE self, VALUE method)
 VALUE
 Image_polaroid(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_POLAROIDIMAGE)
     Image *image, *clone, *new_image;
     volatile VALUE options;
     double angle = -5.0;
@@ -7693,13 +7600,6 @@ Image_polaroid(int argc, VALUE *argv, VALUE self)
     rm_ensure_result(new_image);
 
     return rm_image_new(new_image);
-#else
-    argc = argc;    // defeat "unused parameter" messages
-    argv = argv;
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -8268,7 +8168,6 @@ rd_image(VALUE class, VALUE file, reader_t reader)
 VALUE
 Image_recolor(VALUE self, VALUE color_matrix)
 {
-#if defined(HAVE_RECOLORIMAGE)
     Image *image, *new_image;
     unsigned long order;
     long x, len;
@@ -8297,13 +8196,6 @@ Image_recolor(VALUE self, VALUE color_matrix)
     (void) DestroyExceptionInfo(&exception);
 
     return rm_image_new(new_image);
-
-#else
-    self = self;                    // defeat "unused parameter" message
-    color_matrix = color_matrix;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -8811,6 +8703,54 @@ scale(int bang, int argc, VALUE *argv, VALUE self, scaler_t scaler)
 DEF_ATTR_READER(Image, scene, ulong)
 
 
+/*
+ *  Method:     Image#selective_blur_channel(radius, sigma, threshold[, channel...])
+ *  Purpose:    Call SelectiveBlurImageChannel
+ */
+VALUE
+Image_selective_blur_channel(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_SELECTIVEBLURIMAGECHANNEL)
+    Image *image, *new_image;
+    double radius, sigma, threshold;
+    ExceptionInfo exception;
+    ChannelType channels;
+
+    image = rm_check_destroyed(self);
+    channels = extract_channels(&argc, argv);
+    if (argc > 3)
+    {
+        raise_ChannelType_error(argv[argc-1]);
+    }
+    if (argc != 3)
+    {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 3 or more)", argc);
+    }
+    radius = NUM2DBL(argv[0]);
+    sigma = NUM2DBL(argv[1]);
+
+    // threshold is either a floating-point number or a string in the form "NN%".
+    // Either way it's supposed to represent a percentage of the QuantumRange.
+    threshold = rm_percentage(argv[2]) * QuantumRange;
+
+    GetExceptionInfo(&exception);
+    new_image = SelectiveBlurImageChannel(image, channels, radius, sigma, threshold, &exception);
+    rm_check_exception(&exception, new_image, DestroyOnError);
+    (void) DestroyExceptionInfo(&exception);
+    rm_ensure_result(new_image);
+
+    return rm_image_new(new_image);
+
+#else
+    rm_not_implemented();
+    argc = argc;
+    argv = argv;
+    self = self;
+    return (VALUE)0;
+#endif
+}
+
+
 /*
  *  Method:     Image#set_channel_depth(channel, depth)
  *  Purpose:    Call SetImageChannelDepth
@@ -8978,46 +8918,6 @@ Image_properties(VALUE self)
     Image *image;
     volatile VALUE attr_hash;
     volatile VALUE ary;
-
-#if !defined(HAVE_GETNEXTIMAGEPROPERTY)
-    const ImageAttribute *attr;
-
-    image = rm_check_destroyed(self);
-
-    // If block, iterate over attributes
-    if (rb_block_given_p())
-    {
-        ary = rb_ary_new2(2);
-
-        ResetImageAttributeIterator(image);
-        attr = GetNextImageAttribute(image);
-        while (attr)
-        {
-            (void) rb_ary_store(ary, 0, rb_str_new2(attr->key));
-            (void) rb_ary_store(ary, 1, rb_str_new2(attr->value));
-            (void) rb_yield(ary);
-            attr = GetNextImageAttribute(image);
-        }
-        rm_check_image_exception(image, RetainOnError);
-        return self;
-    }
-
-    // otherwise return properties hash
-    else
-    {
-        attr_hash = rb_hash_new();
-        ResetImageAttributeIterator(image);
-        attr = GetNextImageAttribute(image);
-        while (attr)
-        {
-            (void) rb_hash_aset(attr_hash, rb_str_new2(attr->key), rb_str_new2(attr->value));
-            attr = GetNextImageAttribute(image);
-        }
-        rm_check_image_exception(image, RetainOnError);
-        return attr_hash;
-    }
-
-#else
     char *property;
     const char *value;
 
@@ -9057,7 +8957,6 @@ Image_properties(VALUE self)
         return attr_hash;
     }
 
-#endif
 }
 
 
@@ -9892,16 +9791,10 @@ Image_swirl(VALUE self, VALUE degrees)
 VALUE
 Image_sync_profiles(VALUE self)
 {
-#if defined(HAVE_SYNCIMAGEPROFILES)
     Image *image = rm_check_destroyed(self);
     volatile VALUE okay =  SyncImageProfiles(image) ? Qtrue : Qfalse;
     rm_check_image_exception(image, RetainOnError);
     return okay;
-#else
-    self = self;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
 }
 
 
@@ -10593,12 +10486,7 @@ trimmer(int bang, int argc, VALUE *argv, VALUE self)
 
     if (reset_page)
     {
-#if defined(HAVE_RESETIMAGEPAGE)
         ResetImagePage(new_image, "0x0+0+0");
-#else
-        new_image->page.x = new_image->page.y = 0L;
-        new_image->page.width = new_image->page.height = 0UL;
-#endif
     }
 
     if (bang)
@@ -11560,12 +11448,7 @@ cropper(int bang, int argc, VALUE *argv, VALUE self)
     if (reset_page)
     {
         Data_Get_Struct(cropped, Image, image);
-#if defined(HAVE_RESETIMAGEPAGE)
         ResetImagePage(image, "0x0+0+0");
-#else
-        image->page.x = image->page.y = 0L;
-        image->page.width = image->page.height = 0UL;
-#endif
     }
     return cropped;
 }