rmagick 2.4.0 → 2.5.0

data/ext/RMagick/extconf.rb

@@ -1,7 +1,7 @@
 require "mkmf"
 require "date"
 
-RMAGICK_VERS = "2.4.0"
+RMAGICK_VERS = "2.5.0"
 MIN_RUBY_VERS = "1.8.2"
 MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
 MIN_IM_VERS = "6.3.0"
@@ -173,6 +173,7 @@ have_func("snprintf", headers)
    "ResetImagePage",                 # 6.3.3
    "ResizeQuantumMemory",            # 6.3.5-9
    "SetImageAlphaChannel",           # 6.3.6-9
+   "SetImageMask",                   # 6.3.1
    "SetImageProperty",               # 6.3.1
    "SetImageRegistry",               # 6.3.4-?
    "SyncImageProfiles",              # 6.3.2

data/ext/RMagick/rmagick.h

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.234 2008/06/02 22:47:37 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.235 2008/06/06 00:24:14 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -773,6 +773,7 @@ extern VALUE Image_adaptive_resize(int, VALUE *, VALUE);
 extern VALUE Image_adaptive_sharpen(int, VALUE *, VALUE);
 extern VALUE Image_adaptive_sharpen_channel(int, VALUE *, VALUE);
 extern VALUE Image_adaptive_threshold(int, VALUE *, VALUE);
+extern VALUE Image_add_compose_mask(VALUE, VALUE);
 extern VALUE Image_add_noise(VALUE, VALUE);
 extern VALUE Image_add_noise_channel(int, VALUE *, VALUE);
 extern VALUE Image_add_profile(VALUE, VALUE);
@@ -826,6 +827,7 @@ 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_delete_compose_mask(VALUE);
 extern VALUE Image_despeckle(VALUE);
 extern VALUE Image_destroy_bang(VALUE);
 extern VALUE Image_destroyed_q(VALUE);

data/ext/RMagick/rmimage.c

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.295 2008/06/02 22:47:37 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.297 2008/06/06 22:39:51 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -265,6 +265,53 @@ Image_adaptive_threshold(int argc, VALUE *argv, VALUE self)
     return rm_image_new(new_image);
 }
 
