rmagick 2.11.1 → 2.12.0

data/ext/RMagick/rmutil.c

@@ -1,4 +1,4 @@
-/* $Id: rmutil.c,v 1.179 2009/06/03 23:08:31 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.180 2009/09/26 22:28:59 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -599,22 +599,12 @@ rm_write_temp_image(Image *image, char *temp_name)
 void
 rm_delete_temp_image(char *temp_name)
 {
-#if defined(HAVE_SETIMAGEREGISTRY)
     MagickBooleanType okay = DeleteImageRegistry(temp_name+5);
 
     if (!okay)
     {
         rb_warn("DeleteImageRegistry failed for `%s'", temp_name);
     }
-#else
-    long registry_id = -1;
-
-    sscanf(temp_name, "mpri:%ld", &registry_id);
-    if (registry_id >= 0)
-    {
-        (void) DeleteMagickRegistry(registry_id);
-    }
-#endif
 }
 
 

data/lib/RMagick.rb

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.82 2009/09/05 19:59:40 rmagick Exp $
+# $Id: RMagick.rb,v 1.84 2009/09/15 22:08:41 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2009 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -11,19 +11,21 @@
 require 'RMagick2.so'
 
 module Magick
-    @@formats = nil
+    @formats = nil
+    @trace_proc = nil
+    @exit_block_set_up = nil
 
-def Magick.formats(&block)
-    @@formats ||= Magick.init_formats
-    if block_given?
-        @@formats.each { |k,v| yield(k,v) }
-        self
-    else
-        @@formats
+class << self
+    def formats(&block)
+       @formats ||= init_formats()
+       if block_given?
+          @formats.each { |k,v| yield k, v }
+          self
+       else
+          @formats
+       end
     end
-end
 
-class << self
     # remove reference to the proc at exit
     def trace_proc=(p)
        if @trace_proc.nil? && !p.nil? && !@exit_block_set_up
@@ -371,6 +373,18 @@ class Draw
         primitive "gravity #{GRAVITY_NAMES[grav.to_i]}"
     end
 
+     # IM 6.5.5-8 and later
+     def interline_spacing(space)
+         begin
+             Float(space)
+         rescue ArgumentError
+             Kernel.raise ArgumentError, "invalid value for interline_spacing"
+         rescue TypeError
+             Kernel.raise TypeError, "can't convert #{space.class} into Float"
+         end
+         primitive "interline-spacing #{space}"
+     end
+
     # IM 6.4.8-3 and later
     def interword_spacing(space)
         begin

data/rmagick.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "2.11.1"
+  s.version = "2.12.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.}
@@ -15,6 +15,6 @@ Gem::Specification.new do |s|
   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.3.0 or later'
+  s.required_ruby_version = '>= 1.8.5'
+  s.requirements << 'ImageMagick 6.3.5 or later'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rmagick
 version: !ruby/object:Gem::Version 
-  version: 2.11.1
+  version: 2.12.0
 platform: ruby
 authors: 
 - Tim Hunter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -04:00
+date: 2009-10-04 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -390,7 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.2
+      version: 1.8.5
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -399,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
-- ImageMagick 6.3.0 or later
+- ImageMagick 6.3.5 or later
 rubyforge_project: rmagick
 rubygems_version: 1.3.5
 signing_key: