rmagick 2.6.0 → 2.7.0

data/ext/RMagick/rmilist.c

@@ -1,4 +1,4 @@
-/* $Id: rmilist.c,v 1.84 2008/09/10 22:08:55 rmagick Exp $ */
+/* $Id: rmilist.c,v 1.87 2008/09/28 00:23:10 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmilist.c
@@ -17,51 +17,6 @@ static VALUE ImageList_new(void);
 
 
 
-/*
-    Method:     ImageList#affinity(affinity_image=nil, dither_method=RiemersmaDitherMethod)
-    Purpose:    Call AffinityImages
-    Note:       See Image_affinity. Immediate - modifies images in-place
-*/
-VALUE
-ImageList_affinity(int argc, VALUE *argv, VALUE self)
-{
-#if defined(HAVE_AFFINITYIMAGES)
-    Image *images, *affinity_image = NULL;
-    QuantizeInfo quantize_info;
-
-    images = images_from_imagelist(self);
-
-    if (argc > 0 && argv[0] != Qnil)
-    {
-        volatile VALUE t = rm_cur_image(argv[0]);
-        affinity_image = rm_check_destroyed(t);
-    }
-
-    GetQuantizeInfo(&quantize_info);
-
-    if (argc > 1)
-    {
-        VALUE_TO_ENUM(argv[1], quantize_info.dither_method, DitherMethod);
-        quantize_info.dither = MagickTrue;
-    }
-    if (argc > 2)
-    {
-        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
-    }
-
-    (void) AffinityImages(&quantize_info, images, affinity_image);
-    rm_check_image_exception(images, RetainOnError);
-    rm_split(images);
-
-    return self;
-#else
-    self = self;
-    argc = argc;
-    argv = argv;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
-}
 
 
 /*
@@ -396,8 +351,8 @@ ImageList_map(int argc, VALUE *argv, VALUE self)
     volatile VALUE scene, new_imagelist, t;
     ExceptionInfo exception;
 
-#if defined(HAVE_AFFINITYIMAGES)
-    rb_warning("ImageList#map is deprecated. Use ImageList#affinity instead.");
+#if defined(HAVE_REMAPIMAGES)
+    rb_warning("ImageList#map is deprecated. Use ImageList#remap instead.");
 #endif
 
     switch (argc)
@@ -663,6 +618,11 @@ ImageList_optimize_layers(VALUE self, VALUE method)
         case MergeLayer:
             new_images = MergeImageLayers(images, mthd, &exception);
             break;
+#endif
+#if defined(HAVE_ENUM_TRIMBOUNDSLAYER)
+        case TrimBoundsLayer:
+            new_images = MergeImageLayers(images, mthd, &exception);
+            break;
 #endif
         default:
             rb_raise(rb_eArgError, "undefined layer method");
@@ -841,7 +801,7 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
         case 4:
             quantize_info.tree_depth = (unsigned long)NUM2INT(argv[3]);
         case 3:
-#if defined(HAVE_TYPE_DITHERMETHOD)
+#if defined(HAVE_TYPE_DITHERMETHOD) && defined(HAVE_ENUM_NODITHERMETHOD)
             if (rb_obj_is_kind_of(argv[2], Class_DitherMethod))
             {
                 VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
@@ -896,6 +856,57 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
 }
 
 
+/*
+    Method:     ImageList#remap(remap_image=nil, dither_method=RiemersmaDitherMethod)
+    Purpose:    Call RemapImages
+    Note:       See Image_remap. Immediate - modifies images in-place
+*/
+VALUE
+ImageList_remap(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_REMAPIMAGES) || defined(HAVE_AFFINITYIMAGES)
+    Image *images, *remap_image = NULL;
+    QuantizeInfo quantize_info;
+
+    images = images_from_imagelist(self);
+
+    if (argc > 0 && argv[0] != Qnil)
+    {
+        volatile VALUE t = rm_cur_image(argv[0]);
+        remap_image = rm_check_destroyed(t);
+    }
+
+    GetQuantizeInfo(&quantize_info);
+
+    if (argc > 1)
+    {
+        VALUE_TO_ENUM(argv[1], quantize_info.dither_method, DitherMethod);
+        quantize_info.dither = MagickTrue;
+    }
+    if (argc > 2)
+    {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
+    }
+
+#if defined(HAVE_REMAPIMAGES)
+    (void) RemapImages(&quantize_info, images, remap_image);
+#else
+    (void) AffinityImages(&quantize_info, images, remap_image);
+#endif
+    rm_check_image_exception(images, RetainOnError);
+    rm_split(images);
+
+    return self;
+#else
+    self = self;
+    argc = argc;
+    argv = argv;
+    rm_not_implemented();
+    return(VALUE)0;
+#endif
+}
+
+
 /*
     Method:     ImageList#to_blob
     Purpose:    returns the imagelist as a blob (a String)

data/ext/RMagick/rmimage.c

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.319 2008/09/10 22:16:58 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.322 2008/09/28 00:23:10 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -569,56 +569,6 @@ Image_alpha_eq(VALUE self, VALUE type)
 }
 
 
-
-/*
-     Method:    Image#affinity(affinity_image, dither_method=RiemersmaDitherMethod)
-     Purpose:   Call AffinityImage
-     Notes:     Immediate - modifies image in-place
-*/
-VALUE
-Image_affinity(int argc, VALUE *argv, VALUE self)
-{
-#if defined(HAVE_AFFINITYIMAGE)
-    Image *image, *affinity_image;
-    QuantizeInfo quantize_info;
-
-    image = rm_check_frozen(self);
-    if (argc > 0)
-    {
-        volatile VALUE t = rm_cur_image(argv[0]);
-        affinity_image = rm_check_destroyed(t);
-    }
-
-    GetQuantizeInfo(&quantize_info);
-
-    switch (argc)
-    {
-        case 2:
-            VALUE_TO_ENUM(argv[1], quantize_info.dither_method, DitherMethod);
-            quantize_info.dither = MagickTrue;
-            break;
-        case 1:
-            break;
-        default:
-            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
-            break;
-    }
-
-
-    (void) AffinityImage(&quantize_info, image, affinity_image);
-    rm_check_image_exception(image, RetainOnError);
-
-    return self;
-#else
-    self = self;
-    argc = argc;
-    argv = argv;
-    rm_not_implemented();
-    return(VALUE)0;
-#endif
-}
-
-
 /*
     Method:     Image#affine_transform(affine_matrix)
     Purpose:    transforms an image as dictated by the affine matrix argument
@@ -6251,8 +6201,8 @@ Image_map(int argc, VALUE *argv, VALUE self)
 
     image = rm_check_destroyed(self);
 
-#if defined(HAVE_AFFINITYIMAGE)
-    rb_warning("Image#map is deprecated. Use Image#affinity instead");
+#if defined(HAVE_REMAPIMAGE)
+    rb_warning("Image#map is deprecated. Use Image#remap instead");
 #endif
 
     switch (argc)
@@ -7827,7 +7777,7 @@ Image_quantize(int argc, VALUE *argv, VALUE self)
         case 4:
             quantize_info.tree_depth = NUM2UINT(argv[3]);
         case 3:
-#if defined(HAVE_TYPE_DITHERMETHOD)
+#if defined(HAVE_TYPE_DITHERMETHOD) && defined(HAVE_ENUM_NODITHERMETHOD)
             if (rb_obj_is_kind_of(argv[2], Class_DitherMethod))
             {
                 VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
@@ -8246,6 +8196,58 @@ Image_reduce_noise(VALUE self, VALUE radius)
 }
 
 
+/*
+     Method:    Image#remap(remap_image, dither_method=RiemersmaDitherMethod)
+     Purpose:   Call RemapImage
+     Notes:     Immediate - modifies image in-place
+*/
+VALUE
+Image_remap(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_REMAPIMAGE) || defined(HAVE_AFFINITYIMAGE)
+    Image *image, *remap_image;
+    QuantizeInfo quantize_info;
+
+    image = rm_check_frozen(self);
+    if (argc > 0)
+    {
+        volatile VALUE t = rm_cur_image(argv[0]);
+        remap_image = rm_check_destroyed(t);
+    }
+
+    GetQuantizeInfo(&quantize_info);
+
+    switch (argc)
+    {
+        case 2:
+            VALUE_TO_ENUM(argv[1], quantize_info.dither_method, DitherMethod);
+            quantize_info.dither = MagickTrue;
+            break;
+        case 1:
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 1 or 2)", argc);
+            break;
+    }
+
+#if defined(HAVE_REMAPIMAGE)
+    (void) RemapImage(&quantize_info, image, remap_image);
+#else
+    (void) AffinityImage(&quantize_info, image, remap_image);
+#endif
+    rm_check_image_exception(image, RetainOnError);
+
+    return self;
+#else
+    self = self;
+    argc = argc;
+    argv = argv;
+    rm_not_implemented();
+    return(VALUE)0;
+#endif
+}
+
+
 /*
     Method:     Image#rendering_intent=
     Purpose:    get rendering_intent
@@ -10851,7 +10853,7 @@ void add_format_prefix(Info *info, VALUE file)
     char magic[MaxTextExtent];
     size_t magic_l;
     size_t prefix_l;
-    void *p;
+    char *p;
 
     // Convert arg to string. If an exception occurs raise an error condition.
     file = rb_rescue(rb_String, file, file_arg_rescue, file);
@@ -10872,7 +10874,7 @@ void add_format_prefix(Info *info, VALUE file)
     if (p)
     {
         memset(magic, '\0', sizeof(magic));
-        magic_l = p - (void *)filename;
+        magic_l = p - filename;
         memcpy(magic, filename, magic_l);
 
         GetExceptionInfo(&exception);

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.266 2008/08/31 20:00:39 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.271 2008/09/28 00:23:10 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -481,7 +481,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "add_noise_channel", Image_add_noise_channel, -1);
     rb_define_method(Class_Image, "add_profile", Image_add_profile, 1);
     rb_define_method(Class_Image, "affine_transform", Image_affine_transform, 1);
-    rb_define_method(Class_Image, "affinity", Image_affinity, -1);
+    rb_define_method(Class_Image, "remap", Image_remap, -1);
     rb_define_method(Class_Image, "alpha", Image_alpha, -1);
     rb_define_method(Class_Image, "alpha?", Image_alpha_q, 0);
     rb_define_method(Class_Image, "[]", Image_aref, 1);
@@ -688,7 +688,7 @@ Init_RMagick2(void)
 
     // Define an alias for Object#display before we override it
     rb_define_alias(Class_ImageList, "__display__", "display");
-    rb_define_method(Class_ImageList, "affinity", ImageList_affinity, -1);
+    rb_define_method(Class_ImageList, "remap", ImageList_remap, -1);
     rb_define_method(Class_ImageList, "animate", ImageList_animate, -1);
     rb_define_method(Class_ImageList, "append", ImageList_append, 1);
     rb_define_method(Class_ImageList, "average", ImageList_average, 0);
@@ -1032,8 +1032,15 @@ Init_RMagick2(void)
         ENUMERATOR(UndefinedAlphaChannel)
         ENUMERATOR(ActivateAlphaChannel)
         ENUMERATOR(DeactivateAlphaChannel)
-        ENUMERATOR(ResetAlphaChannel)
+        ENUMERATOR(ResetAlphaChannel)  /* deprecated */
         ENUMERATOR(SetAlphaChannel)
