rmagick 2.2.2 → 2.3.0

data/ext/RMagick/rmimage.c

@@ -1,4 +1,4 @@
-/* $Id: rmimage.c,v 1.279 2008/01/28 22:31:50 rmagick Exp $ */
+/* $Id: rmimage.c,v 1.288 2008/03/23 15:15:46 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmimage.c
@@ -396,29 +396,45 @@ Image_add_profile(VALUE self, VALUE name)
 }
 
 
+
 /*
-    Method:     Image#alpha=(alpha)
-    Purpose:    Equivalent to -alpha option
-    Notes:      see mogrify.c
+    Method:         Image#alpha(type)
+    Purpose:        Calls SetImageAlphaChannel
+    Notes:          Replaces matte=, alpha=
+                    Originally there was an alpha attribute getter and setter.
+                    These are replaced with alpha? and alpha(type). We
+                    still define (but don't document) alpha=. For backward
+                    compatibility, if this method is called without an argument,
+                    make it act like the old alpha getter and return true if the
+                    matte channel is active, false otherwise.
 */
 VALUE
-Image_alpha_eq(VALUE self, VALUE type)
+Image_alpha(int argc, VALUE *argv, VALUE self)
 {
 #if defined(HAVE_TYPE_ALPHACHANNELTYPE)
     Image *image;
     AlphaChannelType alpha;
 
-    image = rm_check_frozen(self);
 
-    VALUE_TO_ENUM(type, alpha, AlphaChannelType);
+    // For backward compatibility, make alpha() act like alpha?
+    if (argc == 0)
+    {
+        return Image_alpha_q(self);
+    }
+    else if (argc > 1)
+    {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc);
+    }
+
+
+    image = rm_check_frozen(self);
+    VALUE_TO_ENUM(argv[0], alpha, AlphaChannelType);
 
 #if defined(HAVE_SETIMAGEALPHACHANNEL)
     // Added in 6.3.6-9
     (void) SetImageAlphaChannel(image, alpha);
     rm_check_image_exception(image, RetainOnError);
-
 #else
-
     switch (alpha)
     {
         case ActivateAlphaChannel:
@@ -443,10 +459,55 @@ Image_alpha_eq(VALUE self, VALUE type)
             break;
 
         default:
+            rb_raise(rb_eArgError, "unknown AlphaChannelType value");
             break;
     }
 #endif
 
+    return argv[0];
+
+#else   // HAVE_ALPHACHANNELTYPE
+    argc = argc;
+    argv =argv;
+    self = self;
+    rm_not_implemented();
+    return(VALUE)0;
+#endif
+}
+
+
+
+/*
+    Method:     Image#alpha?
+    Returns:    true if the image's alpha channel is activated
+    Notes:      Replaces Image#matte
+*/
+VALUE
+Image_alpha_q(VALUE self)
+{
+    Image *image = rm_check_destroyed(self);
+#if defined(HAVE_GETIMAGEALPHACHANNEL)
+    return GetImageAlphaChannel(image) ? Qtrue : Qfalse;
+#else
+    return image->matte ? Qtrue : Qfalse;
+#endif
+}
+
+
+/*
+    Method:     Image#alpha=(alpha)
+    Purpose:    Equivalent to -alpha option
+    Returns:    alpha
+    Notes:      see mogrify.c
+    Notes:      Deprecated. See Image_alpha.
+*/
+VALUE
+Image_alpha_eq(VALUE self, VALUE type)
+{
+#if defined(HAVE_TYPE_ALPHACHANNELTYPE)
+    VALUE argv[1];
+    argv[0] = type;
+    Image_alpha(1, argv, self);
     return type;
 #else
     self = self;
@@ -3178,6 +3239,45 @@ Image_depth(VALUE self)
 }
 
 
+/*
+    Method:     Image#decipher(passphrase)
+    Purpose:    call DecipherImage
+*/
+VALUE
+Image_decipher(VALUE self, VALUE passphrase)
+{
+#if defined(HAVE_ENCIPHERIMAGE)
+    Image *image, *new_image;
+    char *pf;
+    ExceptionInfo exception;
+    MagickBooleanType okay;
+
+    image = rm_check_destroyed(self);
+    pf = StringValuePtr(passphrase);      // ensure passphrase is a string
+    GetExceptionInfo(&exception);
+
+    new_image = rm_clone_image(image);
+
+    okay = DecipherImage(new_image, pf, &exception);
+    rm_check_exception(&exception, new_image, DestroyOnError);
+    if (!okay)
+    {
+        new_image = DestroyImage(new_image);
+        rb_raise(rb_eRuntimeError, "DecipherImage failed for unknown reason.");
+    }
+
+    DestroyExceptionInfo(&exception);
+
+    return rm_image_new(new_image);
+#else
+    self = self;
+    passphrase = passphrase;
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
+
 DEF_ATTR_ACCESSOR(Image, delay, ulong)
 
 
@@ -3838,6 +3938,45 @@ Image_emboss(int argc, VALUE *argv, VALUE self)
 }
 
 