+
+/*
+    Method:     Image#add_compose_mask(mask)
+    Purpose:    Set the image composite mask
+    Ref:        SetImageMask
+    Notes:      Returns self
+    See also:   Image#mask(), #delete_compose_mask()
+*/
+VALUE
+Image_add_compose_mask(VALUE self, VALUE mask)
+{
+    Image *image;
+    Image *mask_image = NULL;
+
+    image = rm_check_frozen(self);
+    mask_image = rm_check_destroyed(mask);
+    if (image->columns != mask_image->columns || image->rows != mask_image->rows)
+    {
+        rb_raise(rb_eArgError, "mask must be the same size as image");
+    }
+
+    // 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.
+
+    return self;
+}
+
+
 /*
     Method:     Image#add_noise(noise_type)
     Purpose:    add random noise to a copy of the image
@@ -3314,6 +3361,36 @@ Image_decipher(VALUE self, VALUE passphrase)
 DEF_ATTR_ACCESSOR(Image, delay, ulong)
 
 
+/*
+    Method:     Image#delete_compose_mask()
+    Purpose:    Delete the image composite mask
+    Ref:        SetImageMask
+    Notes:      Returns self
+    See also:   #add_compose_mask()
+*/
+VALUE
+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
+
+    return self;
+}
+
+
 /*
     Method:     Image#delete_profile(name)
     Purpose:    call ProfileImage

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.250 2008/06/02 22:47:37 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.251 2008/06/06 00:24:14 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -474,6 +474,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "adaptive_sharpen", Image_adaptive_sharpen, -1);
     rb_define_method(Class_Image, "adaptive_sharpen_channel", Image_adaptive_sharpen_channel, -1);
     rb_define_method(Class_Image, "adaptive_threshold", Image_adaptive_threshold, -1);
+    rb_define_method(Class_Image, "add_compose_mask", Image_add_compose_mask, 1);
     rb_define_method(Class_Image, "add_noise", Image_add_noise, 1);
     rb_define_method(Class_Image, "add_noise_channel", Image_add_noise_channel, -1);
     rb_define_method(Class_Image, "add_profile", Image_add_profile, 1);
@@ -526,6 +527,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "crop!", Image_crop_bang, -1);
     rb_define_method(Class_Image, "cycle_colormap", Image_cycle_colormap, 1);
     rb_define_method(Class_Image, "decipher", Image_decipher, 1);
+    rb_define_method(Class_Image, "delete_compose_mask", Image_delete_compose_mask, 0);
     rb_define_method(Class_Image, "delete_profile", Image_delete_profile, 1);
     rb_define_method(Class_Image, "despeckle", Image_despeckle, 0);
     rb_define_method(Class_Image, "destroy!", Image_destroy_bang, 0);
@@ -1708,7 +1710,7 @@ static void version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2008/06/02 22:47:37 $) Copyright (C) 2008 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2008/06/06 00:24:14 $) Copyright (C) 2008 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
             "Web page: http://rmagick.rubyforge.org\n"

data/lib/RMagick.rb

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.69 2008/06/02 22:46:51 rmagick Exp $
+# $Id: RMagick.rb,v 1.72 2008/06/08 13:41:39 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2008 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -37,18 +37,24 @@ AspectGeometry   = GeometryValue.new(:AspectGeometry, 2).freeze
 LessGeometry     = GeometryValue.new(:LessGeometry, 3).freeze
 GreaterGeometry  = GeometryValue.new(:GreaterGeometry, 4).freeze
 AreaGeometry     = GeometryValue.new(:AreaGeometry, 5).freeze
+MinimumGeometry  = GeometryValue.new(:MinimumGeometry, 6).freeze
 
 class Geometry
-    FLAGS = ['', '%', '!', '<', '>', '@']
+    FLAGS = ['', '%', '!', '<', '>', '@', '^']
     RFLAGS = { '%' => PercentGeometry,
                '!' => AspectGeometry,
                '<' => LessGeometry,
                '>' => GreaterGeometry,
-               '@' => AreaGeometry }
+               '@' => AreaGeometry,
+               '^' => MinimumGeometry }
 
     attr_accessor :width, :height, :x, :y, :flag
 
     def initialize(width=nil, height=nil, x=nil, y=nil, flag=nil)
+        raise(ArgumentError, "width set to #{width.to_s}") if width.is_a? GeometryValue
+        raise(ArgumentError, "height set to #{height.to_s}") if height.is_a? GeometryValue
+        raise(ArgumentError, "x set to #{x.to_s}") if x.is_a? GeometryValue
+        raise(ArgumentError, "y set to #{y.to_s}") if y.is_a? GeometryValue
 
         # Support floating-point width and height arguments so Geometry
         # objects can be used to specify Image#density= arguments.
@@ -70,35 +76,57 @@ class Geometry
         @x    = x.to_i
         @y    = y.to_i
         @flag = flag
+
     end
 
     # Construct an object from a geometry string
-    RE = /\A(\d*)(?:x(\d+))?([-+]\d+)?([-+]\d+)?([%!<>@]?)\Z/
+    W = /(\d+\.\d+%?)|(\d*%?)/
+    H = W
+    X = /(?:([-+]\d+))?/
+    Y = X
+    RE = /\A#{W}x?#{H}#{X}#{Y}([!<>@\^]?)\Z/
 
     def Geometry.from_s(str)
-        Kernel.raise(ArgumentError, "no geometry string specified") unless str
 
         m = RE.match(str)
         if m
-            width  = m[1].to_i
-            height = m[2].to_i
-            x      = m[3].to_i
-            y      = m[4].to_i
-            flag   = RFLAGS[m[5]]
+            width  = (m[1] || m[2]).to_f
+            height = (m[3] || m[4]).to_f
+            x      = m[5].to_i
+            y      = m[6].to_i
+            flag   = RFLAGS[m[7]]
         else
             Kernel.raise ArgumentError, "invalid geometry format"
         end
+        if str['%']
+          flag = PercentGeometry
+        end
         Geometry.new(width, height, x, y, flag)
     end
 
     # Convert object to a geometry string
     def to_s
         str = ''
-        str << sprintf("%d", @width+0.5) if @width > 0
-        str << 'x' if (@width > 0 || @height > 0)
-        str << sprintf("%d", @height+0.5) if @height > 0
-        str << sprintf("%+d%+d", @x+0.5, @y+0.5) if (@x != 0 || @y != 0)
-        str << FLAGS[@flag.to_i]
+        if @width > 0
+          fmt = @width.truncate == @width ? "%d" : "%.2f"
+          str << sprintf(fmt, @width)
+          str << '%' if @flag == PercentGeometry
+        end
+
+        if (@width > 0 && @flag != PercentGeometry) || (@height > 0)
+          str << 'x'
+        end
+
+        if @height > 0
+          fmt = @height.truncate == @height ? "%d" : "%.2f"
+          str << sprintf(fmt, @height)
+          str << '%' if @flag == PercentGeometry
+        end
+        str << sprintf("%+d%+d", @x, @y) if (@x != 0 || @y != 0)
+        if @flag != PercentGeometry
+          str << FLAGS[@flag.to_i]
+        end
+        str
     end
 end
 

data/rmagick.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "2.4.0"
+  s.version = "2.5.0"
   s.date = Date.today.to_s
   s.summary = %q{Ruby binding to ImageMagick}
   s.description = %q{RMagick is an interface between Ruby and ImageMagick.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rmagick
 version: !ruby/object:Gem::Version 
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors: 
 - Tim Hunter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-02 00:00:00 -04:00
+date: 2008-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -358,6 +358,7 @@ files:
 - doc/ex/crop_with_gravity.rb
 - doc/ex/posterize.rb
 - doc/ex/add_noise.rb
+- doc/ex/compose_mask.rb
 - doc/ex/evenodd.rb
 - doc/ex/ViewBox.rb
 - doc/ex/Skew.rb