RubyGems - rmagick - Versions diffs - 2.1.0 → 2.2.0 - Mend

rmagick 2.1.0 → 2.2.0

Potentially problematic release.

This version of rmagick might be problematic. Click here for more details.

Files changed (39) hide show

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.1.0: RVG Reference: Styles</title>
+  <title>RMagick 2.2.0: RVG Reference: Styles</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.1.0 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.2.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="rvguse.html">Prev</a> | <a href=

data/doc/rvgtext.html CHANGED

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.1.0: RVG Reference: RVG::Text Class</title>
+  <title>RMagick 2.2.0: RVG Reference: RVG::Text Class</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -33,7 +33,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.1.0 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.2.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="rvgclip.html">Prev</a> | <a href=

data/doc/rvgtspan.html CHANGED

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.1.0: RVG Reference: RVG::Tspan Class</title>
+  <title>RMagick 2.2.0: RVG Reference: RVG::Tspan Class</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.1.0 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.2.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="rvgtext.html">Prev</a> | <a href=

data/doc/rvgtut.html CHANGED

@@ -9,7 +9,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.1.0: RVG Tutorial</title>
+  <title>RMagick 2.2.0: RVG Tutorial</title>
   <meta name="GENERATOR" content="Quanta Plus" />
   <link rel="stylesheet" type="text/css" href="css/doc.css" />
 <style type="text/css">
@@ -23,7 +23,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.1.0 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.2.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="constants.html">Prev</a> | <a href=

data/doc/rvguse.html CHANGED

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.1.0: RVG Reference: RVG::Use Class</title>
+  <title>RMagick 2.2.0: RVG Reference: RVG::Use Class</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.1.0 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.2.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="rvgtspan.html">Prev</a> | <a href=

data/doc/rvgxform.html CHANGED

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.1.0: RVG Reference: Transforms</title>
+  <title>RMagick 2.2.0: RVG Reference: Transforms</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -28,7 +28,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.1.0 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.2.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="rvgshape.html">Prev</a> | <a href=

data/doc/struct.html CHANGED

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.1.0: Miscellaneous classes</title>
+  <title>RMagick 2.2.0: Miscellaneous classes</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -27,7 +27,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.1.0 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.2.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="draw.html">Prev</a> | <a href=

data/doc/usage.html CHANGED

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.1.0: How to use RMagick</title>
+  <title>RMagick 2.2.0: How to use RMagick</title>
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii" />
   <meta name="GENERATOR" content="Quanta Plus" />
@@ -90,7 +90,7 @@
 </head>
 <body>
-  <h6 id="header">RMagick 2.1.0 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.2.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="index.html">Prev</a> | <a href=
@@ -658,6 +658,11 @@ exit
       <dd>Compute a new constrained size for the image</dd>
+      <dt><a href=
+      "image2.html#liquid_rescale">liquid_rescale</a></dt>
+      <dd>Rescale image with seam-carving</dd>
       <dt><a href="image2.html#magnify">magnify</a></dt>
       <dd>Double the size of the image</dd>
@@ -756,7 +761,8 @@ exit
       <dd>Make the entire image transparent</dd>
-      <dt><a href="image2.html#opaque">opaque</a></dt>
+      <dt><a href="image2.html#opaque">opaque</a>, <a href=
+      "image2.html#opaque_channel">opaque_channel</a></dt>
       <dd>Change all pixels from the specified color to a new
       color</dd>
@@ -781,7 +787,9 @@ exit
       <dd>Replace neighboring pixels that are the same color with
       pixels from a texture image</dd>
-      <dt><a href="image3.html#transparent">transparent</a></dt>
+      <dt><a href=
+      "image3.html#paint_transparent">paint_transparent</a>,
+      <a href="image3.html#transparent">transparent</a></dt>
       <dd>Change the opacity value of pixels having the specified
       color</dd>

data/ext/RMagick/MANIFEST CHANGED

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-2.1.0 - 18:13:00 01/09/08
+MANIFEST for RMagick-2.2.0 - 19:19:00 01/30/08
 doc/ilist.html
 doc/scripts/stripeTables.js

data/ext/RMagick/extconf.rb CHANGED

