rmagick 1.9.0 → 1.9.1

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.90 2005/06/19 20:26:34 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.95 2005/09/07 21:51:45 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -691,7 +691,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "grey?", Image_gray_q, 0);
     rb_define_method(Class_Image, "grayscale_pseudo_class", Image_grayscale_pseudo_class, -1);
     rb_define_method(Class_Image, "implode", Image_implode, -1);
-    rb_define_method(Class_Image, "import_pixels", Image_import_pixels, 6);
+    rb_define_method(Class_Image, "import_pixels", Image_import_pixels, -1);
     rb_define_method(Class_Image, "initialize_copy", Image_init_copy, 1);
     rb_define_method(Class_Image, "inspect", Image_inspect, 0);
     rb_define_method(Class_Image, "level", Image_level, -1);
@@ -784,7 +784,7 @@ Init_RMagick(void)
     rb_define_alias(Class_ImageList, "__display__", "display");
 
     // Define an alias for Array's "map" method.
-    rb_define_alias(Class_ImageList, "__map__", "map");
+    rb_define_alias(Class_ImageList, "__ary_map__", "map");
 
     rb_define_method(Class_ImageList, "animate", ImageList_animate, -1);
     rb_define_method(Class_ImageList, "append", ImageList_append, 1);
@@ -1077,6 +1077,9 @@ Init_RMagick(void)
 #if defined(HAVE_INDEXCHANNEL)
         ENUMERATOR(IndexChannel)    // 5.5.8
 #endif
+#if defined(HAVE_GRAYCHANNEL)
+        ENUMERATOR(GrayChannel)
+#endif
 #if defined(HAVE_ALLCHANNELS)
         ENUMERATOR(AllChannels)
 #endif
@@ -1195,6 +1198,8 @@ Init_RMagick(void)
         ENUMERATOR(XorCompositeOp)
 
 #if defined(HAVE_COLORDODGECOMPOSITEOP)
+        ENUMERATOR(BlendCompositeOp)
+        ENUMERATOR(ColorBurnCompositeOp)
         ENUMERATOR(ColorDodgeCompositeOp)
         ENUMERATOR(ExclusionCompositeOp)
         ENUMERATOR(HardLightCompositeOp)
@@ -1215,7 +1220,8 @@ Init_RMagick(void)
 #endif
         ENUMERATOR(LosslessJPEGCompression)
         ENUMERATOR(LZWCompression)
-        ENUMERATOR(RunlengthEncodedCompression)
+        ENUMERATOR(RLECompression)              // preferred
+        ENUMERATOR(RunlengthEncodedCompression) // deprecated
         ENUMERATOR(ZipCompression)
     END_ENUM
 
@@ -1419,6 +1425,20 @@ Init_RMagick(void)
         ENUMERATOR(PixelsPerCentimeterResolution)
     END_ENUM
 
+    // StorageType
+    DEF_ENUM(StorageType)
+        ENUMERATOR(UndefinedPixel)
+        ENUMERATOR(CharPixel)
+        ENUMERATOR(DoublePixel)
+        ENUMERATOR(FloatPixel)
+        ENUMERATOR(IntegerPixel)
+        ENUMERATOR(LongPixel)
+#if defined(HAVE_QUANTUMPIXEL)
+        ENUMERATOR(QuantumPixel)
+#endif
+        ENUMERATOR(ShortPixel)
+    END_ENUM
+
     // StretchType constants
     DEF_ENUM(StretchType)
         ENUMERATOR(NormalStretch)
@@ -1538,7 +1558,7 @@ static void version_constants(void)
 
     rb_define_const(Module_Magick, "Version", rb_str_new2(PACKAGE_STRING));
     sprintf(long_version,
-        "This is %s ($Date: 2005/06/19 20:26:34 $) Copyright (C) 2005 by Timothy P. Hunter\n"
+        "This is %s ($Date: 2005/09/07 21:51:45 $) Copyright (C) 2005 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,4 +1,4 @@
-/* $Id: rmutil.c,v 1.53 2005/06/21 22:55:01 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.57 2005/09/07 21:51:45 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2005 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -11,7 +11,7 @@
 
 static const char *Compliance_Const_Name(ComplianceType *);
 static const char *StyleType_Const_Name(StyleType);
-static const char *StretchType_Const_Name(StretchType);
+static const char *StretchType_name(StretchType);
 static void Color_Name_to_PixelPacket(PixelPacket *, VALUE);
 static VALUE Enum_type_values(VALUE);
 static VALUE Enum_type_inspect(VALUE);
@@ -191,7 +191,7 @@ arg_is_number(VALUE arg)
 static VALUE
 rescue_not_str(VALUE arg)
 {
-    rb_raise(rb_eArgError, "argument must be a number or a string in the form 'NN%' (%s given)",
+    rb_raise(rb_eTypeError, "argument must be a number or a string in the form 'NN%' (%s given)",
             rb_class2name(CLASS_OF(arg)));
 }
 
@@ -1074,6 +1074,193 @@ ComplianceType_new(ComplianceType compliance)
     return rm_enum_new(Class_ComplianceType, ID2SYM(rb_intern(name)), INT2FIX(compliance));
 }
 
+
+/*
+   External:    CompositeOperator_new
+   Purpose:     Construct a CompositeOperator enum object for the specified value
+*/
+VALUE
+CompositeOperator_new(CompositeOperator op)
+{
+    const char *name;
+
+    switch (op)
+    {
+        default:
+        case UndefinedCompositeOp:
+            name = "UndefinedCompositeOp";
+            break;
+        case NoCompositeOp:
+            name = "NoCompositeOp";
+            break;
+        case AddCompositeOp:
+            name = "AddCompositeOp";
+            break;
+        case AtopCompositeOp:
+            name = "AtopCompositeOp";
+            break;
+        case BumpmapCompositeOp:
+            name = "BumpmapCompositeOp";
+            break;
+        case ClearCompositeOp:
+            name = "ClearCompositeOp";
+            break;
+#if defined(HAVE_COLORDODGECOMPOSITEOP)
+        case ColorBurnCompositeOp:
+            name = "ColorBurnCompositeOp";
+            break;
+        case BlendCompositeOp:
+            name = "BlendCompositeOp";
+            break;
+        case ColorDodgeCompositeOp:
+            name = "ColorDodgeCompositeOp";
+            break;
+        case ExclusionCompositeOp:
+            name = "ExclusionCompositeOp";
+            break;
+        case HardLightCompositeOp:
+            name = "HardLightCompositeOp";
+            break;
+        case SoftLightCompositeOp:
+            name = "SoftLightCompositeOp";
+            break;
+#endif
+        case ColorizeCompositeOp:
+            name = "ColorizeCompositeOp";
+            break;
+        case CopyBlueCompositeOp:
+            name = "CopyBlueCompositeOp";
+            break;
+        case CopyCompositeOp:
+            name = "CopyCompositeOp";
+            break;
+#if defined(HAVE_COPYCYANCOMPOSITEOP)   // CYMK added 5.5.7
+        case CopyCyanCompositeOp:
+            name = "CopyCyanCompositeOp";
+            break;
+        case CopyMagentaCompositeOp:
+            name = "CopyMagentaCompositeOp";
+            break;
+        case CopyYellowCompositeOp:
+            name = "CopyYellowCompositeOp";
+            break;
+        case CopyBlackCompositeOp:
+            name = "CopyBlackCompositeOp";
+            break;
+#endif
+        case CopyGreenCompositeOp:
+            name = "CopyGreenCompositeOp";
+            break;
+        case CopyOpacityCompositeOp:
+            name = "CopyOpacityCompositeOp";
+            break;
+        case CopyRedCompositeOp:
+            name = "CopyRedCompositeOp";
+            break;
+        case DarkenCompositeOp:
+            name = "DarkenCompositeOp";
+            break;
+#if defined(HAVE_DSTCOMPOSITEOP)
+        case DstAtopCompositeOp:
+            name = "DstAtopCompositeOp";
+            break;
+        case DstCompositeOp:
+            name = "DstCompositeOp";
+            break;
+        case DstInCompositeOp:
+            name = "DstInCompositeOp";
+            break;
+        case DstOutCompositeOp:
+            name = "DstOutCompositeOp";
+            break;
+        case DstOverCompositeOp:
+            name = "DstOverCompositeOp";
+            break;
+#endif
+        case DifferenceCompositeOp:
+            name = "DifferenceCompositeOp";
+            break;
+        case DisplaceCompositeOp:
+            name = "DisplaceCompositeOp";
+            break;
+        case DissolveCompositeOp:
+            name = "DissolveCompositeOp";
+            break;
+        case HueCompositeOp:
+            name = "HueCompositeOp";
+            break;
+        case InCompositeOp:
+            name = "InCompositeOp";
+            break;
+        case LightenCompositeOp:
+            name = "LightenCompositeOp";
+            break;
+        case LuminizeCompositeOp:
+            name = "LuminizeCompositeOp";
+            break;
+        case MinusCompositeOp:
+            name = "MinusCompositeOp";
+            break;
+        case ModulateCompositeOp:
+            name = "ModulateCompositeOp";
+            break;
+        case MultiplyCompositeOp:
+            name = "MultiplyCompositeOp";
+            break;
+        case OutCompositeOp:
+            name = "OutCompositeOp";
+            break;
+        case OverCompositeOp:
+            name = "OverCompositeOp";
+            break;
+        case OverlayCompositeOp:
+            name = "OverlayCompositeOp";
+            break;
+        case PlusCompositeOp:
+            name = "PlusCompositeOp";
+            break;
+#if defined(HAVE_REPLACECOMPOSITEOP)    // Added 5.5.8
+        case ReplaceCompositeOp:
+            name = "ReplaceCompositeOp";
+            break;
+#endif
+        case SaturateCompositeOp:
+            name = "SaturateCompositeOp";
+            break;
+        case ScreenCompositeOp:
+            name = "ScreenCompositeOp";
+            break;
+#if defined(HAVE_DSTCOMPOSITEOP)
+        case SrcAtopCompositeOp:
+            name = "SrcAtopCompositeOp";
+            break;
+        case SrcCompositeOp:
+            name = "SrcCompositeOp";
+            break;
+        case SrcInCompositeOp:
+            name = "SrcInCompositeOp";
+            break;
+        case SrcOutCompositeOp:
+            name = "SrcOutCompositeOp";
+            break;
+        case SrcOverCompositeOp:
+            name = "SrcOverCompositeOp";
+            break;
+#endif
+        case SubtractCompositeOp:
+            name = "SubtractCompositeOp";
+            break;
+        case ThresholdCompositeOp:
+            name = "ThresholdCompositeOp";
+            break;
+        case XorCompositeOp:
+            name = "XorCompositeOp";
+            break;
+    }
+
+    return rm_enum_new(Class_CompositeOperator, ID2SYM(rb_intern(name)), INT2FIX(op));
+}
+
 /*
  * External:    CompressionType_new
    Purpose:     Construct a CompressionTYpe enum object for the specified value
@@ -1122,7 +1309,36 @@ CompressionType_new(CompressionType ct)
 }
 
 /*
-    External:  FilterTypes#new
+    External:   DisposeType.new
+    Purpose:    Construct a DisposeType enum object for the specified value..new
+*/
+VALUE
+DisposeType_new(DisposeType type)
+{
+    const char *name;
+
+    switch(type)
+    {
+        default:
+        case UndefinedDispose:
+            name = "UndefinedDispose";
+            break;
+        case BackgroundDispose:
+            name = "BackgroundDispose";
+            break;
+        case NoneDispose:
+            name = "NoneDispose";
+            break;
+        case PreviousDispose:
+            name = "PreviousDispose";
+            break;
+    }
+
+    return rm_enum_new(Class_DisposeType, ID2SYM(rb_intern(name)), INT2FIX(type));
+}
+
+/*
+    External:  FilterTypes.new
     Purpose: Construct an FilterTypes enum object for the specified value
 */
 VALUE
@@ -1189,7 +1405,7 @@ FilterTypes_new(FilterTypes type)
 
 
 /*
-    External:   EndianType#new
+    External:   EndianType.new
     Purpose:    Construct an EndianType enum object
 */
 VALUE
@@ -1216,7 +1432,7 @@ EndianType_new(EndianType type)
 
 
 /*
-    External:   ImageType#new
+    External:   ImageType.new
     Purpose:    Construct an ImageType enum object for the specified value
 */
 VALUE
@@ -1788,7 +2004,7 @@ StretchType_new(StretchType stretch)
 {
     const char *name;
 
-    name = StretchType_Const_Name(stretch);
+    name = StretchType_name(stretch);
     return rm_enum_new(Class_StretchType, ID2SYM(rb_intern(name)), INT2FIX(stretch));
 }
 
@@ -1935,7 +2151,7 @@ Font_to_s(VALUE self)
                   ti.description,
                   ti.family,
                   StyleType_Const_Name(ti.style),
-                  StretchType_Const_Name(ti.stretch),
+                  StretchType_name(ti.stretch),
                   weight,
                   ti.encoding ? ti.encoding : "",
                   ti.foundry ? ti.foundry : "",
@@ -2365,13 +2581,55 @@ Statistics_new(ImageStatistics *stats)
 }
 #endif  // HAVE_GETIMAGESTATISTICS
 
