rmagick 2.10.0 → 2.11.0

data/ext/RMagick/MANIFEST

@@ -1,4 +1,4 @@
-MANIFEST for RMagick-2.10.0 - 18:58:22 06/19/09
+MANIFEST for RMagick-2.11.0 - 17:47:40 07/29/09
 
 doc/ilist.html
 doc/scripts/stripeTables.js

data/ext/RMagick/extconf.rb

@@ -1,7 +1,7 @@
 require "mkmf"
 require "date"
 
-RMAGICK_VERS = "2.10.0"
+RMAGICK_VERS = "2.11.0"
 MIN_RUBY_VERS = "1.8.5"
 MIN_RUBY_VERS_NO = MIN_RUBY_VERS.tr(".","").to_i
 MIN_IM_VERS = "6.3.5"
@@ -187,6 +187,7 @@ have_func("snprintf", headers)
   ["AcquireImage",                   # 6.4.1
    "AffinityImage",                  # 6.4.3-6
    "AffinityImages",                 # 6.4.3-6
+   "BlueShiftImage",                 # 6.5.4-3
    "DeskewImage",                    # 6.4.2-5
    "EncipherImage",                  # 6.3.8-6
    "EqualizeImageChannel",           # 6.3.6-9
@@ -259,7 +260,13 @@ have_type("long double", headers)
 have_enum_values("AlphaChannelType", ["CopyAlphaChannel",                    # 6.4.3-7
                                       "BackgroundAlphaChannel"], headers)    # 6.5.2-5
 have_enum_values("CompositeOperator", ["BlurCompositeOp",                    # 6.5.3-7
-                                       "DistortCompositeOp"], headers)       # 6.5.3-10
+                                       "DistortCompositeOp",                 # 6.5.3-10
+                                       "LinearBurnCompositeOp",              # 6.5.4-3
+                                       "LinearDodgeCompositeOp",             # 6.5.4-3
+                                       "MathematicsCompositeOp",             # 6.5.4-3
+                                       "PegtopLightCompositeOp",             # 6.5.4-3
+                                       "PinLightCompositeOp",                # 6.5.4-3
+                                       "VividLightCompositeOp"], headers)    # 6.5.4-3
 have_enum_values("CompressionType", ["DXT1Compression",                      # 6.3.9-3
                                      "DXT3Compression",                      # 6.3.9-3
                                      "DXT5Compression"], headers)            # 6.3.9-3

data/ext/RMagick/rmagick.h