@@ -1,25 +1,12 @@
 require "mkmf"
 require "date"
-RMAGICK_VERS = "2.0.0"
+RMAGICK_VERS = "2.2.0"
 MIN_RUBY_VERS = "1.8.2"
 MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
 MIN_IM_VERS = "6.3.0"
 MIN_IM_VERS_NO = MIN_IM_VERS.tr(".","").to_i
-SUMMARY = <<"END_SUMMARY"
-#{"=" * 70}
-#{DateTime.now.strftime("%a %d%b%y %T")}
-This installation of RMagick #{RMAGICK_VERS} is configured
-for Ruby #{RUBY_VERSION} (#{RUBY_PLATFORM}) and ImageMagick 6.3.7.
-#{"=" * 70}
-END_SUMMARY
 # Test for a specific value in an enum type
@@ -104,6 +91,8 @@ if RUBY_PLATFORM !~ /mswin/
     exit_failure "Can't install RMagick #{RMAGICK_VERS}. You must have ImageMagick #{MIN_IM_VERS} or later.\n"
   end
+  $magick_version = `Magick-config --version`.chomp
   # Ensure ImageMagick is not configured for HDRI
   unless checking_for("HDRI disabled version of ImageMagick") do
     not (`Magick-config --version`["HDRI"])
@@ -121,12 +110,13 @@ if RUBY_PLATFORM !~ /mswin/
 else  # mswin
-    `convert -version` =~ /Version: ImageMagick (\d\.\d\.\d+) /
-    abort "Unable to get ImageMagick version" unless $1
-    $CFLAGS = "-W3"
-  $CPPFLAGS = %Q{-I"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include" -I"C:\\Program Files\\ImageMagick-#{$1}-Q8\\include"}
+  `convert -version` =~ /Version: ImageMagick (\d\.\d\.\d+) /
+  abort "Unable to get ImageMagick version" unless $1
+  $magick_version = $1
+  $CFLAGS = "-W3"
+  $CPPFLAGS = %Q{-I"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Include" -I"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\include"}
   # The /link option is required by the Makefile but causes warnings in the mkmf.log file.
-  $LDFLAGS = %Q{/link /LIBPATH:"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib" /LIBPATH:"C:\\Program Files\\ImageMagick-#{$1}-Q8\\lib" /LIBPATH:"C:\\ruby\\lib"}
+  $LDFLAGS = %Q{/link /LIBPATH:"C:\\Program Files\\Microsoft Platform SDK for Windows Server 2003 R2\\Lib" /LIBPATH:"C:\\Program Files\\ImageMagick-#{$magick_version}-Q8\\lib" /LIBPATH:"C:\\ruby\\lib"}
   $LOCAL_LIBS = 'CORE_RL_magick_.lib X11.lib'
 end
@@ -172,7 +162,9 @@ have_func("snprintf", headers)
    "GetNextImageProperty",           # 6.3.1
    "IsHistogramImage",               # 6.3.5
    "LinearStretchImage",             # 6.3.1
+   "LiquidRescaleImage",             # 6.3.8-2
    "MagickCoreGenesis",              # 6.3.4
+   "OpaquePaintImageChannel",        # 6.3.7-10
    "PolaroidImage",                  # 6.3.1-6
    "RecolorImage",                   # 6.3.1-3
    "ResetImagePage",                 # 6.3.3
@@ -181,6 +173,7 @@ have_func("snprintf", headers)
    "SetImageProperty",               # 6.3.1
    "SetImageRegistry",               # 6.3.4-?
    "SyncImageProfiles",              # 6.3.2
+   "TransparentPaintImage",          # 6.3.7-10
    ].each do |func|
     have_func(func, headers)
   end
@@ -197,18 +190,19 @@ check_sizeof("unsigned long", headers)
 check_sizeof("Image *", headers)