+/*
+    Extern:     StorageType_name
+    Purpose:    Return the string representation of a StorageType value
+*/
+const char *
+StorageType_name(StorageType type)
+{
+    const char *name;
+
+    switch (type)
+    {
+        default:
+        case UndefinedPixel:
+            name = "UndefinedPixel";
+            break;
+        case CharPixel:
+            name = "CharPixel";
+            break;
+        case DoublePixel:
+            name = "DoublePixel";
+            break;
+        case FloatPixel:
+            name = "FloatPixel";
+            break;
+        case IntegerPixel:
+            name = "IntegerPixel";
+            break;
+        case LongPixel:
+            name = "LongPixel";
+            break;
+#if defined(HAVE_QUANTUMPIXEL)
+        case QuantumPixel:
+            name = "QuantumPixel";
+            break;
+#endif
+        case ShortPixel:
+            name = "ShortPixel";
+            break;
+    }
+
+    return name;
+}
 
 /*
-    Static:     StretchType_Const_Name
+    Static:     StretchType_name
     Purpose:    Return the string representation of a StretchType value
 */
 static const char *
-StretchType_Const_Name(StretchType stretch)
+StretchType_name(StretchType stretch)
 {
     switch (stretch)
     {

data/install.rb

@@ -34,9 +34,12 @@ end
 ### end compat.rb
 ### begin config.rb
 
-if i = ARGV.index(/\A--rbconfig=/) then
+i = ARGV.detect { |arg| arg =~ /\A--rbconfig=/ }
+
+if i then
+  i =~ /\A--rbconfig=/
   file = $'
-  ARGV.delete_at(i)
+  ARGV.delete_if { |arg| arg == i } 
   require file
 else
   require 'rbconfig'

data/lib/RMagick.rb

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.25 2005/07/12 23:34:04 rmagick Exp $
+# $Id: RMagick.rb,v 1.32 2005/08/25 23:32:17 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2005 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -163,13 +163,13 @@ class Draw
         ObliqueStyle.to_i => 'oblique',
         AnyStyle.to_i => 'all'
         }
-        
+
   private
     def enquote(str)
         if str.length > 2 && /\A(?:\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})\z/.match(str)