@@ -1,4 +1,4 @@
-/* $Id: rmagick.h,v 1.273 2009/06/04 23:18:57 rmagick Exp $ */
+/* $Id: rmagick.h,v 1.275 2009/07/23 22:55:57 rmagick Exp $ */
 /*=============================================================================
 |               Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmagick.h
@@ -873,6 +873,7 @@ extern VALUE Image_properties(VALUE);
 extern VALUE Image_bilevel_channel(int, VALUE *, VALUE);
 extern VALUE Image_black_threshold(int, VALUE *, VALUE);
 extern VALUE Image_blend(int, VALUE *, VALUE);
+extern VALUE Image_blue_shift(int, VALUE *, VALUE);
 extern VALUE Image_blur_image(int, VALUE *, VALUE);
 extern VALUE Image_blur_channel(int, VALUE *, VALUE);
 extern VALUE Image_border(VALUE, VALUE, VALUE, VALUE);
@@ -900,6 +901,7 @@ extern VALUE Image_composite_affine(VALUE, VALUE, VALUE);
 extern VALUE Image_composite_bang(int, VALUE *, VALUE);
 extern VALUE Image_composite_channel(int, VALUE *, VALUE);
 extern VALUE Image_composite_channel_bang(int, VALUE *, VALUE);
+extern VALUE Image_composite_mathematics(int, VALUE *, VALUE);
 extern VALUE Image_composite_tiled(int, VALUE *, VALUE);
 extern VALUE Image_composite_tiled_bang(int, VALUE *, VALUE);
 extern VALUE Image_compress_colormap_bang(VALUE);

data/ext/RMagick/rmdraw.c

@@ -1,4 +1,4 @@
-/* $Id: rmdraw.c,v 1.80 2009/06/19 22:07:40 rmagick Exp $ */
+/* $Id: rmdraw.c,v 1.81 2009/07/21 23:12:42 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmdraw.c
@@ -981,6 +981,16 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case LightenCompositeOp:
                 op = "Lighten";
                 break;
+#if defined(HAVE_ENUM_LINEARBURNCOMPOSITEOP)
+            case LinearBurnCompositeOp:
+                op = "LinearBurn";
+                break;
+#endif
+#if defined(HAVE_ENUM_LINEARDODGECOMPOSITEOP)
+            case LinearDodgeCompositeOp:
+                op = "LinearDodge";
+                break;
+#endif
             case LinearLightCompositeOp:
                 op = "LinearLight";
                 break;
@@ -1005,6 +1015,16 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case OverlayCompositeOp:
                 op = "Overlay";
                 break;
+#if defined(HAVE_ENUM_PEGTOPLIGHTCOMPOSITEOP)
+            case PegtopLightCompositeOp:
+                op = "PegtopLight";
+                break;
+#endif
+#if defined(HAVE_ENUM_PINLIGHTCOMPOSITEOP)
+            case PinLightCompositeOp:
+                op = "PinLight";
+                break;
+#endif
             case PlusCompositeOp:
                 op = "Plus";
                 break;
@@ -1041,6 +1061,11 @@ Draw_composite(int argc, VALUE *argv, VALUE self)
             case ThresholdCompositeOp:
                 op = "Threshold";
                 break;
+#if defined(HAVE_ENUM_VIVIDLIGHTCOMPOSITEOP)
+            case VividLightCompositeOp:
+                op = "VividLight";
+                break;
+#endif
             case XorCompositeOp:
                 op = "Xor";
                 break;

data/ext/RMagick/rmenum.c

@@ -1,4 +1,4 @@
-/* $Id: rmenum.c,v 1.6 2009/06/19 22:07:40 rmagick Exp $ */
+/* $Id: rmenum.c,v 1.7 2009/07/21 23:12:43 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmenum.c
@@ -413,14 +413,29 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(HueCompositeOp)
         ENUM_TO_NAME(InCompositeOp)
         ENUM_TO_NAME(LightenCompositeOp)
+#if defined(HAVE_ENUM_LINEARBURNCOMPOSITEOP)
+        ENUM_TO_NAME(LinearBurnCompositeOp)
+#endif
+#if defined(HAVE_ENUM_LINEARDODGECOMPOSITEOP)
+        ENUM_TO_NAME(LinearDodgeCompositeOp)
+#endif
         ENUM_TO_NAME(LinearLightCompositeOp)
         ENUM_TO_NAME(LuminizeCompositeOp)
+#if defined(HAVE_ENUM_MATHEMATICSCOMPOSITEOP)
+        ENUM_TO_NAME(MathematicsCompositeOp)
+#endif
         ENUM_TO_NAME(MinusCompositeOp)
         ENUM_TO_NAME(ModulateCompositeOp)
         ENUM_TO_NAME(MultiplyCompositeOp)
         ENUM_TO_NAME(OutCompositeOp)
         ENUM_TO_NAME(OverCompositeOp)
         ENUM_TO_NAME(OverlayCompositeOp)
+#if defined(HAVE_ENUM_PEGTOPLIGHTCOMPOSITEOP)
+        ENUM_TO_NAME(PegtopLightCompositeOp)
+#endif
+#if defined(HAVE_ENUM_PINLIGHTCOMPOSITEOP)
+        ENUM_TO_NAME(PinLightCompositeOp)
+#endif
         ENUM_TO_NAME(PlusCompositeOp)
         ENUM_TO_NAME(ReplaceCompositeOp)
         ENUM_TO_NAME(SaturateCompositeOp)
@@ -432,6 +447,9 @@ CompositeOperator_name(CompositeOperator op)
         ENUM_TO_NAME(SrcOverCompositeOp)
         ENUM_TO_NAME(SubtractCompositeOp)
         ENUM_TO_NAME(ThresholdCompositeOp)
+#if defined(HAVE_ENUM_VIVIDLIGHTCOMPOSITEOP)
+        ENUM_TO_NAME(VividLightCompositeOp)
+#endif
         ENUM_TO_NAME(XorCompositeOp)
     }
 

data/ext/RMagick/rmimage.c

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.349 2009/06/05 22:30:40 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.353 2009/07/23 22:55:57 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -976,7 +976,6 @@ Image_black_threshold(int argc, VALUE *argv, VALUE self)
 static void
 get_relative_offsets(VALUE grav, Image *image, Image *mark, long *x_offset, long *y_offset)
 {
-    MagickEnum *m_enum;
     GravityType gravity;
 
     VALUE_TO_ENUM(grav, gravity, GravityType);
@@ -1012,11 +1011,7 @@ get_relative_offsets(VALUE grav, Image *image, Image *mark, long *x_offset, long
             break;
         case NorthEastGravity:
         case NorthGravity:
-            // Don't let these run into the default case
-            break;
         default:
-            Data_Get_Struct(grav, MagickEnum, m_enum);
-            rb_warning("gravity type `%s' has no effect", rb_id2name(m_enum->id));
             break;
     }
 
@@ -1217,6 +1212,9 @@ special_composite(Image *image, Image *overlay, double image_pct, double overlay
 
     blend_geometry(geometry, sizeof(geometry), image_pct, overlay_pct);
     (void) CloneString(&overlay->geometry, geometry);
+#if defined(HAVE_SETIMAGEARTIFACT)
+    (void) SetImageArtifact(overlay,"compose:args", geometry);
+#endif
 
     new_image = rm_clone_image(image);
     (void) CompositeImage(new_image, op, overlay, x_off, y_off);
@@ -1280,6 +1278,50 @@ Image_blend(int argc, VALUE *argv, VALUE self)
 }
 
 
+
+/*
+ *  Method:     Image#blue_shift(factor=1.5)
+ *  Purpose:    Call BlueShiftImage
+ */
+VALUE
+Image_blue_shift(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_BLUESHIFTIMAGE)
+    Image *image, *new_image;
+    double factor = 1.5;
+    ExceptionInfo exception;
+
+    image = rm_check_destroyed(self);
+
+    switch (argc)
+    {
+        case 1:
+            factor = NUM2DBL(argv[0]);
+        case 0:
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 0 or 1)", argc);
+            break;
+    }
+
+
+    GetExceptionInfo(&exception);
+    new_image = BlueShiftImage(image, factor, &exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(&exception);
+
+    return rm_image_new(new_image);
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+    argc = argc;
+    argv = argv;
+    self = self;
+#endif
+}
+
+
+
 DEF_ATTR_ACCESSOR(Image, blur, dbl)
 
 
