RubyGems - rmagick - Versions diffs - 2.2.2 → 2.3.0 - Mend

rmagick 2.2.2 → 2.3.0

Potentially problematic release.

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

Files changed (55) hide show

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.2.2: RVG Reference: Transforms</title>
+  <title>RMagick 2.3.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.2.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.3.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 1 September 2005), see www.w3.org" />
-  <title>RMagick 2.2.2: Miscellaneous classes</title>
+  <title>RMagick 2.3.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.2.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.3.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="draw.html">Prev</a> | <a href=
@@ -132,7 +132,7 @@
       <p>The easiest way to use an <code>Image::View</code> object
       is to create it with the <a href=
       "image3.html#view">Image#view</a> method, which provides a
-      block-scoped view and automatic sync'ing. You probably won't
+      block-scoped view and automatic syncing. You probably won't
       want to create a view by calling <code>new</code>.</p>
       <h5>Arguments</h5>
@@ -224,7 +224,7 @@
   pixels = view[3][]
   # Use arrays to specify a non-contiguous set of rows and columns
   pixels = view[[1,3,5]][[2,4,6]]
-  # Use ranges to specify a contigous set of rows and columns
+  # Use ranges to specify a contiguous set of rows and columns
   pixels = view[1..5][2..6]
 </pre>
     </div>
@@ -414,8 +414,8 @@
       <p>The Geometry class contains the same information as an
       ImageMagick <a href="imusage.html#geometry">geometry
-      string</a>. Geometry objects are interchangable with geometry
-      strings.</p>
+      string</a>. Geometry objects are interchangeable with
+      geometry strings.</p>
     </div>
     <h3>class Geometry <span class="superclass">&lt;
@@ -578,7 +578,7 @@ g = Magick::Geometry.new(100,200,nil,nil,Magick::AspectGeometry)
       <h3>Introduction</h3>
       <p>A pixel describes the smallest individually addressable
-      part of an image. In the RBG <a href=
+      part of an image. In the RGB <a href=
       "constants.html#ColorspaceType">colorspace</a>, a pixel's
       color is described by its intensity in the red, green, and
       blue channels. Its opacity is described by its intensity in
@@ -657,17 +657,44 @@ g = Magick::Geometry.new(100,200,nil,nil,Magick::AspectGeometry)
     </div>
     <div class="sig">
-      <h4>from_HSL</h4>
+      <h4 id="from_hsla">from_hsla</h4>
-      <p>Pixel.from_HSL(<span class="arg">[hue, saturation,
-      luminosity]</span>) -&gt; <em>pixel</em></p>
+      <p>Pixel.from_hsla(<span class="arg">hue</span>, <span class=
+      "arg">saturation</span>, <span class="arg">lightness</span>,
+      <span class="arg">alpha</span>=1.0) -&gt; <em>pixel</em></p>
     </div>
     <div class="desc">
       <h5>Description</h5>
-      <p>Constructs a pixel object from the specified array of 3
-      values: hue, saturation, and luminosity.</p>
+      <p>Constructs a pixel object from the specified
+      arguments.</p>
+      <h5>Arguments</h5>
+      <dl>
+        <dt>hue</dt>
+        <dd>A value in the range [0.0, 360.0).</dd>
+        <dt>saturation</dt>
+        <dd>A value in the range [0.0, 100.0].</dd>
+        <dt>lightness</dt>
+        <dd>A value in the range 0.0, 100.0].</dd>
+        <dt>alpha</dt>
+        <dd>A value in the range [0.0, 1.0], where 1.0 is fully
+        opaque and 0.0 is fully transparent. This argument may be
+        omitted. The default is 1.0.</dd>
+      </dl>
+      <h5>See also</h5>
+      <p><a href="#to_hsla">to_hsla</a></p>
     </div>
     <div class="sig">