+#if defined(HAVE_ENUM_COPYALPHACHANNEL)
+        ENUMERATOR(CopyAlphaChannel)
+        ENUMERATOR(ExtractAlphaChannel)
+        ENUMERATOR(OpaqueAlphaChannel)
+        ENUMERATOR(ShapeAlphaChannel)
+        ENUMERATOR(TransparentAlphaChannel)
+#endif
     END_ENUM
 #endif
 
@@ -1276,6 +1283,9 @@ Init_RMagick2(void)
         ENUMERATOR(ScaleRotateTranslateDistortion)
 #if defined(HAVE_ENUM_SHEPARDSDISTORTION)
         ENUMERATOR(ShepardsDistortion)
+#endif
+#if defined(HAVE_ENUM_BARRELINVERSEDISTORTION)
+        ENUMERATOR(BarrelInverseDistortion)
 #endif
     END_ENUM
 #endif
@@ -1283,7 +1293,9 @@ Init_RMagick2(void)
 #if defined(HAVE_TYPE_DITHERMETHOD)
     DEF_ENUM(DitherMethod)
         ENUMERATOR(UndefinedDitherMethod)
+#if defined(HAVE_ENUM_NODITHERMETHOD)
         ENUMERATOR(NoDitherMethod)
+#endif
         ENUMERATOR(RiemersmaDitherMethod)
         ENUMERATOR(FloydSteinbergDitherMethod)
     END_ENUM
