RubyGems - rmagick - Versions diffs - 2.11.1 → 2.12.0 - Mend

rmagick 2.11.1 → 2.12.0

Potentially problematic release.

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

Files changed (42) hide show

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.11.1: Miscellaneous classes</title>
+  <title>RMagick 2.12.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.11.1 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.12.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 7 December 2008), see www.w3.org" />
-  <title>RMagick 2.11.1: How to use RMagick</title>
+  <title>RMagick 2.12.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.11.1 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.12.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="index.html">Prev</a> | <a href=
@@ -1024,12 +1024,26 @@ exit
       <dd>Apply a histogram equalization to the image</dd>
-      <dt><a href="image2.html#gamma_correct">gamma_correct</a>,
+      <dt><a href=
+      "image2.html#function_channel">function_channel</a></dt>
+      <dd>Apply a function to selected channel values</dd>
+      <dt class="ilist"><a href="ilist.html#fx">fx</a></dt>
+      <dd class="ilist">Apply a mathematical expression to an
+      image</dd>
+      <dt><a href=
+      "image1.html#auto_gamma_channel">auto_gamma_channel</a>,
+      <a href="image2.html#gamma_correct">gamma_correct</a>,
       <a href="image2.html#gamma_channel">gamma_channel</a></dt>
       <dd>Gamma correct the image</dd>
-      <dt><a href="image2.html#level">level,</a> <a href=
+      <dt><a href=
+      "image1.html#auto_level_channel">auto_level_channel</a>,
+      <a href="image2.html#level">level,</a> <a href=
       "image2.html#level_channel">level_channel</a>, <a href=
       "image2.html#level_colors">level_colors</a>, <a href=
       "image2.html#levelize_channel">levelize_channel</a></dt>
@@ -1063,6 +1077,12 @@ exit
       <dd>Enhance the contrast of the image</dd>
+      <dt><a href=
+      "image3.html#quantum_operator">quantum_operator</a></dt>
+      <dd>Performs an integer arithmetic operation on selected
+      channels values</dd>
       <dt><a href="image3.html#reduce_noise">reduce_noise</a></dt>
       <dd>Smooth the contours of an image while still preserving
@@ -1139,11 +1159,6 @@ exit
       <dd>Apply a custom convolution kernel to the image</dd>
-      <dt class="ilist"><a href="ilist.html#fx">fx</a></dt>
-      <dd class="ilist">apply a mathematical expression to an
-      image</dd>
       <dt><a href="image3.html#segment">segment</a></dt>
       <dd>Segment an image by analyzing the histograms of the color

data/ext/RMagick/MANIFEST CHANGED Viewed

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-2.11.1 - 16:14:31 09/05/09
+MANIFEST for RMagick-2.12.0 - 09:21:21 10/04/09
 doc/ilist.html
 doc/scripts/stripeTables.js

data/ext/RMagick/extconf.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 require "mkmf"
 require "date"
-RMAGICK_VERS = "2.11.1"
+RMAGICK_VERS = "2.12.0"
 MIN_RUBY_VERS = "1.8.5"
 MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
 MIN_IM_VERS = "6.3.5"
