RubyGems - rmagick - Versions diffs - 2.7.2 → 2.8.0 - Mend

rmagick 2.7.2 → 2.8.0

Potentially problematic release.

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

Files changed (39) hide show

data/doc/rvgtut.html CHANGED Viewed

@@ -9,7 +9,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.7.2: RVG Tutorial</title>
+  <title>RMagick 2.8.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.7.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.8.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 Viewed

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.7.2: RVG Reference: RVG::Use Class</title>
+  <title>RMagick 2.8.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.7.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.8.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 Viewed

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.7.2: RVG Reference: Transforms</title>
+  <title>RMagick 2.8.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.7.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.8.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 Viewed

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 6 November 2007), see www.w3.org" />
-  <title>RMagick 2.7.2: Miscellaneous classes</title>
+  <title>RMagick 2.8.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.7.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.8.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 Viewed

@@ -6,7 +6,7 @@
   <meta name="generator" content=
   "HTML Tidy for Linux/x86 (vers 6 November 2007), see www.w3.org" />
-  <title>RMagick 2.7.2: How to use RMagick</title>
+  <title>RMagick 2.8.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.7.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.8.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="index.html">Prev</a> | <a href=
@@ -793,6 +793,12 @@ exit
       <dd>Change the opacity value of pixels having the specified
       color</dd>
+      <dt><a href=
+      "image3.html#transparent_chroma">transparent_chroma</a></dt>
+      <dd>Change the opacity value of pixels within the specified
+      range</dd>
     </dl>
     <h4>Rotate, flip, or shear</h4>

data/ext/RMagick/MANIFEST CHANGED Viewed

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-2.7.2 - 17:20:46 11/13/08
+MANIFEST for RMagick-2.8.0 - 18:54:01 12/04/08
 doc/ilist.html
 doc/scripts/stripeTables.js
@@ -259,6 +259,7 @@ doc/ex/rectangle.rb
 doc/ex/watermark.rb
 doc/ex/nonzero.rb
 doc/ex/Use02.rb
+doc/ex/sparse_color.rb
 doc/ex/wet_floor.rb
 doc/ex/roundrect.rb
 doc/ex/stegano.rb

data/ext/RMagick/extconf.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 require "mkmf"
 require "date"
-RMAGICK_VERS = "2.7.2"
+RMAGICK_VERS = "2.8.0"
 MIN_RUBY_VERS = "1.8.2"
 MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
 MIN_IM_VERS = "6.3.0"
@@ -48,10 +48,43 @@ end
+# Seems like lots of people have multiple versions of ImageMagick installed.
+def check_multiple_imagemagick_versions()
+   versions = []
+   path = ENV['PATH'].split(File::PATH_SEPARATOR)
+   path.each do |dir|
+      file = File.join(dir, "Magick-config")
+      if File.executable? file
+         vers = `#{file} --version`.chomp.strip
+         prefix = `#{file} --prefix`.chomp.strip
+         versions << [vers, prefix, dir]
+      end
+   end
+   versions.uniq!
+   if versions.size > 1
+      msg = "\nWarning: Found more than one ImageMagick installation. This could cause problems at runtime.\n"
+      versions.each do |vers, prefix, dir|
+         msg << "         #{dir}/Magick-config reports version #{vers} is installed in #{prefix}\n"
+      end
+      msg << "Using #{versions[0][0]} from #{versions[0][1]}.\n\n"
+      Logging::message msg
+      message msg
+   end
+end
 if RUBY_PLATFORM =~ /mswin/
-  abort "\nThis rmagick gem is for use only on Linux, BSD, OS X, and similar systems." +
-        "\nUse the rmagick-win32 gem to install RMagick on Windows." +
-        "\nSee http://rmagick.rubyforge.org/install-faq.html for more information.\n"
+  abort <<END_MSWIN
++----------------------------------------------------------------------------+
+| This rmagick gem is for use only on Linux, BSD, OS X, and similar systems  |
+| that have a gnu or similar toolchain installed. The rmagick-win32 gem is a |
+| pre-compiled version of RMagick bundled with ImageMagick for use on        |
+| Microsoft Windows systems. The rmagick-win32 gem is available on RubyForge.|
+| See http://rmagick.rubyforge.org/install-faq.html for more information.    |
++----------------------------------------------------------------------------+
+END_MSWIN
 end