-        	return str
+            return str
         else
-        	return '"' + str + '"'
+            return '"' + str + '"'
         end
     end
 
@@ -540,19 +540,19 @@ class Draw
     def text(x, y, text)
         if text.to_s.empty?
             raise ArgumentError, "missing text argument"
-        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
+        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
 
@@ -686,6 +686,7 @@ class Image
     # Make all pixels transparent.
     def matte_reset!
         self.opacity = Magick::TransparentOpacity
+        self
     end
 
     # Replace matching neighboring pixels with texture pixels
@@ -763,6 +764,12 @@ class Image
         attr_accessor :dirty
 
         def initialize(img, x, y, width, height)
+        	if width <= 0 || height <= 0
+        		raise ArgumentError, "invalid geometry (#{width}x#{height}+#{x}+#{y})"
+        	end
+        	if x < 0 || y < 0 || (x+width) > img.columns || (y+height) > img.rows
+        		raise RangeError, "geometry (#{width}x#{height}+#{x}+#{y}) exceeds image boundary"
+        	end
             @view = img.get_pixels(x, y, width, height)
             @img = img
             @x = x
@@ -1009,11 +1016,16 @@ protected
         unless obj.kind_of? Magick::Image
             raise ArgumentError, "Magick::Image required (#{obj.class} given)"
         end
