rmagick 2.0.0 → 2.1.0

data/ext/RMagick/rminfo.c

@@ -1,6 +1,6 @@
-/* $Id: rminfo.c,v 1.67 2007/10/28 23:43:24 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.70 2008/01/02 15:52:19 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2007 by Timothy P. Hunter
+|                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rminfo.c
 | Author:   Tim Hunter
 | Purpose:  Info class method definitions for RMagick.
@@ -187,8 +187,8 @@ Info_aref(int argc, VALUE *argv, VALUE self)
     switch (argc)
     {
         case 2:
-            format_p = rb_str2cstr(argv[0], &format_l);
-            key_p = rb_str2cstr(argv[1], &key_l);
+            format_p = rm_str2cstr(argv[0], &format_l);
+            key_p = rm_str2cstr(argv[1], &key_l);
             if (format_l > MAX_FORMAT_LEN || format_l + key_l > MaxTextExtent-1)
             {
                 rb_raise(rb_eArgError, "can't reference %.60s:%.1024s - too long", format_p, key_p);
@@ -246,8 +246,8 @@ Info_aset(int argc, VALUE *argv, VALUE self)
     switch (argc)
     {
         case 3:
-            format_p = rb_str2cstr(argv[0], &format_l);
-            key_p = rb_str2cstr(argv[1], &key_l);
+            format_p = rm_str2cstr(argv[0], &format_l);
+            key_p = rm_str2cstr(argv[1], &key_l);
 
             if (format_l > MAX_FORMAT_LEN || format_l+key_l > MaxTextExtent-1)
             {
@@ -331,13 +331,13 @@ Info_authenticate_eq(VALUE self, VALUE passwd)
 {
     Info *info;
     char *passwd_p = NULL;
-    long passwd_len = 0;
+    long passwd_l = 0;
 
     Data_Get_Struct(self, Info, info);
 
     if (!NIL_P(passwd))
     {
-        passwd_p = rb_str2cstr(passwd, &passwd_len);
+        passwd_p = rm_str2cstr(passwd, &passwd_l);
     }
 
     if (info->authenticate)
@@ -345,7 +345,7 @@ Info_authenticate_eq(VALUE self, VALUE passwd)
         magick_free(info->authenticate);
         info->authenticate = NULL;
     }
-    if (passwd_len > 0)
+    if (passwd_l > 0)
     {
         magick_clone_string(&info->authenticate, passwd_p);
     }
@@ -414,6 +414,25 @@ Info_border_color_eq(VALUE self, VALUE bc_arg)
 
 
 
+/*
+    Method:     Info#caption=<aString>
+    Purpose:    emulate the -caption option
+*/
+VALUE
+Info_caption(VALUE self)
+{
+    return get_option(self, "caption");
+}
+
+
+
+VALUE
+Info_caption_eq(VALUE self, VALUE caption)
+{
+    return set_option(self, "caption", caption);
+}
+
+
 /*
     Method:     Info#channel(channel [, channel...])
     Purpose:    Set the channels
@@ -524,8 +543,8 @@ Info_define(int argc, VALUE *argv, VALUE self)
             fmt_arg = rb_funcall(argv[2], rm_ID_to_s, 0);
             value = StringValuePtr(fmt_arg);
         case 2:
-            key = rb_str2cstr(argv[1], &key_l);
-            format = rb_str2cstr(argv[0], &format_l);
+            key = rm_str2cstr(argv[1], &key_l);
+            format = rm_str2cstr(argv[0], &format_l);
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 2 or 3)", argc);
@@ -1355,7 +1374,7 @@ Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
 
     if (!NIL_P(sampling_factor))
     {
-        sampling_factor_p = rb_str2cstr(sampling_factor, &sampling_factor_len);
+        sampling_factor_p = rm_str2cstr(sampling_factor, &sampling_factor_len);
     }
 
     if (info->sampling_factor)
@@ -1580,8 +1599,8 @@ Info_undefine(VALUE self, VALUE format, VALUE key)
     long format_l, key_l;
     char fkey[MaxTextExtent];
 
-    format_p = rb_str2cstr(format, &format_l);
-    key_p = rb_str2cstr(key, &key_l);
+    format_p = rm_str2cstr(format, &format_l);
+    key_p = rm_str2cstr(key, &key_l);
 
     if (format_l > MAX_FORMAT_LEN || format_l + key_l > MaxTextExtent)
     {

data/ext/RMagick/rmmain.c

@@ -1,6 +1,6 @@
-/* $Id: rmmain.c,v 1.228 2007/12/26 21:43:52 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.233 2008/01/02 23:06:29 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2007 by Timothy P. Hunter
+|                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
 | Author:   Tim Hunter
 | Purpose:  Contains all module, class, method declarations.
@@ -50,7 +50,7 @@ Magick_colors(VALUE class)
         {
             (void) rb_yield(Color_from_ColorInfo(color_info_list[x]));
         }
-        magick_free(color_info_list);
+        magick_free((void *)color_info_list);
         return class;
     }
     else
@@ -61,7 +61,7 @@ Magick_colors(VALUE class)
             (void) rb_ary_push(ary, Color_from_ColorInfo(color_info_list[x]));
         }
 
-        magick_free(color_info_list);
+        magick_free((void *)color_info_list);
         return ary;
     }
 }
@@ -90,7 +90,7 @@ Magick_fonts(VALUE class)
         {
             (void) rb_yield(Font_from_TypeInfo((TypeInfo *)type_info[x]));
         }
-        magick_free(type_info);
+        magick_free((void *)type_info);
         return class;
     }
     else
@@ -100,7 +100,7 @@ Magick_fonts(VALUE class)
         {
             (void) rb_ary_push(ary, Font_from_TypeInfo((TypeInfo *)type_info[x]));
         }
-        magick_free(type_info);
+        magick_free((void *)type_info);
         return ary;
     }
 
@@ -324,7 +324,7 @@ Init_RMagick2(void)
 {
     volatile VALUE observable;
 
-#if defined(HAVE_MagickCoreGenesis)
+#if defined(HAVE_MAGICKCOREGENESIS)
     MagickCoreGenesis("RMagick", MagickFalse);
 #else
     InitializeMagick("RMagick");
@@ -854,6 +854,7 @@ Init_RMagick2(void)
     DCL_ATTR_ACCESSOR(Info, authenticate)
     DCL_ATTR_ACCESSOR(Info, background_color)
     DCL_ATTR_ACCESSOR(Info, border_color)
+    DCL_ATTR_ACCESSOR(Info, caption)
     DCL_ATTR_ACCESSOR(Info, colorspace)
     DCL_ATTR_ACCESSOR(Info, comment)
     DCL_ATTR_ACCESSOR(Info, compression)
@@ -1630,13 +1631,6 @@ static void test_Magick_version(void)
 {
     unsigned long version_number;
     const char *version_str;
-    const char *web_site =
-#if defined(MagickHomeURL)
-    MagickHomeURL
-#else
-    MagickWebSite
-#endif
-    ;
     int x, n;
     ID bypass = rb_intern("RMAGICK_BYPASS_VERSION_TEST");
 
@@ -1659,12 +1653,8 @@ static void test_Magick_version(void)
         }
 
         rb_raise(rb_eRuntimeError,
-                 "This version of RMagick was created to run with %s %s\n"
-                 "but %.*s is installed on this system. You should either\n"
-                 "   1) Configure and build RMagick for %.*s, or\n"
-                 "   2) download %s %s from %s and install it.\n" ,
-                 MagickPackageName, MagickLibVersionText, x, version_str, x, version_str,
-                 MagickPackageName, MagickLibVersionText, web_site);
+                 "This version of RMagick was created to run with %s %s but %.*s is in use.\n" ,
+                 MagickPackageName, MagickLibVersionText, x, version_str);
     }
 
 }
@@ -1694,7 +1684,7 @@ static void version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2007/12/26 21:43:52 $) Copyright (C) 2007 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2008/01/02 23:06:29 $) Copyright (C) 2008 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
             "Web page: http://rmagick.rubyforge.org\n"

data/ext/RMagick/rmutil.c

@@ -1,6 +1,6 @@
-/* $Id: rmutil.c,v 1.138 2007/12/26 21:43:52 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.144 2008/01/03 15:32:00 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2007 by Timothy P. Hunter
+|                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmutil.c
 | Author:   Tim Hunter
 | Purpose:  Utility functions for RMagick
@@ -176,10 +176,10 @@ rm_strncasecmp(const char *s1, const char *s2, size_t n)
 void
 rm_check_ary_len(VALUE ary, long len)
 {
-    if (RARRAY(ary)->len < len)
+    if (RARRAY_LEN(ary) < len)
     {
         rb_raise(rb_eIndexError, "not enough elements in array - expecting %ld, got %ld",
-                        len, (long)RARRAY(ary)->len);
+                        len, (long)RARRAY_LEN(ary));
     }
 }
 
@@ -204,11 +204,11 @@ rm_check_destroyed(VALUE obj)
 
 
 /*
-    Extern:     rm_check_frozen_image
+    Extern:     rm_check_frozen
     Purpose:    raise an error if the image has been destroyed or is frozen
 */
 Image *