@@ -81,6 +114,8 @@ if RUBY_PLATFORM !~ /mswin/
     exit_failure "Can't install RMagick #{RMAGICK_VERS}. Can't find Magick-config in #{ENV['PATH']}\n"
   end
+  check_multiple_imagemagick_versions()
   # Ensure minimum ImageMagick version
   unless checking_for("ImageMagick version >= #{MIN_IM_VERS}")  do
     version = `Magick-config --version`.chomp.tr(".","").to_i
@@ -162,10 +197,12 @@ have_func("snprintf", headers)
    "ExcerptImage",                   # 6.3.5-8
    "ExtentImage",                    # 6.3.1
    "FloodfillPaintImage",            # 6.3.7
+   "GetAuthenticPixels",             # 6.4.5-6
    "GetImageAlphaChannel",           # 6.3.9-2
    "GetImageProperty",               # 6.3.1
    "GetNextImageProperty",           # 6.3.1
    "GetStringInfoDatum",             # 6.3.2
+   "GetVirtualPixels",               # 6.4.5-6
    "InterpretImageProperties",       # 6.3.2
    "IsHistogramImage",               # 6.3.5
    "LevelImageColors",               # 6.4.2
@@ -187,7 +224,9 @@ have_func("snprintf", headers)
    "SetImageRegistry",               # 6.3.4
    "SparseColorImage",               # 6.3.4-?
    "SyncImageProfiles",              # 6.3.2
+   "SyncAuthenticPixels",            # 6.4.5-6
    "TransparentPaintImage",          # 6.3.7-10
+   "TransparentPaintImageChroma"     # 6.4.5-6
    ].each do |func|
     have_func(func, headers)
   end
@@ -219,6 +258,31 @@ end
+# 6.4.6-9 or so
+checking_for("ParseSizeGeometry() new signature") do
+     if try_compile(<<"SRC")
+#{COMMON_HEADERS}
+#{cpp_include(headers)}
+/*top*/
+int main() {
+  MagickStatusType okay;
+  Image *image;
+  const char *geometry;
+  RectangleInfo *rectangle;
+  ExceptionInfo *exception;
+  okay = ParseSizeGeometry(image, geometry, rectangle, exception);
+  return 0;
+  }
+SRC
+       $defs.push("-DHAVE_NEWPARSESIZEGEOMETRY")
+       true
+     else
+       false
+     end
+end
 have_struct_member("ImageInfo", "profile", headers)   # 6.3.2
 have_struct_member("Image", "tile_offset", headers)   # 6.3.4

data/ext/RMagick/rmagick.h CHANGED Viewed

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.257 2008/11/13 00:01:34 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.260 2008/11/23 15:57:15 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -132,6 +132,8 @@
 #define GetStringInfoLength(p) (size_t)((p)->length)
 #endif
+// IM 6.4.1 replaced AllocateImage with AcquireImage.
+// Both have the same signature.
 #if !defined(HAVE_ACQUIREIMAGE)
 #define AcquireImage(info) AllocateImage(info)
 #endif
@@ -322,8 +324,8 @@ EXTERN VALUE Class_PaintMethod;
 EXTERN VALUE Class_PreviewType;
 EXTERN VALUE Class_RenderingIntent;
 EXTERN VALUE Class_ResolutionType;
-#if defined(HAVE_SPARSECOLORINTERPOLATE)
-EXTERN VALUE Class_SparseColorInterpolateMethod;
+#if defined(HAVE_SPARSECOLORIMAGE)
+EXTERN VALUE Class_SparseColorMethod;
 #endif
 EXTERN VALUE Class_SpreadMethod;
 EXTERN VALUE Class_StorageType;
@@ -670,6 +672,8 @@ ATTR_ACCESSOR(Info, density)
 ATTR_ACCESSOR(Info, depth)
 ATTR_ACCESSOR(Info, dispose)
 ATTR_ACCESSOR(Info, dither)