@@ -769,7 +796,8 @@ g = Magick::Geometry.new(100,200,nil,nil,Magick::AspectGeometry)
       <p><span class="arg">pixel</span>.to_color(<span class=
       "arg">compliance</span>=AllCompliance, <span class=
       "arg">matte</span>=<code>false</code>, <span class=
-      "arg">depth</span>=<code>QuantumDepth</code>) -&gt;
+      "arg">depth</span>=<code>QuantumDepth</code>, <span class=
+      "arg">hex</span>=<code>false</code>) -&gt;
       <em>string</em></p>
     </div>
@@ -779,8 +807,7 @@ g = Magick::Geometry.new(100,200,nil,nil,Magick::AspectGeometry)
       <p>Returns the <a href="imusage.html#color_names">color
       name</a> corresponding the the pixel values. If there is no
       such named color in the specified color standard, returns a
-      string in the form "#RRGGBBOO" or, if the depth is 16,
-      "#RRRRGGGGBBBBOOOO".</p>
+      string in the form "rgb(r,g,b,a)".</p>
       <h5>Arguments</h5>
@@ -804,6 +831,12 @@ g = Magick::Geometry.new(100,200,nil,nil,Magick::AspectGeometry)
         when ImageMagick was compiled. The values 16 and 32 can be
         used only when ImageMagick was compiled with the
         appropriate QuantumDepth.</dd>