@@ -194,16 +194,20 @@ have_func("snprintf", headers)
   ["AcquireImage",                   # 6.4.1
    "AffinityImage",                  # 6.4.3-6
    "AffinityImages",                 # 6.4.3-6
+   "AutoGammaImageChannel",          # 6.5.5-1
+   "AutoLevelImageChannel",          # 6.5.5-1
    "BlueShiftImage",                 # 6.5.4-3
    "DeskewImage",                    # 6.4.2-5
    "EncipherImage",                  # 6.3.8-6
    "EqualizeImageChannel",           # 6.3.6-9
    "FloodfillPaintImage",            # 6.3.7
+   "FunctionImageChannel",           # 6.4.8-8
    "GetAuthenticIndexQueue",         # 6.4.5-6
    "GetAuthenticPixels",             # 6.4.5-6
    "GetImageAlphaChannel",           # 6.3.9-2
    "GetVirtualPixels",               # 6.4.5-6
    "LevelImageColors",               # 6.4.2
+   "LevelColorsImageChannel",        # 6.5.6-4
    "LevelizeImageChannel",           # 6.4.2
    "LiquidRescaleImage",             # 6.3.8-2
    "OpaquePaintImageChannel",        # 6.3.7-10
@@ -252,8 +256,10 @@ end
 have_struct_member("Image", "type", headers)          # ???
 have_struct_member("DrawInfo", "kerning", headers)    # 6.4.7-8
+have_struct_member("DrawInfo", "interline_spacing", headers)   # 6.5.5-8
 have_struct_member("DrawInfo", "interword_spacing", headers)   # 6.4.8-0
 have_type("DitherMethod", headers)                    # 6.4.2
+have_type("MagickFunction", headers)                  # 6.4.8-8
 have_type("ImageLayerMethod", headers)                # 6.3.6 replaces MagickLayerMethod
 have_type("long double", headers)
 #have_type("unsigned long long", headers)
@@ -314,6 +320,8 @@ have_enum_values("MagickEvaluateOperator", ["PowEvaluateOperator",           # 6
                                            "SineEvaluateOperator",           # 6.4.8-5
                                            "AddModulusEvaluateOperator"],    # 6.4.8-5
                                                                  headers)
+have_enum_values("MagickFunction", ["ArcsinFunction",                        # 6.5.2-8
+                                    "ArctanFunction"], headers)              # 6.5.2-8
 have_enum_values("ImageLayerMethod", ["FlattenLayer",                           # 6.3.6-2
                                       "MergeLayer",                             # 6.3.6
                                       "MosaicLayer",                            # 6.3.6-2

data/ext/RMagick/rmagick.h CHANGED Viewed

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.275 2009/07/23 22:55:57 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.278 2009/09/15 22:09:44 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -363,6 +363,7 @@ EXTERN VALUE Class_ImageType;
 EXTERN VALUE Class_InterlaceType;
 EXTERN VALUE Class_InterpolatePixelMethod;
 EXTERN VALUE CLASS_LAYERMETHODTYPE;
+EXTERN VALUE Class_MagickFunction;
 EXTERN VALUE Class_NoiseType;
 EXTERN VALUE Class_OrientationType;
 EXTERN VALUE Class_PaintMethod;
@@ -632,6 +633,7 @@ ATTR_WRITER(Draw, font_stretch)
 ATTR_WRITER(Draw, font_style)
 ATTR_WRITER(Draw, font_weight)
 ATTR_WRITER(Draw, gravity)
+ATTR_WRITER(Draw, interline_spacing)
 ATTR_WRITER(Draw, interword_spacing)
 ATTR_WRITER(Draw, kerning)
 ATTR_WRITER(Draw, pointsize)
@@ -867,6 +869,8 @@ extern VALUE Image_alpha(int, VALUE *, VALUE);
 extern VALUE Image_alpha_q(VALUE);
 extern VALUE Image_aref(VALUE, VALUE);
 extern VALUE Image_aset(VALUE, VALUE, VALUE);
+extern VALUE Image_auto_gamma_channel(int, VALUE *, VALUE);
+extern VALUE Image_auto_level_channel(int, VALUE *, VALUE);
 extern VALUE Image_auto_orient(VALUE);
 extern VALUE Image_auto_orient_bang(VALUE);
 extern VALUE Image_properties(VALUE);
@@ -951,6 +955,7 @@ extern VALUE Image_flop(VALUE);
 extern VALUE Image_flop_bang(VALUE);
 extern VALUE Image_frame(int, VALUE *, VALUE);
 extern VALUE Image_from_blob(VALUE, VALUE);
+extern VALUE Image_function_channel(int, VALUE *, VALUE);
 extern VALUE Image_gamma_channel(int, VALUE *, VALUE);
 extern VALUE Image_gamma_correct(int, VALUE *, VALUE);
 extern VALUE Image_gaussian_blur(int, VALUE *, VALUE);

data/ext/RMagick/rmdraw.c CHANGED Viewed

@@ -1,4 +1,4 @@
-/* $Id: rmdraw.c,v 1.81 2009/07/21 23:12:42 rmagick Exp $ */
+/* $Id: rmdraw.c,v 1.82 2009/09/11 22:29:30 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmdraw.c
@@ -322,6 +322,30 @@ Draw_kerning_eq(VALUE self, VALUE kerning)
 }
+/*
+    Method:     Draw#interline_spacing
+    Purpose:    space between two liness
+    Notes:      new for 6.5.5-8
+*/
+VALUE
+Draw_interline_spacing_eq(VALUE self, VALUE spacing)
+{
+#if defined(HAVE_ST_INTERLINE_SPACING)
+    Draw *draw;
+    rb_check_frozen(self);
+    Data_Get_Struct(self, Draw, draw);
+    draw->info->interline_spacing = NUM2DBL(spacing);
+    return self;
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+    self = self;
+    spacing = spacing;
+#endif
+}
 /*
     Method:     Draw#interword_spacing
     Purpose:    space between two words

data/ext/RMagick/rmilist.c CHANGED Viewed

@@ -1,4 +1,4 @@
-/* $Id: rmilist.c,v 1.92 2009/06/03 23:08:30 rmagick Exp $ */
+/* $Id: rmilist.c,v 1.93 2009/09/26 22:31:10 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmilist.c
@@ -510,6 +510,7 @@ ImageList_optimize_layers(VALUE self, VALUE method)
     Image *images, *new_images, *new_images2;
     LAYERMETHODTYPE mthd;
     ExceptionInfo exception;
+    QuantizeInfo quantize_info;
     new_images2 = NULL;     // defeat "unused variable" message
@@ -561,7 +562,12 @@ 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);
@@ -867,7 +873,7 @@ ImageList_remap(int argc, VALUE *argv, VALUE self)
     images = images_from_imagelist(self);
-#if defined(HAVE_REMAPIMAGES)
+#if defined(HAVE_REMAPIMAGE)
     (void) RemapImages(&quantize_info, images, remap_image);
 #else
     (void) AffinityImages(&quantize_info, images, remap_image);

data/ext/RMagick/rmimage.c CHANGED Viewed

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.353 2009/07/23 22:55:57 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.356 2009/09/26 22:30:26 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -707,6 +707,57 @@ crisscross(int bang, VALUE self, Image *fp(const Image *, ExceptionInfo *))
 }
+static VALUE
+auto_channel(int argc, VALUE *argv, VALUE self, MagickBooleanType (*fp)(Image *, const ChannelType))
+{
+    Image *image, *new_image;
+    ChannelType channels;
+    image = rm_check_destroyed(self);
+    channels = extract_channels(&argc, argv);
+    if (argc > 0)
+    {
+        raise_ChannelType_error(argv[argc-1]);
+    }
+    new_image = rm_clone_image(image);
+    (void) (fp)(new_image, channels);
+    rm_check_image_exception(new_image, DestroyOnError);
+    return rm_image_new(new_image);
+}
+VALUE
+Image_auto_gamma_channel(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_AUTOGAMMAIMAGECHANNEL)
+    return auto_channel(argc, argv, self, AutoGammaImageChannel);
+#else
+    rm_not_implemented();
+    argc = argc;
+    argv = argv;
+    self = self;
+#endif
+}
+VALUE
+Image_auto_level_channel(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_AUTOLEVELIMAGECHANNEL)
+    return auto_channel(argc, argv, self, AutoLevelImageChannel);
+#else
+    rm_not_implemented();
+    argc = argc;
+    argv = argv;
+    self = self;
+#endif
+}
 /*
     Method:     Image#auto_orient
     Purpose:    Implement mogrify's -auto_orient option
@@ -5075,6 +5126,77 @@ Image_from_blob(VALUE class, VALUE blob_arg)
 }
+/*
+ *  Method:     Image#function_channel(function, args[, channel...])
+ */
+VALUE
+Image_function_channel(int argc, VALUE *argv, VALUE self)
+{
+    Image *image, *new_image;
+    MagickFunction function;
+    unsigned long n, nparms;
+    volatile double *parameters;
+    double *parms;
+    ChannelType channels;
+    ExceptionInfo exception;
+    image = rm_check_destroyed(self);
+    channels = extract_channels(&argc, argv);
+    // The number of parameters depends on the function.
+    if (argc == 0)
+    {
+        rb_raise(rb_eArgError, "no function specified");
+    }
+    VALUE_TO_ENUM(argv[0], function, MagickFunction);
+    argc -= 1;
+    argv += 1;
+    switch (function)
+    {
+        case PolynomialFunction:
+            if (argc == 0)
+            {
+                rb_raise(rb_eArgError, "PolynomialFunction requires at least one argument.");
+            }
+            break;
+        case SinusoidFunction:
+#if defined(HAVE_ENUM_ARCSINFUNCTION)
+        case ArcsinFunction:
+#endif
+#if defined(HAVE_ENUM_ARCTANFUNCTION)
+        case ArctanFunction:
+#endif
+           if (argc < 1 || argc > 4)
+           {
+               rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 to 4)", argc);
+           }
+           break;
+        default:
+            rb_raise(rb_eArgError, "undefined function");
+            break;
+    }
+    nparms = argc;
+    parameters = parms = ALLOC_N(double, nparms);
+    for (n = 0; n < nparms; n++)
+    {
+        parms[n] = NUM2DBL(argv[n]);
+    }
+    GetExceptionInfo(&exception);
+    new_image = rm_clone_image(image);
+    (void) FunctionImageChannel(new_image, channels, function, nparms, parms, &exception);
+    (void) xfree(parms);
+    rm_check_exception(&exception, new_image, DestroyOnError);
+    DestroyExceptionInfo(&exception);
+    return rm_image_new(new_image);
+}
 DEF_ATTR_READER(Image, fuzz, dbl)
@@ -5902,7 +6024,7 @@ Image_level_channel(int argc, VALUE *argv, VALUE self)
 VALUE
 Image_level_colors(int argc, VALUE *argv, VALUE self)
 {
-#if defined(HAVE_LEVELIMAGECOLORS)
+#if defined(HAVE_LEVELIMAGECOLORS) || defined(HAVE_LEVELCOLORSIMAGECHANNEL)
     Image *image, *new_image;
     MagickPixelPacket black_color, white_color;
     ChannelType channels;
@@ -5955,7 +6077,11 @@ Image_level_colors(int argc, VALUE *argv, VALUE self)
     new_image = rm_clone_image(image);
+#if defined(HAVE_LEVELCOLORSIMAGECHANNEL)      // new in 6.5.6-4
+    status = LevelColorsImageChannel(new_image, channels, &black_color, &white_color, invert);
+#else
     status = LevelImageColors(new_image, channels, &black_color, &white_color, invert);
+#endif
     rm_check_image_exception(new_image, DestroyOnError);
     if (!status)
     {
@@ -10007,7 +10133,7 @@ Image_threshold(VALUE self, VALUE threshold)
     image = rm_check_destroyed(self);
     new_image = rm_clone_image(image);
-    (void) ThresholdImage(new_image, NUM2DBL(threshold));
+    (void) BilevelImageChannel(new_image, DefaultChannels, NUM2DBL(threshold));
     rm_check_image_exception(new_image, DestroyOnError);
     return rm_image_new(new_image);

data/ext/RMagick/rmmain.c CHANGED Viewed

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.299 2009/09/05 20:01:08 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.302 2009/09/15 22:09:44 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -258,6 +258,8 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "alpha?", Image_alpha_q, 0);
     rb_define_method(Class_Image, "[]", Image_aref, 1);
     rb_define_method(Class_Image, "[]=", Image_aset, 2);
+    rb_define_method(Class_Image, "auto_gamma_channel", Image_auto_gamma_channel, -1);
+    rb_define_method(Class_Image, "auto_level_channel", Image_auto_level_channel, -1);
     rb_define_method(Class_Image, "auto_orient", Image_auto_orient, 0);
     rb_define_method(Class_Image, "auto_orient!", Image_auto_orient_bang, 0);
     rb_define_method(Class_Image, "properties", Image_properties, 0);
@@ -341,6 +343,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "flop", Image_flop, 0);
     rb_define_method(Class_Image, "flop!", Image_flop_bang, 0);
     rb_define_method(Class_Image, "frame", Image_frame, -1);
+    rb_define_method(Class_Image, "function_channel", Image_function_channel, -1);
     rb_define_method(Class_Image, "gamma_channel", Image_gamma_channel, -1);
     rb_define_method(Class_Image, "gamma_correct", Image_gamma_correct, -1);
     rb_define_method(Class_Image, "gaussian_blur", Image_gaussian_blur, -1);
@@ -505,6 +508,7 @@ Init_RMagick2(void)
     DCL_ATTR_WRITER(Draw, font_style)
     DCL_ATTR_WRITER(Draw, font_weight)
     DCL_ATTR_WRITER(Draw, gravity)
+    DCL_ATTR_WRITER(Draw, interline_spacing)
     DCL_ATTR_WRITER(Draw, interword_spacing)
     DCL_ATTR_WRITER(Draw, kerning)
     DCL_ATTR_WRITER(Draw, pointsize)
@@ -1221,6 +1225,20 @@ Init_RMagick2(void)
 #endif
     END_ENUM
+#if defined(HAVE_TYPE_MAGICKFUNCTION)
+    DEF_ENUM(MagickFunction)
+        ENUMERATOR(UndefinedFunction)
+        ENUMERATOR(PolynomialFunction)
+        ENUMERATOR(SinusoidFunction)
+#if defined(HAVE_ENUM_ARCSINFUNCTION)
+        ENUMERATOR(ArcsinFunction)
+#endif
+#if defined(HAVE_ENUM_ARCTANFUNCTION)
+        ENUMERATOR(ArctanFunction)
+#endif
+    END_ENUM
+#endif
 #if defined(HAVE_TYPE_IMAGELAYERMETHOD)
     DEF_ENUM(ImageLayerMethod)
 #else
@@ -1638,7 +1656,7 @@ version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
     sprintf(long_version,
-            "This is %s ($Date: 2009/09/05 20:01:08 $) Copyright (C) 2009 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2009/09/15 22:09:44 $) Copyright (C) 2009 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
             "Web page: http://rmagick.rubyforge.org\n"