+/*
+    Method:     Image#encipher(passphrase)
+    Purpose:    call EncipherImage
+*/
+VALUE
+Image_encipher(VALUE self, VALUE passphrase)
+{
+#if defined(HAVE_ENCIPHERIMAGE)
+    Image *image, *new_image;
+    char *pf;
+    ExceptionInfo exception;
+    MagickBooleanType okay;
+
+    image = rm_check_destroyed(self);
+    pf = StringValuePtr(passphrase);      // ensure passphrase is a string
+    GetExceptionInfo(&exception);
+
+    new_image = rm_clone_image(image);
+
+    okay = EncipherImage(new_image, pf, &exception);
+    rm_check_exception(&exception, new_image, DestroyOnError);
+    if (!okay)
+    {
+        new_image = DestroyImage(new_image);
+        rb_raise(rb_eRuntimeError, "EncipherImage failed for unknown reason.");
+    }
+
+    DestroyExceptionInfo(&exception);
+
+    return rm_image_new(new_image);
+#else
+    self = self;
+    passphrase = passphrase;
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
+
 
 /*
     Method:     Image#endian
@@ -5664,18 +5803,17 @@ Image_map(int argc, VALUE *argv, VALUE self)
 
 
 /*
-    Method:     Image#mask
+    Static:     get_image_mask
     Purpose:    Return the image's clip mask, or nil if it doesn't have a clip
                 mask.
     Notes:      Distinguish from Image#clip_mask
 */
-VALUE
-Image_mask(VALUE self)
+static VALUE
+get_image_mask(Image *image)
 {
-    Image *image, *mask;
+    Image *mask;
     ExceptionInfo exception;
 
-    image = rm_check_destroyed(self);
     GetExceptionInfo(&exception);
 
     // The returned clip mask is a clone, ours to keep.
@@ -5690,22 +5828,49 @@ Image_mask(VALUE self)
 
 /*
     Method:     Image#mask=(mask-image)
+    Notes:      Deprecated in favor of Image#mask(mask-image). See below.
+*/
+VALUE
+Image_mask_eq(VALUE self, VALUE mask)
+{
+    VALUE v[1];
+    v[0] = mask;
+    return Image_mask(1, v, self);
+}
+
+
+/*
+    Method:     Image#mask([mask-image])
     Purpose:    associates a clip mask with the image
+    Returns:    Copy of the current clip-mask
+    Notes:      Omit the argument to get a copy of the current clip mask.
     Notes:      pass "nil" for the mask-image to remove the current clip mask.
                 If the clip mask is not the same size as the target image,
                 resizes the clip mask to match the target.
     Notes:      Distinguish from Image#clip_mask=
 */
 VALUE
-Image_mask_eq(VALUE self, VALUE mask)
+Image_mask(int argc, VALUE *argv, VALUE self)
 {
+    volatile VALUE mask;
     Image *image, *mask_image, *resized_image;
     Image *clip_mask;
     long x, y;
     PixelPacket *q;
     ExceptionInfo exception;
 
-    image = rm_check_frozen(self);
+    image = rm_check_destroyed(self);
+    if (argc == 0)
+    {
+        return get_image_mask(image);
+    }
+    if (argc > 1)
+    {
+        rb_raise(rb_eArgError, "wrong number of arguments (expected 0 or 1, got %d)", argc);
+    }
+
+    rb_check_frozen(self);
+    mask = argv[0];
 
     if (mask != Qnil)
     {
@@ -5771,14 +5936,15 @@ Image_mask_eq(VALUE self, VALUE mask)
         (void) SetImageClipMask(image, NULL);
     }
 
-    return self;
+    // Always return a copy of the mask!
+    return get_image_mask(image);
 }
 
 
 /*
     Method:     Image#matte
     Purpose:    Get matte attribute
-    Notes:      Deprecated as of ImageMagick 6.3.6
+    Notes:      Deprecated as of ImageMagick 6.3.6. See Image#alpha
 */
 VALUE
 Image_matte(VALUE self)
@@ -5793,7 +5959,7 @@ Image_matte(VALUE self)
 /*
     Method:     Image#matte=
     Purpose:    Set matte attribute
-    Notes:      Deprecated as of ImageMagick 6.3.6. Calls Image_matte_eq.
+    Notes:      Deprecated as of ImageMagick 6.3.6. See Image#alpha
 */
 VALUE
 Image_matte_eq(VALUE self, VALUE matte)
@@ -6479,7 +6645,7 @@ Image_opaque_channel(int argc, VALUE *argv, VALUE self)
             fuzz = NUM2DBL(argv[3]);
             if (fuzz < 0.0)
             {
-                rb_raise(rb_eArgError, "fuzz must be >= 0.0", fuzz);
+                rb_raise(rb_eArgError, "fuzz must be >= 0.0 (%g given)", fuzz);
             }
         case 3:
             invert = RTEST(argv[2]);

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.236 2008/01/28 22:31:50 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.247 2008/03/29 15:23:12 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -167,7 +167,6 @@ Magick_init_formats(VALUE class)
   Method:   Magick.limit_resource(resource[, limit])
   Purpose:  Get/set resource limits. If a limit is specified the old limit
             is set to the new value. Either way the current/new limit is returned.
-  Notes:    Don't support "AreaLimit" because GraphicsMagick doesn't support it.
 */
 static VALUE
 Magick_limit_resource(int argc, VALUE *argv, VALUE class)
@@ -187,7 +186,11 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
 
         case T_SYMBOL:
             id = (ID)SYM2ID(resource);
-            if (id == rb_intern("memory"))
+            if (id == rb_intern("area"))
+            {
+                res = AreaResource;
+            }
+            else if (id == rb_intern("memory"))
             {
                 res = MemoryResource;
             }
@@ -215,6 +218,10 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
             {
                 return class;
             }
+            else if (rm_strcasecmp("area", str) == 0)
+            {
+                res = AreaResource;
+            }
             else if (rm_strcasecmp("memory", str) == 0)
             {
                 res = MemoryResource;
@@ -339,12 +346,10 @@ Init_RMagick2(void)
     /*-----------------------------------------------------------------------*/
 
     rm_ID_trace_proc       = rb_intern("@trace_proc");
-    rm_ID__dummy_img_      = rb_intern("_dummy_img_");
     rm_ID_call             = rb_intern("call");
     rm_ID_changed          = rb_intern("changed");
     rm_ID_cur_image        = rb_intern("cur_image");
     rm_ID_dup              = rb_intern("dup");
-    rm_ID_enumerators      = rb_intern("enumerators");
     rm_ID_fill             = rb_intern("fill");
     rm_ID_flag             = rb_intern("flag");
     rm_ID_from_s           = rb_intern("from_s");
@@ -357,7 +362,6 @@ Init_RMagick2(void)
     rm_ID_new              = rb_intern("new");
     rm_ID_push             = rb_intern("push");
     rm_ID_spaceship        = rb_intern("<=>");
-    rm_ID__tmpnam_         = rb_intern("_tmpnam_");
     rm_ID_to_i             = rb_intern("to_i");
     rm_ID_to_s             = rb_intern("to_s");
     rm_ID_values           = rb_intern("values");
@@ -434,7 +438,7 @@ Init_RMagick2(void)
     DCL_ATTR_ACCESSOR(Image, interlace)
     DCL_ATTR_ACCESSOR(Image, iptc_profile)
     DCL_ATTR_ACCESSOR(Image, iterations)        // do not document! Only used by Image#iterations=
-    DCL_ATTR_ACCESSOR(Image, mask)
+    DCL_ATTR_WRITER(Image, mask)
     DCL_ATTR_ACCESSOR(Image, matte)
     DCL_ATTR_ACCESSOR(Image, matte_color)
     DCL_ATTR_READER(Image, mean_error_per_pixel)
@@ -474,6 +478,8 @@ 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, "alpha", Image_alpha, -1);
+    rb_define_method(Class_Image, "alpha?", Image_alpha_q, 0);
     rb_define_method(Class_Image, "[]", Image_aref, 1);
     rb_define_method(Class_Image, "[]=", Image_aset, 2);
     rb_define_method(Class_Image, "auto_orient", Image_auto_orient, 0);
@@ -519,6 +525,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "crop", Image_crop, -1);
     rb_define_method(Class_Image, "crop!", Image_crop_bang, -1);
     rb_define_method(Class_Image, "cycle_colormap", Image_cycle_colormap, 1);
+    rb_define_method(Class_Image, "decipher", Image_decipher, 1);
     rb_define_method(Class_Image, "delete_profile", Image_delete_profile, 1);
     rb_define_method(Class_Image, "despeckle", Image_despeckle, 0);
     rb_define_method(Class_Image, "destroy!", Image_destroy_bang, 0);
@@ -535,6 +542,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "each_profile", Image_each_profile, 0);
     rb_define_method(Class_Image, "edge", Image_edge, -1);
     rb_define_method(Class_Image, "emboss", Image_emboss, -1);