@@ -1433,6 +1445,9 @@ Init_RMagick2(void)
 #endif
 #if defined(HAVE_ENUM_FLATTENLAYER)
         ENUMERATOR(FlattenLayer)
+#endif
+#if defined(HAVE_ENUM_TRIMBOUNDSLAYER)
+        ENUMERATOR(TrimBoundsLayer)
 #endif
     END_ENUM
 
@@ -1768,7 +1783,7 @@ version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2008/08/31 20:00:39 $) Copyright (C) 2008 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2008/09/28 00:23:10 $) 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,4 +1,4 @@
-/* $Id: rmutil.c,v 1.162 2008/09/03 00:00:35 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.163 2008/09/25 23:25:36 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -1957,7 +1957,9 @@ LAYERMETHODTYPE_NAME(LAYERMETHODTYPE method)
 #if defined(HAVE_ENUM_FLATTENLAYER)
         ENUM_TO_NAME(FlattenLayer)
 #endif
-
+#if defined(HAVE_ENUM_TRIMBOUNDSLAYER)
+        ENUM_TO_NAME(TrimBoundsLayer)
+#endif
     }
 
     return "UndefinedLayer";

data/lib/RMagick.rb

@@ -1,4 +1,4 @@
-# $Id: RMagick.rb,v 1.74 2008/08/28 23:25:46 rmagick Exp $
+# $Id: RMagick.rb,v 1.75 2008/09/28 00:24:41 rmagick Exp $
 #==============================================================================
 #                  Copyright (C) 2008 by Timothy P. Hunter
 #   Name:       RMagick.rb
@@ -734,6 +734,8 @@ end # module Magick::IPTC
 class Image
     include Comparable
 
+    alias_method :affinity, :remap
+
     # Provide an alternate version of Draw#annotate, for folks who
     # want to find it in this class.
     def annotate(draw, width, height, x, y, text, &block)
@@ -1467,6 +1469,9 @@ public
     alias_method :map!, :collect!
     alias_method :__map__!, :collect!
 
+    # ImageMagic used affinity in 6.4.3, switch to remap in 6.4.4.
+    alias_method :affinity, :remap
+
     def compact
         current = get_current()
         ilist = self.class.new

data/rmagick.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "2.6.0"
+  s.version = "2.7.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.6.0
+  version: 2.7.0
 platform: ruby
 authors: 
 - Tim Hunter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-10 00:00:00 -04:00
+date: 2008-09-28 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -145,7 +145,6 @@ files:
 - doc/ex/text01.rb
 - doc/ex/composite_layers.rb
 - doc/ex/level_colors.rb
-- doc/ex/affinity_images.rb
 - doc/ex/polyline.rb
 - doc/ex/get_pixels.rb
 - doc/ex/equalize.rb
@@ -182,10 +181,11 @@ files:
 - doc/ex/wave.rb
 - doc/ex/shave.rb
 - doc/ex/composite_tiled.rb
-- doc/ex/affinity.rb
 - doc/ex/pattern2.rb
+- doc/ex/remap_images.rb
 - doc/ex/bounding_box.rb
 - doc/ex/rvg_clippath.rb
+- doc/ex/remap.rb
 - doc/ex/median_filter.rb
 - doc/ex/arcs01.rb
 - doc/ex/stroke_dasharray.rb