+        true
     end
 
     # Ensure array is always an array of Magick::Image objects
     def is_a_image_array(ary)
+        unless ary.respond_to? :each
+            raise ArgumentError, "Magick::ImageList or array of Magick::Images required (#{ary.class} given)"
+        end
         ary.each { |obj| is_a_image obj }
+        true
     end
 
     # Find old current image, update @scene
@@ -1041,12 +1053,20 @@ public
 
     # Allow scene to be set to nil
     def scene=(n)
-        if (length == 0 && n != nil) || (length > 0 && n == nil)
+        if n.nil?
+            raise IndexError, "scene number out of bounds" unless length == 0
+            @scene = nil
+            return @scene
+        elsif length == 0
             raise IndexError, "scene number out of bounds"
-        elsif (length == 0) || (Integer(n) < 0) || (Integer(n) > length - 1)
+        end
+
+        n = Integer(n)
+        if n < 0 || n > length - 1
             raise IndexError, "scene number out of bounds"
         end
-        @scene = Integer(n)
+        @scene = n
+        return @scene
     end
 
     def [](*args)
@@ -1059,15 +1079,17 @@ public
 
     def []=(*args)
         if args.length == 3             # f[start,length] = [f1,f2...]
-            is_a_image_array args[2]
+            args[2].kind_of?(Magick::Image) || is_a_image_array(args[2])
             super
-            if args[1] > 0
-                @scene = args[0] + args[1] - 1
-            else                        # inserts elements if length == 0
+            args[0] = args[0] + length if (args[0] < 0)
+            args[1] = length - args[0] if (args[0] + args[1] > length)
+            if args[2].kind_of?(Magick::Image)
+                @scene = args[0]
+            else
                 @scene = args[0] + args[2].length - 1
             end
         elsif args[0].kind_of? Range    # f[first..last] = [f1,f2...]
-            is_a_image_array args[1]
+            args[1].kind_of?(Magick::Image) || is_a_image_array(args[1])
             super
             @scene = args[0].end
         else                            # f[index] = f1
@@ -1187,49 +1209,61 @@ public
         return a
     end
 
-    def fill(obj, *args)
-        is_a_image obj
+    def fill(*args, &block)
+        is_a_image args[0] unless block_given?
         cfid = self[@scene].__id__ rescue nil
-        a = super
+        super
+        is_a_image_array self
         set_cf cfid
-        return a
+        return self
     end
 
-    if Array.instance_methods(false).include? 'fetch' then
-        def fetch(*args,&block)
-            super
-        end
+    def find_all(&block)
+        cfid = self[@scene].__id__ rescue nil
+        a = super
+        a.set_cf cfid
+        return a
     end
 
-    if Array.instance_methods(false).include? 'insert' then
+    if self.superclass.instance_methods.include? 'insert' then
         def insert(*args)
+            raise(ArgumentError, "can't insert nil") unless args.length > 1
+            is_a_image_array args[1,args.length-1]
             cfid = self[@scene].__id__ rescue nil
-            a = self.class.new.replace super
-            a.set_cf cfid
-            return a
+            super
+            set_cf cfid
+            return self
         end
     end
 
-    # __map__ is a synonym for Array#map. We've used an alias
-    # so it doesn't conflict with our own map method.
-    if Array.instance_methods(false).include? '__map__' then
-        def __map__(&block)
-            cfid = self[@scene].__id__ rescue nil
-            a = self.class.new.replace super
-            a.set_cf cfid
-            return a
+    # Enumerable (or Array) has a #map method that conflicts with our
+    # own #map method. RMagick.so has defined a synonym for that #map
+    # called Array#__ary_map__. Here, we define Magick::ImageList#__map__
+    # to allow the use of the Enumerable/Array#map method on ImageList objects.
+    def __map__(&block)
+        cfid = self[@scene].__id__ rescue nil
+        ensure_image = Proc.new do |img|
+            rv = block.call(img)
+            is_a_image rv
+            return rv
         end