+ATTR_ACCESSOR(Info, encoding)
+ATTR_ACCESSOR(Info, endian)
 ATTR_ACCESSOR(Info, extract)
 ATTR_ACCESSOR(Info, filename)
 ATTR_ACCESSOR(Info, fill)
@@ -700,6 +704,7 @@ ATTR_ACCESSOR(Info, stroke)
 ATTR_ACCESSOR(Info, stroke_width)
 ATTR_WRITER(Info, texture)
 ATTR_ACCESSOR(Info, tile_offset)
+ATTR_ACCESSOR(Info, transparent_color)
 ATTR_ACCESSOR(Info, undercolor)
 ATTR_ACCESSOR(Info, units)
 ATTR_ACCESSOR(Info, view)
@@ -988,6 +993,7 @@ extern VALUE Image_tint(int, VALUE *, VALUE);
 extern VALUE Image_to_blob(VALUE);
 extern VALUE Image_to_color(VALUE, VALUE);
 extern VALUE Image_transparent(int, VALUE *, VALUE);
+extern VALUE Image_transparent_chroma(int, VALUE *, VALUE);
 extern VALUE Image_transpose(VALUE);
 extern VALUE Image_transpose_bang(VALUE);
 extern VALUE Image_transverse(VALUE);

data/ext/RMagick/rmimage.c CHANGED Viewed

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.329 2008/11/13 00:04:26 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.334 2008/12/04 23:50:23 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -1554,7 +1554,13 @@ Image_change_geometry(VALUE self, VALUE geom_arg)
     memset(&rect, 0, sizeof(rect));
+#if defined(HAVE_NEWPARSESIZEGEOMETRY)
+    flags = ParseSizeGeometry(image, geometry, &rect, &image->exception);
+#else
     flags = ParseSizeGeometry(image, geometry, &rect);
+#endif
+    rm_check_image_exception(image, RetainOnError);
     if (flags == NoValue)
     {
         rb_raise(rb_eArgError, "invalid geometry string `%s'", geometry);
@@ -6342,6 +6348,7 @@ Image_mask(int argc, VALUE *argv, VALUE self)
         for (y = 0; y < (long) clip_mask->rows; y++)
         {
             q = GetImagePixels(clip_mask, 0, y, clip_mask->columns, 1);
+            rm_check_image_exception(clip_mask, DestroyOnError);
             if (!q)
             {
                 break;
@@ -6357,18 +6364,12 @@ Image_mask(int argc, VALUE *argv, VALUE self)
                 q->blue = q->opacity;
                 q += 1;
             }
-            if (SyncImagePixels(clip_mask) == (MagickBooleanType)MagickFalse)
-            {
-                (void) DestroyImage(clip_mask);
-                rm_magick_error("SyncImagePixels failed", NULL);
-            }
+            SyncImagePixels(clip_mask);
+            rm_check_image_exception(clip_mask, DestroyOnError);
         }
-        if (SetImageStorageClass(clip_mask, DirectClass) == (MagickBooleanType)MagickFalse)
-        {
-            (void) DestroyImage(clip_mask);
-            rm_magick_error("SetImageStorageClass failed", NULL);
-        }
+        SetImageStorageClass(clip_mask, DirectClass);
+        rm_check_image_exception(clip_mask, DestroyOnError);
         clip_mask->matte = MagickTrue;
@@ -7479,12 +7480,8 @@ Image_pixel_color(int argc, VALUE *argv, VALUE self)
         }
     }
     *pixel = new_color;
-    okay = SyncImagePixels(image);
+    SyncImagePixels(image);
     rm_check_image_exception(image, RetainOnError);
-    if (!okay)
-    {
-        rb_raise(Class_ImageMagickError, "image pixels could not be synced");
-    }
     return Pixel_from_PixelPacket(&old_color);
 }
@@ -9218,46 +9215,127 @@ Image_spaceship(VALUE self, VALUE other)
 /*
-    Method:     Image#sparse_color(method, pts[, channel...])
+    Method:     Image#sparse_color(method, x1, y1, color [, xn, yn,  color] [, channel...])
     Purpose:    Call SparseColorInterpolate
+    Notes:      As usual, 'color' can be either a color name or a pixel
 */