-rm_check_frozen_image(VALUE obj)
+rm_check_frozen(VALUE obj)
 {
     Image *image = rm_check_destroyed(obj);
     rb_check_frozen(obj);
@@ -227,6 +227,22 @@ rm_no_freeze(VALUE obj)
 }
 
 
+/*
+    Extern:     rm_str2cstr(str, &len);
+    Purpose:    Supply our own version of the "obsolete" rm_str2cstr.
+*/
+char *
+rm_str2cstr(VALUE str, long *len)
+{
+    StringValue(str);
+    if (len)
+    {
+        *len = RSTRING_LEN(str);
+    }
+    return RSTRING_PTR(str);
+}
+
+
 /*
  *  Static:     arg_is_number
  *  Purpose:    Try to convert the argument to a double,
@@ -570,7 +586,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     char name[MaxTextExtent];
     ExceptionInfo exception;
     ComplianceType compliance = AllCompliance;
-    unsigned int matte = False;
+    unsigned int matte = MagickFalse;
     unsigned int depth = QuantumDepth;
 
     switch (argc)
@@ -660,7 +676,7 @@ Pixel_from_HSL(VALUE class, VALUE hsl)
     memset(&rgb, 0, sizeof(rgb));
 
     hsl = rb_Array(hsl);    // Ensure array
-    if (RARRAY(hsl)->len < 3)
+    if (RARRAY_LEN(hsl) < 3)
     {
         rb_raise(rb_eArgError, "array argument must have at least 3 elements");
     }
@@ -2014,6 +2030,30 @@ Color_to_PixelPacket(PixelPacket *pp, VALUE color)
     }
 }
 
+
+/*
+    Extern:     Color_to_MagickPixelPacket
+    Purpose:    Convert either a String color name or
+                a Magick::Pixel to a MagickPixelPacket
+    Notes:      The channel values in a MagickPixelPacket are doubles.
+*/
+void
+Color_to_MagickPixelPacket(Image *image, MagickPixelPacket *mpp, VALUE color)
+{
+    PixelPacket pp;
+
+    // image can be NULL
+    GetMagickPixelPacket(image, mpp);
+
+    memset(&pp, '\0', sizeof(pp));
+    Color_to_PixelPacket(&pp, color);
+    mpp->red = pp.red;
+    mpp->green = pp.green;
+    mpp->blue = pp.blue;
+    mpp->opacity = pp.opacity;
+}
+
+
 /*
     Extern:     PrimaryInfo_from_PrimaryInfo(pp)
     Purpose:    Create a Magick::PrimaryInfo object from a PrimaryInfo structure.
@@ -2749,7 +2789,7 @@ static VALUE Enum_type_values(VALUE class)
 
     if (rb_block_given_p())
     {
-        for (x = 0; x < RARRAY(enumerators)->len; x++)
+        for (x = 0; x < RARRAY_LEN(enumerators); x++)
         {
             (void) rb_yield(rb_ary_entry(enumerators, x));
         }
@@ -2757,8 +2797,8 @@ static VALUE Enum_type_values(VALUE class)
     }
     else
     {
-        copy = rb_ary_new2(RARRAY(enumerators)->len);
-        for (x = 0; x < RARRAY(enumerators)->len; x++)
+        copy = rb_ary_new2(RARRAY_LEN(enumerators));
+        for (x = 0; x < RARRAY_LEN(enumerators); x++)
         {
             (void) rb_ary_push(copy, rb_ary_entry(enumerators, x));
         }

data/lib/RMagick.rb

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.62 2007/12/21 23:24:20 rmagick Exp $
+# $Id: RMagick.rb,v 1.64 2008/01/05 22:21:52 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2007 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -750,21 +750,6 @@ class Image
         self
     end
 
-    # Force an image to exact dimensions without changing the aspect ratio.
-    # Resize and crop if necessary. (Thanks to Jerett Taylor!)
-    def crop_resized(ncols, nrows, gravity=CenterGravity)
-        copy.crop_resized!(ncols, nrows, gravity)
-    end
-
-    def crop_resized!(ncols, nrows, gravity=CenterGravity)
-        if ncols != columns || nrows != rows
-            scale = [ncols/columns.to_f, nrows/rows.to_f].max
-            resize!(scale*columns+0.5, scale*rows+0.5)
-        end
-        crop!(gravity, ncols, nrows, true) if ncols != columns || nrows != rows
-        self
-    end
-
     # Used by ImageList methods - see ImageList#cur_image
     def cur_image
         self
@@ -927,15 +912,37 @@ class Image
         resize(width, height)
     end
 
+    # Force an image to exact dimensions without changing the aspect ratio.
+    # Resize and crop if necessary. (Thanks to Jerett Taylor!)
+    def resize_to_fill(ncols, nrows=nil, gravity=CenterGravity)
+        copy.crop_resized!(ncols, nrows, gravity)
+    end
+
+    def resize_to_fill!(ncols, nrows=nil, gravity=CenterGravity)
+        nrows ||= ncols
+        if ncols != columns || nrows != rows
+            scale = [ncols/columns.to_f, nrows/rows.to_f].max
+            resize!(scale*columns+0.5, scale*rows+0.5)
+        end
+        crop!(gravity, ncols, nrows, true) if ncols != columns || nrows != rows
+        self
+    end
+
+    # Preserve aliases used < RMagick 2.0.1
+    alias_method :crop_resized, :resize_to_fill
+    alias_method :crop_resized!, :resize_to_fill!
+
     # Convenience method to resize retaining the aspect ratio.
     # (Thanks to Robert Manni!)
-    def resize_to_fit(cols, rows)
+    def resize_to_fit(cols, rows=nil)
+        rows ||= cols
         change_geometry(Geometry.new(cols, rows)) do |ncols, nrows|
             resize(ncols, nrows)
         end
     end
 
-    def resize_to_fit!(cols, rows)
+    def resize_to_fit!(cols, rows=nil)
+        rows ||= cols
         change_geometry(Geometry.new(cols, rows)) do |ncols, nrows|
             resize!(ncols, nrows)
         end

data/post-clean.rb

@@ -2,11 +2,11 @@
 # doc/*.rb.html
 # doc/ex/* (!rb)
 # Bug #246: Don't use chdir!
-require 'ftools'
+require 'fileutils'
 
 targets = Dir['doc/*.rb.html']
-File.safe_unlink(*targets) unless targets.empty?
+FileUtils.safe_unlink(targets) unless targets.empty?
 
 targets = Dir['doc/ex/*']
 targets.delete_if { |entry| File.directory?(entry) || %r{\.rb\z}.match(entry) }
-File.safe_unlink(*targets) unless targets.empty?
+FileUtils.safe_unlink(targets) unless targets.empty?

data/post-install.rb

@@ -1,6 +1,6 @@
 # install RMagick documentation
 
-require 'ftools'
+require 'fileutils'
 require 'find'
 
 if defined?(Installer) && self.class == Installer
@@ -33,13 +33,12 @@ if BUILD_HTMLDOC
         next if FileTest.directory? file
         target = file.sub(/^doc\//,docdir())
         unless FileTest.exists? File.dirname(target)
-            File.makedirs(File.dirname(target), true)
+            FileUtils.mkdir_p(File.dirname(target), :verbose => true)
             # Mark this directory as one we created so
             # that uninstall.rb knows it's okay to delete
-            f = File.new("#{File.dirname(target)}/.rmagick", "w")
-            f.close
+            FileUtils.touch("#{File.dirname(target)}/.rmagick")
         end
-        File.install(file, target, 0644)
+        FileUtils.install(file, target, :mode => 0644)
     end
 
 else

data/rmagick.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "2.0.0"
+  s.version = "2.1.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.}
@@ -9,10 +9,12 @@ Gem::Specification.new do |s|
   s.email = %q{rmagick@rubyforge.org}
   s.homepage = %q{http://rubyforge.org/projects/rmagick}
   s.files = Dir.glob('**/*')
-  s.require_paths = %w{lib .}
+  s.bindir = 'bin'
+  s.executables = Dir.glob('bin/*').collect {|f| File.basename(f)}
+  s.require_paths << 'ext'
   s.rubyforge_project = %q{rmagick}
   s.extensions = %w{ext/RMagick/extconf.rb}
   s.has_rdoc = false
   s.required_ruby_version = '>= 1.8.2'
-  s.requirements << 'ImageMagick 6.2.6 or later'
+  s.requirements << 'ImageMagick 6.3.0 or later'
 end