rmagick 1.8.3 → 1.9.0

data/ext/RMagick/rmutil.c

@@ -1,4 +1,4 @@
-/* $Id: rmutil.c,v 1.51 2005/03/05 16:18:39 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.53 2005/06/21 22:55:01 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -2760,9 +2760,40 @@ void rm_handle_all_errors(Image *seq)
     }
 }
 
+/*
+    Extern:     rm_progress_monitor
+    Purpose:    SetImage(Info)ProgressMonitor exit
+    Notes:      ImageMagick's "tag" argument is unused. We pass along the method name instead.
+*/
+#if defined(HAVE_SETIMAGEPROGRESSMONITOR)
+MagickBooleanType rm_progress_monitor(
+    const char *tag,
+    const MagickOffsetType of,
+    const MagickSizeType sp,
+    void *client_data)
+{
+    volatile VALUE rval;
+    volatile VALUE method, offset, span;
+
+#if defined(HAVE_LONG_LONG)     // defined in Ruby's defines.h
+    offset = rb_ll2inum(of);
+    span = rb_ull2inum(sp);
+#else
+    offset = rb_int2big((long)of);
+    span = rb_uint2big((unsigned long)sp);
+#endif
+
+    method = rb_str_new2(rb_id2name(rb_frame_last_func()));
+
+    rval = rb_funcall((VALUE)client_data, ID_call, 3, method, offset, span);
+
+    return RTEST(rval) ? MagickTrue : MagickFalse;
+}
+#endif
+
 
 /*
-    Extern:     unseq
+    Extern:     rm_split
     Purpose:    Remove the ImageMagick links between images in an scene
                 sequence.
     Notes:      The images remain grouped via the ImageList

data/lib/RMagick.rb

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.23 2005/03/05 16:19:10 rmagick Exp $
+# $Id: RMagick.rb,v 1.25 2005/07/12 23:34:04 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2005 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -163,6 +163,17 @@ class Draw
         ObliqueStyle.to_i => 'oblique',
         AnyStyle.to_i => 'all'
         }
+        
+  private
+    def enquote(str)
+        if str.length > 2 && /\A(?:\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})\z/.match(str)
+        	return str
+        else
+        	return '"' + str + '"'
+        end
+    end
+
+  public
 
     # Apply coordinate transformations to support scaling (s), rotation (r),
     # and translation (t). Angles are specified in radians.
@@ -227,7 +238,7 @@ class Draw
         if ( DECORATION_TYPE_NAMES.has_key?(decoration.to_i) )
             primitive "decorate #{DECORATION_TYPE_NAMES[decoration.to_i]}"
         else
-            primitive "decorate #{decoration}"
+            primitive "decorate #{enquote(decoration)}"
         end
     end
 
@@ -263,7 +274,7 @@ class Draw
 
     # Specify object fill, a color name or pattern name
     def fill(colorspec)
-        primitive "fill #{colorspec}"
+        primitive "fill #{enquote(colorspec)}"
     end
     alias fill_color fill
     alias fill_pattern fill
@@ -463,7 +474,7 @@ class Draw
 
     # Specify the object stroke, a color name or pattern name.
     def stroke(colorspec)
-        primitive "stroke #{colorspec}"
+        primitive "stroke #{enquote(colorspec)}"
     end
     alias stroke_color stroke
     alias stroke_pattern stroke
@@ -525,13 +536,23 @@ class Draw
         primitive "stroke-width #{pixels}"
     end
 
-    # Draw text at position x,y. Generally it's best to surround the text with
-    # quotes. For example,
-    #      gc.text(100, 100, "'embedded blanks'")
+    # Draw text at position x,y. Add quotes to text that is not already quoted.
     def text(x, y, text)
         if text.to_s.empty?
             raise ArgumentError, "missing text argument"
-        end
+        end		
+		if text.length > 2 && /\A(?:\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})\z/.match(text)
+			; # text already quoted
+		elsif !text['\'']
+			text = '\''+text+'\''
+		elsif !text['"']
+			text = '"'+text+'"'
+		elsif !(text['{'] || text['}'])
+			text = '{'+text+'}'
+		else
+			# escape existing braces, surround with braces			
+			text = '{' +  text.gsub(/[}]/) { |b| '\\' + b } + '}'
+		end
         primitive "text #{x},#{y} #{text}"
     end
 
@@ -559,7 +580,7 @@ class Draw
 
     # Specify color underneath text
     def text_undercolor(color)
-        primitive "text-undercolor #{color}"
+        primitive "text-undercolor #{enquote(color)}"
     end
 
     # Specify center of coordinate space to use for subsequent drawing

data/lib/rvg/embellishable.rb

@@ -1,5 +1,5 @@
 #--
-# $Id: embellishable.rb,v 1.4 2005/05/22 22:31:30 rmagick Exp $
+# $Id: embellishable.rb,v 1.5 2005/07/15 20:48:50 rmagick Exp $
 # Copyright (C) 2005 Timothy P. Hunter
 #++
 
@@ -28,7 +28,7 @@ class Magick::RVG
         # Use the RVG::ShapeConstructors#circle method to create Circle objects in a container.
         def initialize(r, cx=0, cy=0)
             super()
-            r, cx, cy = RVG.convert_to_float(r, cx, cy)
+            r, cx, cy = Magick::RVG.convert_to_float(r, cx, cy)
             if r < 0
                 raise ArgumentError, "radius must be >= 0 (#{r} given)"
             end
@@ -46,7 +46,7 @@ class Magick::RVG
         # Use the RVG::ShapeConstructors#ellipse method to create Ellipse objects in a container.
         def initialize(rx, ry, cx=0, cy=0)
             super()
-            rx, ry, cx, cy = RVG.convert_to_float(rx, ry, cx, cy)
+            rx, ry, cx, cy = Magick::RVG.convert_to_float(rx, ry, cx, cy)
             if rx < 0 || ry < 0
                 raise ArgumentError, "radii must be >= 0 (#{rx}, #{ry} given)"
             end
@@ -89,7 +89,7 @@ class Magick::RVG
         # Use the RVG::ShapeConstructors#rect method to create Rect objects in a container.
         def initialize(width, height, x=0, y=0)
             super()
-            width, height, x, y = RVG.convert_to_float(width, height, x, y)
+            width, height, x, y = Magick::RVG.convert_to_float(width, height, x, y)
             if width < 0 || height < 0
                 raise ArgumentError, "width, height must be >= 0 (#{width}, #{height} given)"
             end
@@ -100,7 +100,7 @@ class Magick::RVG
         # Specify optional rounded corners for a rectangle. The arguments
         # are the x- and y-axis radii. If y is omitted it defaults to x.
         def round(rx, ry=nil)
-            rx, ry = RVG.convert_to_float(rx, ry || rx)
+            rx, ry = Magick::RVG.convert_to_float(rx, ry || rx)
             if rx < 0 || ry < 0
                 raise ArgumentError, "rx, ry must be >= 0 (#{rx}, #{ry} given)"
             end
@@ -133,7 +133,7 @@ class Magick::RVG
             if n < 4 || n % 2 != 0
                 raise ArgumentError, "insufficient/odd number of points specified: #{n}"
             end
-            return RVG.convert_to_float(*points)
+            return Magick::RVG.convert_to_float(*points)
         end
 
     end     # class PolyShape
@@ -164,7 +164,7 @@ class Magick::RVG
             super()
             points = polypoints(points)
             @primitive = :polyline
-            @args = RVG.convert_to_float(*points)
+            @args = Magick::RVG.convert_to_float(*points)
         end
 
     end     # class Polyline
@@ -236,7 +236,7 @@ class Magick::RVG
         def initialize(image, width=nil, height=nil, x=0, y=0)
             super()             # run module initializers
             @image = image.copy # use a copy of the image in case app. re-uses the argument
-            @x, @y, @width, @height = RVG.convert_to_float(x, y, width || @image.columns, height || @image.rows)
+            @x, @y, @width, @height = Magick::RVG.convert_to_float(x, y, width || @image.columns, height || @image.rows)
             if @width < 0 || @height < 0
                 raise ArgumentError, "width, height must be >= 0"
             end
@@ -353,7 +353,7 @@ class Magick::RVG
         # contained within, unless overridden by an inner container or
         # the contained object itself.
         def rvg(cols, rows, x=0, y=0, &block)
-            rvg = RVG.new(cols, rows, &block)
+            rvg = Magick::RVG.new(cols, rows, &block)
             begin
                 x, y = Float(x), Float(y)
             rescue ArgumentError

data/lib/rvg/misc.rb

@@ -1,4 +1,4 @@
-# $Id: misc.rb,v 1.5 2005/05/22 22:31:30 rmagick Exp $
+# $Id: misc.rb,v 1.8 2005/07/15 20:48:50 rmagick Exp $
 # Copyright (C) 2005 Timothy P. Hunter
 class Magick::RVG
 
@@ -95,8 +95,8 @@ module Magick::RVG::Utility
             end
 
             # escape existing braces, surround with braces
-            text.gsub!(/([\{}])/) { |b| '\\' + b }
-            return '{' +  @text + '}'
+			text.gsub!(/[}]/) { |b| '\\' + b }
+            return '{' +  text + '}'
         end
 
         def glyph_metrics(glyph_orientation, glyph)
@@ -343,7 +343,7 @@ module Magick::RVG::Utility
 
         def initialize()
             @affine = Array.new
-            @affine << AffineMatrix.new(1, 0, 0, 1, 0, 0)
+            @affine << Magick::AffineMatrix.new(1, 0, 0, 1, 0, 0)
             @baseline_shift = Array.new
             @baseline_shift << :baseline
             @glyph_orientation_horizontal = Array.new
@@ -526,9 +526,9 @@ module Magick::RVG::Utility
         attr_reader :gc, :text_attrs
 
         def initialize()
-            @gc = Draw.new
+            @gc = Magick::Draw.new
             @shadow = Array.new
-            @shadow << Draw.new
+            @shadow << Magick::Draw.new
             @text_attrs = TextAttributes.new
             init_matrix()
         end
@@ -538,7 +538,7 @@ module Magick::RVG::Utility
         end
 
         def affine(sx, rx, ry, sy, tx, ty)
-            sx, rx, ry, sy, tx, ty = RVG.convert_to_float(sx, rx, ry, sy, tx, ty)
+            sx, rx, ry, sy, tx, ty = Magick::RVG.convert_to_float(sx, rx, ry, sy, tx, ty)
             @gc.affine(sx, rx, ry, sy, tx, ty)
             @text_attrs.set_affine(sx, rx, ry, sy, tx, ty)
             nil
@@ -597,13 +597,13 @@ module Magick::RVG::Utility
         end
 
         def glyph_orientation_horizontal(deg)
-            deg = RVG.convert_one_to_float(deg)
+            deg = Magick::RVG.convert_one_to_float(deg)
             @text_attrs.glyph_orientation_horizontal = (deg % 360) / 90 * 90
             nil
         end
 
         def glyph_orientation_vertical(deg)
-            deg = RVG.convert_one_to_float(deg)
+            deg = Magick::RVG.convert_one_to_float(deg)
             @text_attrs.glyph_orientation_vertical = (deg % 360) / 90 * 90
             nil
         end
@@ -613,7 +613,7 @@ module Magick::RVG::Utility
         end
 
         def letter_spacing(value)
-            @text_attrs.letter_spacing = RVG.convert_one_to_float(value)
+            @text_attrs.letter_spacing = Magick::RVG.convert_one_to_float(value)
             nil
         end
 
@@ -632,7 +632,7 @@ module Magick::RVG::Utility
         end
 
         def rotate(degrees)
-            degrees = RVG.convert_one_to_float(degrees)
+            degrees = Magick::RVG.convert_one_to_float(degrees)
             @gc.rotate(degrees)
             @sx =  Math.cos(GraphicContext.degrees_to_radians(degrees))
             @rx =  Math.sin(GraphicContext.degrees_to_radians(degrees))
@@ -643,7 +643,7 @@ module Magick::RVG::Utility
         end
 
         def scale(sx, sy)
-            sx, sy = RVG.convert_to_float(sx, sy)
+            sx, sy = Magick::RVG.convert_to_float(sx, sy)
             @gc.scale(sx, sy)
             @sx, @sy = sx, sy
             concat_matrix()
@@ -655,7 +655,7 @@ module Magick::RVG::Utility
         end
 
         def skewX(degrees)
-            degrees = RVG.convert_one_to_float(degrees)
+            degrees = Magick::RVG.convert_one_to_float(degrees)
             @gc.skewX(degrees)
             @ry = Math.tan(GraphicContext.degrees_to_radians(degrees))
             concat_matrix()
@@ -663,7 +663,7 @@ module Magick::RVG::Utility
         end
 
         def skewY(degrees)
-            degrees = RVG.convert_one_to_float(degrees)
+            degrees = Magick::RVG.convert_one_to_float(degrees)
             @gc.skewY(degrees)
             @rx = Math.tan(GraphicContext.degrees_to_radians(degrees))
             concat_matrix()
@@ -671,7 +671,7 @@ module Magick::RVG::Utility
         end
 
         def stroke_width(width)
-            width = RVG.convert_one_to_float(width)
+            width = Magick::RVG.convert_one_to_float(width)
             @gc.stroke_width(width)
             @shadow[-1].stroke_width = width
             nil
@@ -706,7 +706,7 @@ module Magick::RVG::Utility
         end
 
         def translate(tx, ty)
-            tx, ty = RVG.convert_to_float(tx, ty)
+            tx, ty = Magick::RVG.convert_to_float(tx, ty)
             @gc.translate(tx, ty)
             @tx, @ty = tx, ty
             concat_matrix()
@@ -714,7 +714,7 @@ module Magick::RVG::Utility
         end
 
         def word_spacing(value)
-            @text_attrs.word_spacing = RVG.convert_one_to_float(value)
+            @text_attrs.word_spacing = Magick::RVG.convert_one_to_float(value)
             nil
         end
 

data/lib/rvg/paint.rb

@@ -1,5 +1,5 @@
 #--
-# $Id: paint.rb,v 1.1 2005/03/12 17:02:00 rmagick Exp $
+# $Id: paint.rb,v 1.2 2005/07/15 20:48:50 rmagick Exp $
 # Copyright (C) 2005 Timothy P. Hunter
 #++
 # Defines paint server classes.
@@ -28,7 +28,7 @@ class Magick::RVG
         # referring to them with #use.
         def initialize(width=0, height=0, x=0, y=0)
             super()
-            @width, @height, @x, @y = RVG.convert_to_float(width, height, x, y)
+            @width, @height, @x, @y = Magick::RVG.convert_to_float(width, height, x, y)
             @content = Content.new
             yield(self) if block_given?
         end

data/lib/rvg/rvg.rb

@@ -1,5 +1,5 @@
 #--############################################################################
-# $Id: rvg.rb,v 1.3 2005/04/19 23:27:01 rmagick Exp $
+# $Id: rvg.rb,v 1.5 2005/07/15 21:11:38 rmagick Exp $
 #
 #                    Copyright (C) 2005 by Timothy P. Hunter
 #
@@ -61,32 +61,32 @@ class Magick::RVG
     # else, combine it with the background_fill_opacity.
     def bgfill()
         if @background_fill.nil?
-            color = Pixel.new(0,0,0,TransparentOpacity)
+            color = Magick::Pixel.new(0,0,0,Magick::TransparentOpacity)
         else
             color = @background_fill
-            color.opacity = (1.0 - @background_fill_opacity) * ::Magick::TransparentOpacity
+            color.opacity = (1.0 - @background_fill_opacity) * Magick::TransparentOpacity
         end
         return color
     end
 
     def new_canvas
         if @background_pattern
-            canvas = ::Magick::Image.new(@width, @height, @background_pattern)
+            canvas = Magick::Image.new(@width, @height, @background_pattern)
         elsif @background_image
             if @width != @background_image.columns || @height != @background_image.rows
                 canvas = case @background_position
                     when :scaled
                         @background_image.resize(@width, @height)
                     when :tiled
-                        ::Magick::Image.new(@width, @height, TextureFill.new(@background_image))
+                        Magick::Image.new(@width, @height, Magick::TextureFill.new(@background_image))
                     when :fit
                         width, height = @width, @height
                         bgcolor = bgfill()
-                        @background_image.change_geometry(Geometry.new(width, height)) do |new_cols, new_rows|
+                        @background_image.change_geometry(Magick::Geometry.new(width, height)) do |new_cols, new_rows|
                             bg_image = @background_image.resize(new_cols, new_rows)
                             if bg_image.columns != width || bg_image.rows != height
-                                bg = ::Magick::Image.new(width, height) { self.background_color = bgcolor }
-                                bg_image = bg.composite!(bg_image, CenterGravity, OverCompositeOp)
+                                bg = Magick::Image.new(width, height) { self.background_color = bgcolor }
+                                bg_image = bg.composite!(bg_image, Magick::CenterGravity, Magick::OverCompositeOp)
                             end
                             bg_image
                         end
@@ -96,7 +96,7 @@ class Magick::RVG
             end
         else
             bgcolor = bgfill()
-            canvas = ::Magick::Image.new(Integer(@width), Integer(@height)) { self.background_color = bgcolor }
+            canvas = Magick::Image.new(Integer(@width), Integer(@height)) { self.background_color = bgcolor }
         end
         canvas[:desc] = @desc if @desc
         canvas[:title] = @title if @title
@@ -139,7 +139,7 @@ class Magick::RVG
     # Sets an image to use as the canvas background. See background_position= for layout options.
     def background_image=(bg_image)
         warn "background_image= has no effect in nested RVG objects" if @nested
-        if bg_image && ! bg_image.kind_of?(::Magick::Image)
+        if bg_image && ! bg_image.kind_of?(Magick::Image)
             raise ArgumentError, "background image must be an Image (got #{bg_image.class})"
         end
         @background_image = bg_image
@@ -172,9 +172,9 @@ class Magick::RVG
     # The default fill is "none", that is, transparent black.
     def background_fill=(color)
         warn "background_fill= has no effect in nested RVG objects" if @nested
-        if ! color.kind_of?(Pixel)
+        if ! color.kind_of?(Magick::Pixel)
             begin
-                @background_fill = Pixel.from_color(color)
+                @background_fill = Magick::Pixel.from_color(color)
             rescue Magick::ImageMagickError
                 raise ArgumentError, "unknown color `#{color}'"
             rescue TypeError
@@ -247,7 +247,7 @@ class Magick::RVG
         @height = rh if rh
     end
 
-    # Used by ::Magick::Embellishable.rvg to set non-0 x- and y-coordinates
+    # Used by Magick::Embellishable.rvg to set non-0 x- and y-coordinates
     def corner(x, y)        #:nodoc:
         @nested = true
         @x, @y = Float(x), Float(y)

data/lib/rvg/text.rb

@@ -1,5 +1,5 @@
 #--
-# $Id: text.rb,v 1.2 2005/04/23 15:29:47 rmagick Exp $
+# $Id: text.rb,v 1.3 2005/07/15 20:48:50 rmagick Exp $
 # Copyright (C) 2005 Timothy P. Hunter
 #++
 # Text-related classes
@@ -36,14 +36,14 @@ class Magick::RVG
 
         # Add <tt>x</tt> and <tt>y</tt> to the current text position.
         def d(x, y=0)
-            @dx, @dy = RVG.convert_to_float(x, y)
+            @dx, @dy = Magick::RVG.convert_to_float(x, y)
             yield(self) if block_given?
             self
         end
 
         # Rotate the text about the current text position.
         def rotate(degrees)
-            @rotation = RVG.convert_to_float(degrees)[0]
+            @rotation = Magick::RVG.convert_to_float(degrees)[0]
             yield(self) if block_given?
             self
         end
@@ -106,7 +106,7 @@ class Magick::RVG
         include TextLink
 
         def initialize(obj, x, y, parent)
-            @x, @y = RVG.convert_to_float(x, y, :allow_nil)
+            @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
             super(nil)
             @tspans << obj
             @parent = parent
@@ -125,7 +125,7 @@ class Magick::RVG
         #
         # Tspan objects can contain Tspan objects.
         def initialize(text=nil, x=nil, y=nil, &block)
-            @x, @y = RVG.convert_to_float(x, y, :allow_nil)
+            @x, @y = Magick::RVG.convert_to_float(x, y, :allow_nil)
             super(text, &block)
         end
 
@@ -147,7 +147,7 @@ class Magick::RVG
         #     t.tspan("Blue text").styles(:fill=>'blue')
         #  end
         def initialize(x=0, y=0, text=nil, &block)
-            @cx, @cy = RVG.convert_to_float(x, y)
+            @cx, @cy = Magick::RVG.convert_to_float(x, y)
             super(text, &block)
         end