+#if defined(HAVE_SPARSECOLORIMAGE)
+static unsigned long
+count_channels(Image *image, ChannelType *channels)
+{
+    unsigned long ncolors = 0UL;
+    if (image->colorspace != CMYKColorspace)
+    {
+        *channels = (ChannelType) (*channels & ~IndexChannel);  /* remove index channels from count */
+    }
+    if ( image->matte == MagickFalse )
+    {
+        *channels = (ChannelType) (*channels & ~OpacityChannel);  /* remove matte/alpha *channels from count */
+    }
+    if (*channels & RedChannel)
+    {
+        ncolors += 1;
+    }
+    if (*channels & GreenChannel)
+    {
+        ncolors += 1;
+    }
+    if (*channels & BlueChannel)
+    {
+        ncolors += 1;
+    }
+    if (*channels & IndexChannel)
+    {
+        ncolors += 1;
+    }
+    if (*channels & OpacityChannel)
+    {
+        ncolors += 1;
+    }
+    return ncolors;
+}
+#endif
 VALUE
 Image_sparse_color(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_SPARSECOLORINTERPOLATE) && 0
+#if defined(HAVE_SPARSECOLORIMAGE)
     Image *image, *new_image;
-    unsigned long n, npoints;
-    SparseColorInterpolateMethod interpolate_method;
-    double *points;
+    unsigned long x, nargs, ncolors;
+    SparseColorMethod method;
+    int n, exp;
+    double * volatile args;
     ChannelType channels;
+    MagickPixelPacket pp;
     ExceptionInfo exception;
     image = rm_check_destroyed(self);
+    n = argc;
     channels = extract_channels(&argc, argv);
+    n -= argc;  // n is now the number of channel arguments
-    if (argc != 2)
+    // After the channel arguments have been removed, and not counting the first
+    // (method) argument, the number of arguments should be a multiple of 3.
+    if (argc < 4 || argc % 3 != 1)
     {
-        raise_ChannelType_error(argv[argc-1]);
+        exp = argc - 1;
+        exp = (argc + 2) / 3 * 3;
+        exp = max(exp, 3);
+        rb_raise(rb_eArgError, "wrong number of arguments (expected at least %d, got %d)", n+exp+1,  n+argc);
     }
-    VALUE_TO_ENUM(argv[0], interpolate_method, SparseColorInterpolateMethod);
-    npoints = RARRAY_LEN(argv[1]);
+    // Get the method from the argument list
+    VALUE_TO_ENUM(argv[0], method, SparseColorMethod);
+    argv += 1;
+    argc -= 1;
-    // Allocate points array from Ruby's memory. If an error occurs Ruby will
-    // be able to clean it up.
-    points = ALLOC_N(double, npoints);
+    // A lot of the following code is based on SparseColorOption, in wand/mogrify.c
+    ncolors = count_channels(image, &channels);
+    nargs = (argc / 3) * (2 + ncolors);
-    for (n = 0; n < npoints; n++)
+    // Allocate args from Ruby's memory so that GC will collect it if one of
+    // the type conversions below raises an exception.
+    args = ALLOC_N(double, nargs);
+    memset(args, 0, nargs * sizeof(double));
+    x = 0;
+    n = 0;
+    while (n < argc)
     {
-        points[n] = NUM2DBL(rb_ary_entry(argv[1], n));
+        args[x++] = NUM2DBL(argv[n++]);
+        args[x++] = NUM2DBL(argv[n++]);
+        Color_to_MagickPixelPacket(NULL, &pp, argv[n++]);
+        if (channels & RedChannel)
+        {
+            args[x++] = pp.red / QuantumRange;
+        }
+        if (channels & GreenChannel)
+        {
+            args[x++] = pp.green / QuantumRange;
+        }
+        if (channels & BlueChannel)
+        {
+            args[x++] = pp.blue / QuantumRange;
+        }
+        if (channels & IndexChannel)
+        {
+            args[x++] = pp.index / QuantumRange;
+        }
+        if (channels & OpacityChannel)
+        {
+            args[x++] = pp.opacity / QuantumRange;
+        }
     }
     GetExceptionInfo(&exception);
-    new_image = SparseColorInterpolate(image, interpolate_method, npoints, points, channels, &exception);
-    xfree(points);
-    rm_check_exception(&exception, new_image, DestroyOnError);
-    (void) DestroyExceptionInfo(&exception);
+    new_image = SparseColorImage(image, channels, method, nargs, args, &exception);
+    xfree(args);
+    CHECK_EXCEPTION();
     rm_ensure_result(new_image);
     return rm_image_new(new_image);
@@ -9538,12 +9616,8 @@ Image_store_pixels(VALUE self, VALUE x_arg, VALUE y_arg, VALUE cols_arg
             pixels[n] = *pixel;
         }
-        okay = SyncImagePixels(image);
+        SyncImagePixels(image);
         rm_check_image_exception(image, RetainOnError);
-        if (!okay)
-        {
-            rb_raise(Class_ImageMagickError, "SyncImagePixels failed. Can't store pixels.");
-        }
     }
     return self;
@@ -10136,13 +10210,65 @@ Image_transparent(int argc, VALUE *argv, VALUE self)
     {
         // Force exception
         DestroyImage(new_image);
-        rm_ensure_result(NULL);
+        rm_magick_error("TransparentPaintImage failed with no explanation", NULL);
     }
     return rm_image_new(new_image);
 }
+/*
+    Method:     Image#transparent_chroma(low, high, opacity=TransparentOpacity, invert=false)
+    Purpose:    Call TransparentPaintImageChroma (>= 6.4.5-6)
+*/
+VALUE
+Image_transparent_chroma(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_TRANSPARENTPAINTIMAGECHROMA)
+    Image *image, *new_image;
+    Quantum opacity = TransparentOpacity;
+    MagickPixelPacket low, high;
+    MagickBooleanType invert = MagickFalse;
+    MagickBooleanType okay;
+    image = rm_check_destroyed(self);
+    switch (argc)
+    {
+        case 4:
+            invert = RTEST(argv[3]);
+        case 3:
+            opacity = APP2QUANTUM(argv[2]);
+        case 2:
+            Color_to_MagickPixelPacket(image, &high, argv[1]);
+            Color_to_MagickPixelPacket(image, &low, argv[0]);
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 2, 3 or 4)", argc);
+            break;
+    }
+    new_image = rm_clone_image(image);
+    okay = TransparentPaintImageChroma(new_image, &low, &high, opacity, invert);
+    rm_check_image_exception(new_image, DestroyOnError);
+    if (!okay)
+    {
+        // Force exception
+        DestroyImage(new_image);
+        rm_magick_error("TransparentPaintImageChroma failed with no explanation", NULL);
+    }
+    return rm_image_new(new_image);
+#else
+    rm_not_implemented();
+    argc = argc;
+    argv = argv;
+    self = self;
+#endif
+}
 /*
     Method:     Image#transparent_color
     Purpose:    Return the name of the transparent color as a String.
@@ -10757,7 +10883,6 @@ Image_wet_floor(int argc, VALUE *argv, VALUE self)
     double rate = 1.0;
     double opacity, step;
     const char *func;
-    MagickBooleanType okay;
     ExceptionInfo exception;
     image = rm_check_destroyed(self);
@@ -10831,6 +10956,11 @@ Image_wet_floor(int argc, VALUE *argv, VALUE self)
         p = AcquireImagePixels(reflection, 0, y, image->columns, 1, &exception);
         rm_check_exception(&exception, reflection, RetainOnError);
+        if (!p)
+        {
+            func = "AcquireImagePixels";
+            goto error;
+        }
         q = SetImagePixels(reflection, 0, y, image->columns, 1);
         rm_check_image_exception(reflection, DestroyOnError);
@@ -10847,13 +10977,8 @@ Image_wet_floor(int argc, VALUE *argv, VALUE self)
             q[x].opacity = max(q[x].opacity, (Quantum)opacity);
         }
-        okay = SyncImagePixels(reflection);
+        SyncImagePixels(reflection);
         rm_check_image_exception(reflection, DestroyOnError);
-        if (!okay)
-        {
-            func = "SyncImagePixels";
-            goto error;
-        }
         opacity += step;
     }