+    rb_define_method(Class_Image, "encipher", Image_encipher, 1);
     rb_define_method(Class_Image, "enhance", Image_enhance, 0);
     rb_define_method(Class_Image, "equalize", Image_equalize, 0);
     rb_define_method(Class_Image, "equalize_channel", Image_equalize_channel, -1);
@@ -569,6 +577,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "magnify", Image_magnify, 0);
     rb_define_method(Class_Image, "magnify!", Image_magnify_bang, 0);
     rb_define_method(Class_Image, "map", Image_map, -1);
+    rb_define_method(Class_Image, "mask", Image_mask, -1);
     rb_define_method(Class_Image, "matte_flood_fill", Image_matte_flood_fill, 5);
     rb_define_method(Class_Image, "median_filter", Image_median_filter, -1);
     rb_define_method(Class_Image, "minify", Image_minify, 0);
@@ -777,6 +786,7 @@ Init_RMagick2(void)
     rb_define_alloc_func(Class_Pixel, Pixel_alloc);
     rb_define_singleton_method(Class_Pixel, "from_color", Pixel_from_color, 1);
     rb_define_singleton_method(Class_Pixel, "from_HSL", Pixel_from_HSL, 1);
+    rb_define_singleton_method(Class_Pixel, "from_hsla", Pixel_from_hsla, -1);
 
     // Define the RGBA attributes
     DCL_ATTR_ACCESSOR(Pixel, red)