+        a = self.class.new.replace __ary_map__(&ensure_image)
+        a.set_cf cfid
+        return a
     end
 
     def map!(&block)
-        super
-        is_a_image_array self
-        self
+        ensure_image = Proc.new do |img|
+            rv = block.call(img)
+            is_a_image rv
+            return rv
+        end
+        super(&ensure_image)
     end
 
     def pop
         cfid = self[@scene].__id__ rescue nil
-        a = super
+        a = super       # can return nil
         set_cf cfid
         return a
     end
@@ -1241,18 +1275,16 @@ public
         self
     end
 
-    if Array.instance_methods(false).include? 'reject' then
-        def reject(&block)
-            cfid = self[@scene].__id__ rescue nil
-            a = super
-            set_cf cfid
-            return a
-        end
+    def reject(&block)
+        cfid = self[@scene].__id__ rescue nil
+        a = self.class.new.replace super
+        a.set_cf cfid
+        return a
     end
 
     def reject!(&block)
         cfid = self[@scene].__id__ rescue nil
-        a = super
+        a = super       # can return nil
         set_cf cfid
         return a
     end
@@ -1266,6 +1298,9 @@ public
             cfid = self[@scene].__id__ rescue nil
         end
         super
+        # set_cf will fail if the new list has fewer images
+        # than the scene number indicates.
+        @scene = self.length == 0 ? nil : 0
         set_cf cfid
         self
     end
@@ -1284,13 +1319,11 @@ public
         return a
     end
 
-    if Array.instance_methods(false).include? 'select' then
-        def select(*args,&block)
-            cfid = self[@scene].__id__ rescue nil
-            a = super
-            a.set_cf cfid
-            return a
-        end
+    def select(&block)
+        cfid = self[@scene].__id__ rescue nil
+        a = self.class.new.replace super
+        a.set_cf cfid
+        return a
     end
 
     def shift
@@ -1351,11 +1384,24 @@ public
             r = self[x] <=> other[x]
             return r unless r == 0
         end
+        if @scene.nil? && other.scene.nil?
+            return 0
+        elsif @scene.nil? && ! other.scene.nil?
+            raise TypeError, "cannot convert nil into #{other.scene.class}"
+        elsif ! @scene.nil? && other.scene.nil?
+            raise TypeError, "cannot convert nil into #{self.scene.class}"
+        end
         r = self.scene <=> other.scene
         return r unless r == 0
         return self.length <=> other.length
     end
 
+    def clone
+        ditto = dup
+        ditto.freeze if frozen?
+        return ditto
+    end
+
     # Make a deep copy
     def copy
         ditto = self.class.new
@@ -1381,6 +1427,14 @@ public
         each { |f| f.delay = Integer(d) }
     end
 
+    def dup
+        ditto = self.class.new
+        each {|img| ditto << img}
+        ditto.scene = @scene
+        ditto.taint if tainted?
+        return ditto
+    end
+
     def from_blob(*blobs, &block)
         if (blobs.length == 0)
             raise ArgumentError, "no blobs given"
@@ -1413,6 +1467,7 @@ public
 
     # Set the number of iterations of an animated GIF
     def iterations=(n)
+        n = Integer(n)
         if n < 0 || n > 65535
             raise ArgumentError, "iterations must be between 0 and 65535"
         end
@@ -1431,8 +1486,8 @@ public
             else
                 super
             end
-        rescue NameError
-          raise NameError, "undefined method `#{methID.id2name}' for #{self.class}"
+        rescue NoMethodError
+          raise NoMethodError, "undefined method `#{methID.id2name}' for #{self.class}"
         rescue Exception
             $@.delete_if { |s| /:in `send'$/.match(s) || /:in `method_missing'$/.match(s) }
             raise