+        <dt>hex</dt>
+        <dd>If true, represent the color name in hex (#rrggbbaa or
+        #rrrrggggbbbbaaaa) format. In this case <span class=
+        "arg">compliance</span> is meaningless.</dd>
       </dl>
       <h5>See also</h5>
@@ -815,7 +848,7 @@ g = Magick::Geometry.new(100,200,nil,nil,Magick::AspectGeometry)
     </div>
     <div class="sig">
-      <h4>to_HSL</h4>
+      <h4>to_hsla</h4>
       <p><span class="arg">pixel</span>.to_HSL -&gt;
       <em>array</em></p>
@@ -825,12 +858,14 @@ g = Magick::Geometry.new(100,200,nil,nil,Magick::AspectGeometry)
       <h5>Description</h5>
       <p>Converts the RGB representation of the pixel to hue,
-      saturation, and luminosity values.</p>
+      saturation, lightness, and alpha values.</p>
       <h5>Returns</h5>
-      <p>An array of the form <code>[hue, saturation,
-      luminosity]</code>.</p>
+      <p>An array of the form <code>[hue, saturation, lightness,
+      alpha]</code>. Each value is in the range specified for it,
+      as described in <a href="#from_hsla">from_hsla</a>,
+      above.</p>
     </div>
   </div>

data/doc/usage.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.2.2: How to use RMagick</title>
+  <title>RMagick 2.3.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.2.2 User's Guide and Reference</h6>
+  <h6 id="header">RMagick 2.3.0 User's Guide and Reference</h6>
   <div class="nav">
     &laquo;&nbsp;<a href="index.html">Prev</a> | <a href=
@@ -148,7 +148,7 @@
   "#rubygems">2</a></span> the RMagick.rb file, which defines the
   <b>Magick</b> module. The Magick module contains 3 major classes,
   <b>ImageList</b>, <b>Image</b>, and <b>Draw</b>. This section -
-  <em>Basic Comcepts</em> - describes the ImageList and Image
+  <em>Basic Concepts</em> - describes the ImageList and Image
   classes. The Draw class is explained in the <em><a href=
   "#drawing">Drawing on and adding text to images</a></em> section,
   below.</p>
@@ -901,6 +901,10 @@ exit
       <dd>Extract a region from the image</dd>
+      <dt><a href="image1.html#decipher">decipher</a></dt>
+      <dd>Convert enciphered pixels to plain pixels</dd>
       <dt class="ilist"><a href=
       "ilist.html#deconstruct">deconstruct</a></dt>
@@ -912,6 +916,10 @@ exit
       <dd>Distort the image</dd>
+      <dt><a href="image2.html#encipher">encipher</a></dt>
+      <dd>Encipher plain pixels</dd>
       <dt><a href="image2.html#excerpt">excerpt</a></dt>
       <dd>Excerpt a rectangle from the image</dd>

data/ext/RMagick/MANIFEST CHANGED Viewed

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-2.2.2 - 19:34:24 02/12/08
+MANIFEST for RMagick-2.3.0 - 11:46:46 03/29/08
 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.2.2"
+RMAGICK_VERS = "2.3.0"
 MIN_RUBY_VERS = "1.8.2"
 MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
 MIN_IM_VERS = "6.3.0"
@@ -29,25 +29,6 @@ end
-def have_new_rb_cvar_set(headers=nil, &b)
-  checking_for "rb_cvar_set with 3 arguments" do
-    if try_compile(<<"SRC", &b)
-#{COMMON_HEADERS}
-#{cpp_include(headers)}
-/*top*/
-int main() { rb_cvar_set(rb_cArray, rb_intern("x"), INT2FIX(0)); return 0; }
-SRC
-      $defs.push("-DHAVE_NEW_RB_CVAR_SET")
-      true
-    else
-      false
-    end
-  end
-end
 # Test for multiple values of the same enum type
 def have_enum_values(enum, values, headers=nil, &b)
   values.each do |value|
@@ -138,9 +119,9 @@ end
 if RUBY_PLATFORM !~ /mswin/
-  unless have_library("Magick", "InitializeMagick", headers) || have_library("MagickCore", "InitializeMagick", headers)
+  unless have_library("Magick", "InitializeMagick", headers) || have_library("MagickCore", "InitializeMagick")
     exit_failure "Can't install RMagick #{RMAGICK_VERS}. " +
-           "Can't find libMagick or one of the dependent libraries. " +
+           "Can't find libMagick or libMagickCore, or one of the dependent libraries. " +
            "Check the mkmf.log file for more detailed information.\n"
   end
 end
@@ -155,9 +136,11 @@ have_func("snprintf", headers)
    "ConvertHSLToRGB",                # 6.3.5-9
    "ConvertRGBToHSL",                # 6.3.5-9
    "DistortImage",                   # 6.3.5
+   "EncipherImage",                  # 6.3.8-6
    "EqualizeImageChannel",           # 6.3.6-9
    "ExcerptImage",                   # 6.3.5-8
    "ExtentImage",                    # 6.3.1
+   "GetImageAlphaChannel",           # 6.3.9-2
    "GetImageProperty",               # 6.3.1
    "GetNextImageProperty",           # 6.3.1
    "IsHistogramImage",               # 6.3.5
@@ -194,6 +177,9 @@ have_enum_value("ColorspaceType", "CMYColorspace", headers)                  # 6
 have_enum_values("CompositeOperator", ["ChangeMaskCompositeOp",              # 6.3.3
                                        "LinearLightCompositeOp",             # 6.3.5
                                        "DivideCompositeOp"], headers)        # 6.3.5
+have_enum_values("CompressionType", ["DXT1Compression",                      # 6.3.9-3
+                                     "DXT3Compression",                      # 6.3.9-3
+                                     "DXT5Compression"], headers)            # 6.3.9-3
 have_enum_values("DistortImageMethod", ["ArcDistortion",                     # 6.3.5-5
                                "PerspectiveProjectionDistortion"], headers)  # 6.3.5-9
 have_enum_values("FilterTypes", ["KaiserFilter",                             # 6.3.6
@@ -226,7 +212,6 @@ have_enum_values("VirtualPixelMethod", ["MaskVirtualPixelMethod",            # 6
 # Now test Ruby 1.9.0 features.
 headers = ["ruby.h", "rubyio.h"]
 have_func("rb_frame_this_func", headers)
-have_new_rb_cvar_set(headers)

data/ext/RMagick/rmagick.h CHANGED Viewed

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.223 2008/01/28 22:31:50 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.231 2008/03/29 15:23:12 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -117,6 +117,7 @@
 #if !defined(RARRAY_LEN)
 #define RARRAY_LEN(a) RARRAY((a))->len
 #endif
+// Matz says this macro is read-only! (see http://www.ruby-forum.com/topic/146072)
 #if !defined(RARRAY_PTR)
 #define RARRAY_PTR(a) RARRAY((a))->ptr
 #endif
@@ -310,12 +311,10 @@ EXTERN VALUE Class_VirtualPixelMethod;
 *   Commonly-used IDs
 */
 EXTERN ID rm_ID_trace_proc;        // "@trace_proc"
-EXTERN ID rm_ID__dummy_img_;       // "_dummy_img_"
 EXTERN ID rm_ID_call;              // "call"
 EXTERN ID rm_ID_changed;           // "changed"
 EXTERN ID rm_ID_cur_image;         // "cur_image"
 EXTERN ID rm_ID_dup;               // "dup"
-EXTERN ID rm_ID_enumerators;       // "enumerators"
 EXTERN ID rm_ID_fill;              // "fill"
 EXTERN ID rm_ID_flag;              // "flag"
 EXTERN ID rm_ID_from_s;            // "from_s"
@@ -328,7 +327,6 @@ EXTERN ID rm_ID_notify_observers;  // "notify_observers"
 EXTERN ID rm_ID_new;               // "new"
 EXTERN ID rm_ID_push;              // "push"
 EXTERN ID rm_ID_spaceship;         // "<=>
-EXTERN ID rm_ID__tmpnam_;          // "_tmpnam_"
 EXTERN ID rm_ID_to_i;              // "to_i"
 EXTERN ID rm_ID_to_s;              // "to_s"
 EXTERN ID rm_ID_values;            // "values"
@@ -725,7 +723,7 @@ ATTR_READER(Image, image_type)
 ATTR_ACCESSOR(Image, interlace)
 ATTR_ACCESSOR(Image, iptc_profile)
 ATTR_ACCESSOR(Image, iterations)
-ATTR_ACCESSOR(Image, mask)
+ATTR_WRITER(Image, mask)
 ATTR_ACCESSOR(Image, matte)
 ATTR_ACCESSOR(Image, matte_color)
 ATTR_READER(Image, mean_error_per_pixel)
@@ -769,6 +767,8 @@ extern VALUE Image_add_noise(VALUE, VALUE);
 extern VALUE Image_add_noise_channel(int, VALUE *, VALUE);
 extern VALUE Image_add_profile(VALUE, VALUE);
 extern VALUE Image_affine_transform(VALUE, VALUE);
+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_orient(VALUE);
@@ -814,6 +814,7 @@ extern VALUE Image_copy(VALUE);
 extern VALUE Image_crop(int, VALUE *, VALUE);
 extern VALUE Image_crop_bang(int, VALUE *, VALUE);
 extern VALUE Image_cycle_colormap(VALUE, VALUE);
+extern VALUE Image_decipher(VALUE, VALUE);
 extern VALUE Image_delete_profile(VALUE, VALUE);
 extern VALUE Image_despeckle(VALUE);
 extern VALUE Image_destroy_bang(VALUE);
@@ -830,6 +831,7 @@ extern VALUE Image_dup(VALUE);
 extern VALUE Image_each_profile(VALUE);
 extern VALUE Image_edge(int, VALUE *, VALUE);
 extern VALUE Image_emboss(int, VALUE *, VALUE);
+extern VALUE Image_encipher(VALUE, VALUE);
 extern VALUE Image_enhance(VALUE);
 extern VALUE Image_equalize(VALUE);
 extern VALUE Image_equalize_channel(int, VALUE *, VALUE);
@@ -865,6 +867,7 @@ extern VALUE Image__load(VALUE, VALUE);
 extern VALUE Image_magnify(VALUE);
 extern VALUE Image_magnify_bang(VALUE);
 extern VALUE Image_map(int, VALUE *, VALUE);
+extern VALUE Image_mask(int, VALUE *, VALUE);
 extern VALUE Image_matte_flood_fill(VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
 extern VALUE Image_median_filter(int, VALUE *, VALUE);
 extern VALUE Image_minify(VALUE);
@@ -1010,6 +1013,7 @@ extern VALUE  Pixel_eql_q(VALUE, VALUE);
 extern VALUE  Pixel_fcmp(int, VALUE *, VALUE);
 extern VALUE  Pixel_from_color(VALUE, VALUE);
 extern VALUE  Pixel_from_HSL(VALUE, VALUE);
+extern VALUE  Pixel_from_hsla(int, VALUE *, VALUE);
 extern VALUE  Pixel_hash(VALUE);
 extern VALUE  Pixel_initialize(int, VALUE *, VALUE);
 extern VALUE  Pixel_init_copy(VALUE, VALUE);
@@ -1017,6 +1021,7 @@ extern VALUE  Pixel_intensity(VALUE);
 extern VALUE  Pixel_spaceship(VALUE, VALUE);
 extern VALUE  Pixel_to_color(int, VALUE *, VALUE);
 extern VALUE  Pixel_to_HSL(VALUE);
+extern VALUE  Pixel_to_hsla(VALUE);
 extern VALUE  Pixel_to_s(VALUE);
 extern VALUE  PixelPacket_to_Color_Name(Image *, PixelPacket *);
 extern VALUE  PixelPacket_to_Color_Name_Info(Info *, PixelPacket *);

data/ext/RMagick/rmdraw.c CHANGED Viewed

@@ -1,4 +1,4 @@
-/* $Id: rmdraw.c,v 1.61 2008/01/01 23:18:31 rmagick Exp $ */
+/* $Id: rmdraw.c,v 1.62 2008/03/29 15:20:36 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmdraw.c
@@ -1192,6 +1192,7 @@ destroy_Montage(void *obj)
     if (montage->info && montage->info->texture != NULL)
     {
         rm_delete_temp_image(montage->info->texture);
+        magick_free(montage->info->texture);
         montage->info->texture = NULL;
     }
     if (montage->info)
@@ -1261,6 +1262,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
     // remove it now in preparation for this new one.
     if (montage->info->texture)
     {
+        rm_delete_temp_image(montage->info->texture);
         magick_free(montage->info->texture);
         montage->info->texture = NULL;
     }
@@ -1403,11 +1405,12 @@ VALUE PolaroidOptions_border_color_eq(VALUE self, VALUE border)
 static VALUE get_dummy_tm_img(VALUE klass)
 {
+#define DUMMY_IMG_CLASS_VAR "@@_dummy_img_"
     volatile VALUE dummy_img = 0;
     Info *info;
     Image *image;
-    if (rb_cvar_defined(klass, rm_ID__dummy_img_) != Qtrue)
+    if (rb_cvar_defined(klass, rb_intern(DUMMY_IMG_CLASS_VAR)) != Qtrue)
     {
         info = CloneImageInfo(NULL);
@@ -1423,13 +1426,9 @@ static VALUE get_dummy_tm_img(VALUE klass)
         (void) DestroyImageInfo(info);
         dummy_img = rm_image_new(image);
-#if defined(HAVE_NEW_RB_CVAR_SET)
-        rb_cvar_set(klass, rm_ID__dummy_img_, dummy_img);
-#else
-        rb_cvar_set(klass, rm_ID__dummy_img_, dummy_img, 0);
-#endif
+        rb_cv_set(klass, DUMMY_IMG_CLASS_VAR, dummy_img);
     }
-    dummy_img = rb_cvar_get(klass, rm_ID__dummy_img_);
+    dummy_img = rb_cv_get(klass, DUMMY_IMG_CLASS_VAR);
     return dummy_img;
 }