@@ -804,6 +814,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Pixel, "intensity", Pixel_intensity, 0);
     rb_define_method(Class_Pixel, "to_color", Pixel_to_color, -1);
     rb_define_method(Class_Pixel, "to_HSL", Pixel_to_HSL, 0);
+    rb_define_method(Class_Pixel, "to_hsla", Pixel_to_hsla, 0);
     rb_define_method(Class_Pixel, "to_s", Pixel_to_s, 0);
 
     /*-----------------------------------------------------------------------*/
@@ -1105,7 +1116,7 @@ Init_RMagick2(void)
 
         // AllCompliance is 0xffff, not too useful for us!
         rb_define_const(Module_Magick, "AllCompliance"
-                  , rm_enum_new(Class_AnchorType
+                  , rm_enum_new(Class_ComplianceType
                   , ID2SYM(rb_intern("AllCompliance"))
                   , INT2FIX(SVGCompliance|X11Compliance|XPMCompliance)));
 
@@ -1186,6 +1197,15 @@ Init_RMagick2(void)
         ENUMERATOR(UndefinedCompression)
         ENUMERATOR(NoCompression)
         ENUMERATOR(BZipCompression)
+#if defined(HAVE_ENUM_DXT1COMPRESSION)
+        ENUMERATOR(DXT1Compression)
+#endif
+#if defined(HAVE_ENUM_DXT3COMPRESSION)
+        ENUMERATOR(DXT3Compression)
+#endif
+#if defined(HAVE_ENUM_DXT5COMPRESSION)
+        ENUMERATOR(DXT5Compression)
+#endif
         ENUMERATOR(FaxCompression)
         ENUMERATOR(Group4Compression)
         ENUMERATOR(JPEGCompression)
@@ -1679,15 +1699,15 @@ static void version_constants(void)
     mgk_version = GetMagickVersion(NULL);
 
     str = rb_str_new2(mgk_version);
-    OBJ_FREEZE(str);
+    rb_obj_freeze(str);
     rb_define_const(Module_Magick, "Magick_version", str);
 
     str = rb_str_new2(Q(RMAGICK_VERSION_STRING));
-    OBJ_FREEZE(str);
+    rb_obj_freeze(str);
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2008/01/28 22:31:50 $) Copyright (C) 2008 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2008/03/29 15:23:12 $) Copyright (C) 2008 by Timothy P. Hunter\n"
             "Built with %s\n"
             "Built for %s\n"
             "Web page: http://rmagick.rubyforge.org\n"
@@ -1695,7 +1715,7 @@ static void version_constants(void)
             Q(RMAGICK_VERSION_STRING), mgk_version, Q(RUBY_VERSION_STRING));
 
     str = rb_str_new2(long_version);
-    OBJ_FREEZE(str);
+    rb_obj_freeze(str);
     rb_define_const(Module_Magick, "Long_version", str);
 
 }