@@ -2440,7 +2482,6 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
     Image *comp_image;
     CompositeOperator operator = UndefinedCompositeOp;
     GravityType gravity;
-    MagickEnum *m_enum;
     volatile VALUE comp;
     signed long x_offset = 0;
     signed long y_offset = 0;
@@ -2555,11 +2596,7 @@ composite(int bang, int argc, VALUE *argv, VALUE self, ChannelType channels)
                     break;
                 case NorthEastGravity:
                 case NorthGravity:
-                    // Don't let these run into the default case
-                    break;
                 default:
-                    Data_Get_Struct(argv[1], MagickEnum, m_enum);
-                    rb_warning("gravity type `%s' has no effect", rb_id2name(m_enum->id));
                     break;
             }
             break;
@@ -2664,6 +2701,73 @@ Image_composite_channel_bang(int argc, VALUE *argv, VALUE self)
 }
 
 
+/*
+    Method:     Image#composite_mathematics
+                img.composite_mathematics(comp_img, A, B, C, D, gravity)
+                img.composite_mathematics(comp_img, A, B, C, D, x_off, y_off)
+                img.composite_mathematics(comp_img, A, B, C, D, gravity, x_off, y_off)
+   Purpose:     Composite using MathematicsCompositeOp
+   Notes:       New in 6.5.4-3.
+ */
+VALUE
+Image_composite_mathematics(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_ENUM_MATHEMATICSCOMPOSITEOP)
+    Image *composite_image;
+    VALUE args[5];
+    signed long x_off = 0L;
+    signed long y_off = 0L;
+    GravityType gravity = NorthWestGravity;
+    char compose_args[200];
+
+    rm_check_destroyed(self);
+    if (argc > 0)
+    {
+        composite_image = rm_check_destroyed(rm_cur_image(argv[0]));
+    }
+
+    switch (argc)
+    {
+        case 8:
+            VALUE_TO_ENUM(argv[5], gravity, GravityType);
+            x_off = NUM2LONG(argv[6]);
+            y_off = NUM2LONG(argv[7]);
+            break;
+        case 7:
+            x_off = NUM2LONG(argv[5]);
+            y_off = NUM2LONG(argv[6]);
+            break;
+        case 6:
+            VALUE_TO_ENUM(argv[5], gravity, GravityType);
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (got %d, expected 6 to 8)", argc);
+            break;
+    }
+
+
+    (void) sprintf(compose_args, "%-.16g,%-.16g,%-.16g,%-.16g", NUM2DBL(argv[1]), NUM2DBL(argv[2]), NUM2DBL(argv[3]), NUM2DBL(argv[4]));
+    SetImageArtifact(composite_image,"compose:args", compose_args);
+
+    // Call composite(False, gravity, x_off, y_off, MathematicsCompositeOp, DefaultChannels)
+    args[0] = argv[0];
+    args[1] = GravityType_new(gravity);
+    args[2] = LONG2FIX(x_off);
+    args[3] = LONG2FIX(y_off);
+    args[4] = CompositeOperator_new(MathematicsCompositeOp);
+
+    return composite(False, 5, args, self, DefaultChannels);
+
+#else
+    rm_not_implemented();
+    argc = argc;
+    argv = argv;
+    self = self;
+    return (VALUE)0;
+#endif
+}
+
+
 /*
     Method:     Image#composite_tiled(src [, composite_op = Magick::OverCompositeOp][, channel...])
     Purpose:    Emulate the -tile option to the composite command.
@@ -10915,6 +11019,9 @@ Image_watermark(int argc, VALUE *argv, VALUE self)
 
     blend_geometry(geometry, sizeof(geometry), src_percent, dst_percent);
     (void) CloneString(&overlay->geometry, geometry);
+#if defined(HAVE_SETIMAGEARTIFACT)
+    (void) SetImageArtifact(overlay,"compose:args", geometry);
+#endif
 
     new_image = rm_clone_image(image);
     (void) CompositeImage(new_image, ModulateCompositeOp, overlay, x_offset, y_offset);
@@ -11289,7 +11396,6 @@ cropper(int bang, int argc, VALUE *argv, VALUE self)
     unsigned long columns, rows;
     int reset_page = 0;
     GravityType gravity;
-    MagickEnum *m_enum;
     Image *image;
     VALUE cropped;
 
@@ -11357,11 +11463,7 @@ cropper(int bang, int argc, VALUE *argv, VALUE self)
                     break;
                 case NorthEastGravity:
                 case NorthGravity:
-                    // Don't let these run into the default case
-                    break;
                 default:
-                    Data_Get_Struct(argv[0], MagickEnum, m_enum);
-                    rb_warning("gravity type `%s' has no effect", rb_id2name(m_enum->id));
                     break;
             }
 

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.296 2009/06/19 22:07:05 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.298 2009/07/23 22:55:57 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2009 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -264,6 +264,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "bilevel_channel", Image_bilevel_channel, -1);
     rb_define_method(Class_Image, "black_threshold", Image_black_threshold, -1);
     rb_define_method(Class_Image, "blend", Image_blend, -1);
+    rb_define_method(Class_Image, "blue_shift", Image_blue_shift, -1);
     rb_define_method(Class_Image, "blur_image", Image_blur_image, -1);
     rb_define_method(Class_Image, "blur_channel", Image_blur_channel, -1);
     rb_define_method(Class_Image, "border", Image_border, 3);
@@ -292,6 +293,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "composite_affine", Image_composite_affine, 2);
     rb_define_method(Class_Image, "composite_channel", Image_composite_channel, -1);
     rb_define_method(Class_Image, "composite_channel!", Image_composite_channel_bang, -1);
+    rb_define_method(Class_Image, "composite_mathematics", Image_composite_mathematics, -1);
     rb_define_method(Class_Image, "composite_tiled", Image_composite_tiled, -1);
     rb_define_method(Class_Image, "composite_tiled!", Image_composite_tiled_bang, -1);
     rb_define_method(Class_Image, "compress_colormap!", Image_compress_colormap_bang, 0);
@@ -977,6 +979,12 @@ Init_RMagick2(void)
         ENUMERATOR(HueCompositeOp)
         ENUMERATOR(InCompositeOp)
         ENUMERATOR(LightenCompositeOp)
+#if defined(HAVE_ENUM_LINEARBURNCOMPOSITEOP)
+        ENUMERATOR(LinearBurnCompositeOp)
+#endif
+#if defined(HAVE_ENUM_LINEARDODGECOMPOSITEOP)
+        ENUMERATOR(LinearDodgeCompositeOp)
+#endif
         ENUMERATOR(LinearLightCompositeOp)
         ENUMERATOR(LuminizeCompositeOp)
         ENUMERATOR(MinusCompositeOp)
@@ -985,6 +993,12 @@ Init_RMagick2(void)
         ENUMERATOR(OutCompositeOp)
         ENUMERATOR(OverCompositeOp)
         ENUMERATOR(OverlayCompositeOp)
+#if defined(HAVE_ENUM_PEGTOPLIGHTCOMPOSITEOP)
+        ENUMERATOR(PegtopLightCompositeOp)
+#endif
+#if defined(HAVE_ENUM_PINLIGHTCOMPOSITEOP)
+        ENUMERATOR(PinLightCompositeOp)
+#endif
         ENUMERATOR(PlusCompositeOp)
         ENUMERATOR(ReplaceCompositeOp)    // synonym for CopyCompositeOp
         ENUMERATOR(SaturateCompositeOp)
@@ -997,6 +1011,9 @@ Init_RMagick2(void)
         ENUMERATOR(SrcOverCompositeOp)
         ENUMERATOR(SubtractCompositeOp)
         ENUMERATOR(ThresholdCompositeOp)
+#if defined(HAVE_ENUM_VIVIDLIGHTCOMPOSITEOP)
+        ENUMERATOR(VividLightCompositeOp)
+#endif
         ENUMERATOR(XorCompositeOp)
     END_ENUM
 
@@ -1606,7 +1623,7 @@ version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2009/06/19 22:07:05 $) Copyright (C) 2009 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2009/07/23 22:55:57 $) Copyright (C) 2009 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
             "Web page: http://rmagick.rubyforge.org\n"

data/rmagick.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "2.10.0"
+  s.version = "2.11.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.10.0
+  version: 2.11.0
 platform: ruby
 authors: 
 - Tim Hunter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 -04:00
+date: 2009-07-29 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick 6.3.0 or later
 rubyforge_project: rmagick
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby binding to ImageMagick