+have_enum_value("ColorspaceType", "CMYColorspace", headers)                  # 6.3.5
 have_enum_values("CompositeOperator", ["ChangeMaskCompositeOp",              # 6.3.3
                                        "LinearLightCompositeOp",             # 6.3.5
                                        "DivideCompositeOp"], headers)        # 6.3.5
 have_enum_values("DistortImageMethod", ["ArcDistortion",                     # 6.3.5-5
                                "PerspectiveProjectionDistortion"], headers)  # 6.3.5-9
 have_enum_values("FilterTypes", ["KaiserFilter",                             # 6.3.6
-                                 "SentinelFilter",                           # 6.3.6
                                  "WelshFilter",                              # 6.3.6-4
                                  "ParzenFilter",                             # 6.3.6-4
                                  "LagrangeFilter",                           # 6.3.7-2
                                  "BohmanFilter",                             # 6.3.7-2
-                                 "BartlettFilter"], headers)                 # 6.3.7-2
+                                 "BartlettFilter",                           # 6.3.7-2
+                                 "SentinelFilter"], headers)                 # 6.3.7-2
 have_enum_value("InterpolatePixelMethod", "SplineInterpolatePixel", headers) # 6.3.5
 have_enum_values("InterlaceType", ["GIFInterlace",                           # 6.3.4
                                   "JPEGInterlace",                           # 6.3.4
@@ -250,5 +244,18 @@ $config_h = "Makefile rmagick.h"
 create_makefile("RMagick2")
+SUMMARY = <<"END_SUMMARY"
+#{"=" * 70}
+#{DateTime.now.strftime("%a %d%b%y %T")}
+This installation of RMagick #{RMAGICK_VERS} is configured for
+Ruby #{RUBY_VERSION} (#{RUBY_PLATFORM}) and ImageMagick #{$magick_version}
+#{"=" * 70}
+END_SUMMARY
 Logging::message SUMMARY
 message SUMMARY

data/ext/RMagick/rmagick.h CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.220 2008/01/05 19:24:22 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.223 2008/01/28 22:31:50 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -42,7 +42,7 @@
 #undef PACKAGE_STRING
-#include RUBY_EXTCONF_H
+#include "extconf.h"
 // For quoting preprocessor symbols
@@ -107,18 +107,18 @@
 // These macros are needed in 1.9.0 but aren't defined prior to 1.8.6.
 #if !defined(RSTRING_LEN)
-#define RSTRING_LEN(s) (RSTRING(s)->len)
+#define RSTRING_LEN(s) (RSTRING((s))->len)
 #endif
 #if !defined(RSTRING_PTR)
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#define RSTRING_PTR(s) (RSTRING((s))->ptr)
 #endif
 // Backport these two macros to 1.8
 #if !defined(RARRAY_LEN)
-#define RARRAY_LEN(a) RARRAY(a)->len
+#define RARRAY_LEN(a) RARRAY((a))->len
 #endif
 #if !defined(RARRAY_PTR)
-#define RARRAY_PTR(a) RARRAY(a)->ptr
+#define RARRAY_PTR(a) RARRAY((a))->ptr
 #endif
 // ImageLayerMethod replaced MagickLayerMethod starting with 6.3.6
@@ -860,6 +860,7 @@ extern VALUE Image_inspect(VALUE);
 extern VALUE Image_level2(int, VALUE *, VALUE);
 extern VALUE Image_level_channel(int, VALUE *, VALUE);
 extern VALUE Image_linear_stretch(int, VALUE *, VALUE);
+extern VALUE Image_liquid_rescale(int, VALUE *, VALUE);
 extern VALUE Image__load(VALUE, VALUE);
 extern VALUE Image_magnify(VALUE);
 extern VALUE Image_magnify_bang(VALUE);
@@ -877,8 +878,10 @@ extern VALUE Image_normalize(VALUE);
 extern VALUE Image_normalize_channel(int, VALUE *, VALUE);
 extern VALUE Image_oil_paint(int, VALUE *, VALUE);
 extern VALUE Image_opaque(VALUE, VALUE, VALUE);
+extern VALUE Image_opaque_channel(int, VALUE *, VALUE);
 extern VALUE Image_opaque_q(VALUE);
 extern VALUE Image_ordered_dither(int, VALUE *, VALUE);
+extern VALUE Image_paint_transparent(int, VALUE *, VALUE);
 extern VALUE Image_palette_q(VALUE);
 extern VALUE Image_ping(VALUE, VALUE);
 extern VALUE Image_pixel_color(int, VALUE *, VALUE);

data/ext/RMagick/rmimage.c CHANGED

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.277 2008/01/08 23:47:33 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.279 2008/01/28 22:31:50 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -5455,6 +5455,54 @@ Image_linear_stretch(int argc, VALUE *argv, VALUE self)
 #endif
 }
+/*
+    Method:     Image#liquid_rescale(columns, rows, delta_x=0.0, rigidity=0.0)
+    Purpose:    Call the LiquidRescaleImage API
+*/
+VALUE
+Image_liquid_rescale(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_LIQUIDRESCALEIMAGE)
+    Image *image, *new_image;
+    unsigned long cols, rows;
+    double delta_x = 0.0;
+    double rigidity = 0.0;
+    ExceptionInfo exception;
+    image = rm_check_destroyed(self);
+    switch (argc)
+    {
+        case 4:
+            rigidity = NUM2DBL(argv[3]);
+        case 3:
+            delta_x = NUM2DBL(argv[2]);
+        case 2:
+            rows = NUM2ULONG(argv[1]);
+            cols = NUM2ULONG(argv[0]);
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 to 4)", argc);
+            break;
+    }
+    GetExceptionInfo(&exception);
+    new_image = LiquidRescaleImage(image, cols, rows, delta_x, rigidity, &exception);
+    rm_check_exception(&exception, new_image, DestroyOnError);
+    DestroyExceptionInfo(&exception);
+    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
+}
 /*
     Method:     Image._load
     Purpose:    implement marshalling
@@ -6373,6 +6421,7 @@ Image_opaque(VALUE self, VALUE target, VALUE fill)
     Image *image, *new_image;
     MagickPixelPacket target_pp;
     MagickPixelPacket fill_pp;
+    MagickBooleanType okay;
     image = rm_check_destroyed(self);
     new_image = rm_clone_image(image);
@@ -6381,12 +6430,99 @@ Image_opaque(VALUE self, VALUE target, VALUE fill)
     Color_to_MagickPixelPacket(image, &target_pp, target);
     Color_to_MagickPixelPacket(image, &fill_pp, fill);
-    (void) PaintOpaqueImage(new_image, &target_pp, &fill_pp);
+#if defined(HAVE_OPAQUEPAINTIMAGECHANNEL)
+    okay = OpaquePaintImageChannel(new_image, DefaultChannels, &target_pp, &fill_pp, MagickFalse);
+#else
+    okay =  PaintOpaqueImageChannel(new_image, DefaultChannels, &target_pp, &fill_pp);
+#endif
     rm_check_image_exception(new_image, DestroyOnError);
+    if (!okay)
+    {
+        // Force exception
+        DestroyImage(new_image);
+        rm_ensure_result(NULL);
+    }
     return rm_image_new(new_image);
 }
+/*
+    Method:     Image#opaque_channel
+    Purpose:    Improved Image#opaque available in 6.3.7-10
+    Notes:      opaque_channel(target, fill, invert=false, fuzz=img.fuzz [, channel...])
+*/
+VALUE
+Image_opaque_channel(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_OPAQUEPAINTIMAGECHANNEL)
+    Image *image, *new_image;
+    MagickPixelPacket target_pp, fill_pp;
+    ChannelType channels;
+    double keep, fuzz;
+    MagickBooleanType okay, invert = MagickFalse;
+    image = rm_check_destroyed(self);
+    channels = extract_channels(&argc, argv);
+    if (argc > 4)
+    {
+        raise_ChannelType_error(argv[argc-1]);
+    }
+    // Default fuzz value is image's fuzz attribute.
+    fuzz = image->fuzz;
+    switch (argc)
+    {
+        case 4:
+            fuzz = NUM2DBL(argv[3]);
+            if (fuzz < 0.0)
+            {
+                rb_raise(rb_eArgError, "fuzz must be >= 0.0", fuzz);
+            }
+        case 3:
+            invert = RTEST(argv[2]);
+        case 2:
+            // Allow color name or Pixel
+            Color_to_MagickPixelPacket(image, &fill_pp, argv[1]);
+            Color_to_MagickPixelPacket(image, &target_pp, argv[0]);
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (got %d, expected 2 or more)", argc);
+            break;
+    }
+    new_image = rm_clone_image(image);
+    keep = new_image->fuzz;
+    new_image->fuzz = fuzz;
+    okay = OpaquePaintImageChannel(new_image, channels, &target_pp, &fill_pp, invert);
+    // Restore saved fuzz value
+    new_image->fuzz = keep;
+    rm_check_image_exception(new_image, DestroyOnError);
+    if (!okay)
+    {
+        // Force exception
+        DestroyImage(new_image);
+        rm_ensure_result(NULL);
+    }
+    return rm_image_new(new_image);
+#else
+    argc = argc;    // defeat "unused parameter" messages
+    argv = argv;
+    self = self;
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
 /*
     Method:     Image#opaque?
     Purpose:    return true if any of the pixels in the image have an opacity
@@ -6509,6 +6645,71 @@ Image_page_eq(VALUE self, VALUE rect)
     return self;
 }
+/*
+    Method:     Image#paint_transparent(target, opacity=TransparentOpacity, invert=false, fuzz=img.fuzz)
+    Purpose:    Improved version of Image#transparent available in 6.3.7-10
+*/
+VALUE
+Image_paint_transparent(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_TRANSPARENTPAINTIMAGE)
+    Image *image, *new_image;
+    MagickPixelPacket color;
+    Quantum opacity = TransparentOpacity;
+    double keep, fuzz;
+    MagickBooleanType okay, invert = MagickFalse;
+    image = rm_check_destroyed(self);
+    // Default fuzz value is image's fuzz attribute.
+    fuzz = image->fuzz;
+    switch (argc)
+    {
+        case 4:
+            fuzz = NUM2DBL(argv[3]);
+        case 3:
+            invert = RTEST(argv[2]);
+        case 2:
+            opacity = APP2QUANTUM(argv[1]);
+        case 1:
+            Color_to_MagickPixelPacket(image, &color, argv[0]);
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 to 4)", argc);
+            break;
+    }
+    new_image = rm_clone_image(image);
+    // Use fuzz value from caller
+    keep = new_image->fuzz;
+    new_image->fuzz = fuzz;
+    okay = TransparentPaintImage(new_image, &color, opacity, invert);
+    new_image->fuzz = keep;
+    // Is it possible for TransparentPaintImage to silently fail?
+    rm_check_image_exception(new_image, DestroyOnError);
+    if (!okay)
+    {
+        // Force exception
+        DestroyImage(new_image);
+        rm_ensure_result(NULL);
+    }
+    return rm_image_new(new_image);
+#else
+    argc = argc;    // defeat "unused parameter" messages
+    argv = argv;
+    self = self;
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
 /*
     Method:     Image#palette?
     Purpose:    return true if the image is PseudoClass and has 256 unique
@@ -9095,6 +9296,7 @@ Image_transparent(int argc, VALUE *argv, VALUE self)
     Image *image, *new_image;
     MagickPixelPacket color;
     Quantum opacity = TransparentOpacity;
+    MagickBooleanType okay;
     image = rm_check_destroyed(self);
@@ -9112,8 +9314,18 @@ Image_transparent(int argc, VALUE *argv, VALUE self)
     new_image = rm_clone_image(image);
-    (void) PaintTransparentImage(new_image, &color, opacity);
+#if defined(HAVE_TRANSPARENTPAINTIMAGE)
+    okay = TransparentPaintImage(new_image, &color, opacity, MagickFalse);
+#else
+    okay = PaintTransparentImage(new_image, &color, opacity);
+#endif
     rm_check_image_exception(new_image, DestroyOnError);
+    if (!okay)
+    {
+        // Force exception
+        DestroyImage(new_image);
+        rm_ensure_result(NULL);
+    }
     return rm_image_new(new_image);
 }
@@ -10186,7 +10398,7 @@ ChannelType extract_channels(
 void
 raise_ChannelType_error(VALUE arg)
 {
-    rb_raise(rb_eTypeError, "argument needs to be a ChannelType (%s given)"
+    rb_raise(rb_eTypeError, "argument must be a ChannelType value (%s given)"
              , rb_class2name(CLASS_OF(arg)));
 }