rmagick 1.13.0 → 1.14.0

data/ext/RMagick/rminfo.c

@@ -1,4 +1,4 @@
-/* $Id: rminfo.c,v 1.38 2006/05/27 21:05:59 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.42 2006/09/16 19:15:03 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rminfo.c
@@ -261,6 +261,39 @@ Info_border_color_eq(VALUE self, VALUE bc_arg)
     return self;
 }
 
+
+
+/*
+    Method:     Info#channel(channel [, channel...])
+    Purpose:    Set the channels
+    Thanks:     Douglas Sellers
+*/
+VALUE
+Info_channel(int argc, VALUE *argv, VALUE self)
+{
+#if defined(HAVE_IMAGEINFO_CHANNEL)
+    Info *info;
+    ChannelType channels;
+
+    channels = extract_channels(&argc, argv);
+
+    // Ensure all arguments consumed.
+    if (argc > 0)
+    {
+        raise_ChannelType_error(argv[argc-1]);
+    }
+
+    Data_Get_Struct(self, Info, info);
+
+    info->channel = channels;
+    return self;
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
+
 /*
     Method:     Info#colorspace
     Purpose:    Get the colorspace type
@@ -1512,6 +1545,43 @@ Info_size_eq(VALUE self, VALUE size_arg)
 }
 
 
+/*
+    Method:     Image::Info#texture=texture_image
+    Purpose:    Set name of texture to tile onto the image background
+*/
+VALUE
+Info_texture_eq(VALUE self, VALUE texture)
+{
+    Info *info;
+    Image *image;
+    char name[MaxTextExtent];
+
+    Data_Get_Struct(self, Info, info);
+
+    // Delete any existing texture file
+    if (info->texture)
+    {
+        rm_delete_temp_image(info->texture);
+        magick_free(info->texture);
+        info->texture = NULL;
+    }
+
+    // If argument is nil we're done
+    if (texture == Qnil)
+    {
+        return self;
+    }
+
+    // Create a temp copy of the texture and store its name in the texture field
+    Data_Get_Struct(texture, Image, image);
+    rm_write_temp_image(image, name);
+
+    magick_clone_string(&info->texture, name);
+
+    return self;
+}
+
+
 /*
     Method:     Info#undefine
     Purpose:    Undefine image option
@@ -1628,6 +1698,27 @@ Info_view_eq(VALUE self, VALUE view_arg)
     return self;
 }
 
+
+/*
+    Static:     destroy_Info
+    Purpose:    if there is a texture image, delete it before destroying
+                the ImageInfo structure
+*/
+static void
+destroy_Info(void *infoptr)
+{
+    Info *info = (Info *)infoptr;
+
+    if (info->texture)
+    {
+        rm_delete_temp_image(info->texture);
+        magick_free(info->texture);
+        info->texture = NULL;
+    }
+
+    DestroyImageInfo(info);
+}
+
 /*
     Method:     Info.new
     Purpose:    Create an Info object by calling CloneInfo
@@ -1644,7 +1735,7 @@ Info_new(VALUE class)
     {
         rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
     }
-    new_obj = Data_Wrap_Struct(class, NULL, DestroyImageInfo, info);
+    new_obj = Data_Wrap_Struct(class, NULL, destroy_Info, info);
     rb_obj_call_init(new_obj, 0, NULL);
     return new_obj;
 }
@@ -1676,7 +1767,7 @@ Info_alloc(VALUE class)
     {
         rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
     }
-    info_obj = Data_Wrap_Struct(class, NULL, DestroyImageInfo, info);
+    info_obj = Data_Wrap_Struct(class, NULL, destroy_Info, info);
     return info_obj;
 }
 /*

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.124 2006/06/26 23:32:37 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.146 2006/09/27 21:26:35 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -670,11 +670,12 @@ Init_RMagick(void)
     DCL_ATTR_READER(Image, base_columns)
     DCL_ATTR_READER(Image, base_filename)
     DCL_ATTR_READER(Image, base_rows)
+    DCL_ATTR_ACCESSOR(Image, bias)
+    DCL_ATTR_ACCESSOR(Image, black_point_compensation)
     DCL_ATTR_ACCESSOR(Image, blur)
     DCL_ATTR_ACCESSOR(Image, border_color)
     DCL_ATTR_READER(Image, bounding_box)
     DCL_ATTR_ACCESSOR(Image, chromaticity)
-    DCL_ATTR_WRITER(Image, clip_mask)
     DCL_ATTR_ACCESSOR(Image, color_profile)
     DCL_ATTR_READER(Image, colors)
     DCL_ATTR_ACCESSOR(Image, colorspace)
@@ -699,6 +700,7 @@ Init_RMagick(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_ACCESSOR(Image, matte)
     DCL_ATTR_ACCESSOR(Image, matte_color)
     DCL_ATTR_READER(Image, mean_error_per_pixel)
@@ -712,6 +714,7 @@ Init_RMagick(void)
     DCL_ATTR_WRITER(Image, opacity)
     DCL_ATTR_ACCESSOR(Image, orientation)
     DCL_ATTR_ACCESSOR(Image, page)
+    DCL_ATTR_ACCESSOR(Image, pixel_interpolation_method)
 #if defined(HAVE_IMAGE_QUALITY)
     DCL_ATTR_READER(Image, quality)
 #endif
@@ -724,16 +727,21 @@ Init_RMagick(void)
     DCL_ATTR_ACCESSOR(Image, ticks_per_second)
     DCL_ATTR_ACCESSOR(Image, tile_info)
     DCL_ATTR_READER(Image, total_colors)
+    DCL_ATTR_ACCESSOR(Image, transparent_color)
     DCL_ATTR_ACCESSOR(Image, units)
     DCL_ATTR_ACCESSOR(Image, virtual_pixel_method)
     DCL_ATTR_ACCESSOR(Image, x_resolution)
     DCL_ATTR_ACCESSOR(Image, y_resolution)
 
+    rb_define_method(Class_Image, "adaptive_blur", Image_adaptive_blur, -1);
+    rb_define_method(Class_Image, "adaptive_blur_channel", Image_adaptive_blur_channel, -1);
+    rb_define_method(Class_Image, "adaptive_resize", Image_adaptive_resize, -1);
     rb_define_method(Class_Image, "adaptive_sharpen", Image_adaptive_sharpen, -1);
     rb_define_method(Class_Image, "adaptive_sharpen_channel", Image_adaptive_sharpen_channel, -1);
     rb_define_method(Class_Image, "adaptive_threshold", Image_adaptive_threshold, -1);
     rb_define_method(Class_Image, "add_noise", Image_add_noise, 1);
     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, "[]", Image_aref, 1);
     rb_define_method(Class_Image, "[]=", Image_aset, 2);
@@ -742,6 +750,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "properties", Image_properties, 0);
     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, "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);
@@ -778,10 +787,13 @@ Init_RMagick(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, "delete_profile", Image_delete_profile, 1);
     rb_define_method(Class_Image, "despeckle", Image_despeckle, 0);
     rb_define_method(Class_Image, "difference", Image_difference, 1);
     rb_define_method(Class_Image, "dispatch", Image_dispatch, -1);
+    rb_define_method(Class_Image, "displace", Image_displace, -1);
     rb_define_method(Class_Image, "display", Image_display, 0);
+    rb_define_method(Class_Image, "dissolve", Image_dissolve, -1);
     rb_define_method(Class_Image, "distortion_channel", Image_distortion_channel, -1);
     rb_define_method(Class_Image, "_dump", Image__dump, 1);
     rb_define_method(Class_Image, "dup", Image_dup, 0);
@@ -793,6 +805,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "erase!", Image_erase_bang, 0);
     rb_define_method(Class_Image, "export_pixels", Image_export_pixels, -1);
     rb_define_method(Class_Image, "export_pixels_to_str", Image_export_pixels_to_str, -1);
+    rb_define_method(Class_Image, "find_similar_region", Image_find_similar_region, -1);
     rb_define_method(Class_Image, "flip", Image_flip, 0);
     rb_define_method(Class_Image, "flip!", Image_flip_bang, 0);
     rb_define_method(Class_Image, "flop", Image_flop, 0);
@@ -821,7 +834,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "minify!", Image_minify_bang, 0);
     rb_define_method(Class_Image, "modulate", Image_modulate, -1);
     rb_define_method(Class_Image, "monochrome?", Image_monochrome_q, 0);
-    rb_define_method(Class_Image, "motion_blur", Image_motion_blur, 3);
+    rb_define_method(Class_Image, "motion_blur", Image_motion_blur, -1);
     rb_define_method(Class_Image, "negate", Image_negate, -1);
     rb_define_method(Class_Image, "negate_channel", Image_negate_channel, -1);
     rb_define_method(Class_Image, "normalize", Image_normalize, 0);
@@ -847,8 +860,8 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "resize", Image_resize, -1);
     rb_define_method(Class_Image, "resize!", Image_resize_bang, -1);
     rb_define_method(Class_Image, "roll", Image_roll, 2);
-    rb_define_method(Class_Image, "rotate", Image_rotate, 1);
-    rb_define_method(Class_Image, "rotate!", Image_rotate_bang, 1);
+    rb_define_method(Class_Image, "rotate", Image_rotate, -1);
+    rb_define_method(Class_Image, "rotate!", Image_rotate_bang, -1);
     rb_define_method(Class_Image, "sample", Image_sample, -1);
     rb_define_method(Class_Image, "sample!", Image_sample_bang, -1);
     rb_define_method(Class_Image, "scale", Image_scale, -1);
@@ -865,6 +878,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "shear", Image_shear, 2);
     rb_define_method(Class_Image, "sigmoidal_contrast_channel", Image_sigmoidal_contrast_channel, -1);
     rb_define_method(Class_Image, "signature", Image_signature, 0);
+    rb_define_method(Class_Image, "sketch", Image_sketch, -1);
     rb_define_method(Class_Image, "solarize", Image_solarize, -1);
     rb_define_method(Class_Image, "<=>", Image_spaceship, 1);
     rb_define_method(Class_Image, "splice", Image_splice, -1);
@@ -889,9 +903,11 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "transverse!", Image_transverse_bang, 0);
     rb_define_method(Class_Image, "trim", Image_trim, 0);
     rb_define_method(Class_Image, "trim!", Image_trim_bang, 0);
+    rb_define_method(Class_Image, "unique_colors", Image_unique_colors, 0);
     rb_define_method(Class_Image, "unsharp_mask", Image_unsharp_mask, -1);
     rb_define_method(Class_Image, "unsharp_mask_channel", Image_unsharp_mask_channel, -1);
     rb_define_method(Class_Image, "vignette", Image_vignette, -1);
+    rb_define_method(Class_Image, "watermark", Image_watermark, -1);
     rb_define_method(Class_Image, "wave", Image_wave, -1);
     rb_define_method(Class_Image, "white_threshold", Image_white_threshold, -1);
     rb_define_method(Class_Image, "write", Image_write, 1);
@@ -915,7 +931,7 @@ Init_RMagick(void)
     rb_define_method(Class_ImageList, "deconstruct", ImageList_deconstruct, 0);
     rb_define_method(Class_ImageList, "display", ImageList_display, 0);
     rb_define_method(Class_ImageList, "flatten_images", ImageList_flatten_images, 0);
-    rb_define_method(Class_ImageList, "map", ImageList_map, 2);
+    rb_define_method(Class_ImageList, "map", ImageList_map, -1);
     rb_define_method(Class_ImageList, "montage", ImageList_montage, 0);
     rb_define_method(Class_ImageList, "morph", ImageList_morph, 1);
     rb_define_method(Class_ImageList, "mosaic", ImageList_mosaic, 0);
@@ -953,6 +969,7 @@ Init_RMagick(void)
     DCL_ATTR_WRITER(Draw, stroke)
     DCL_ATTR_WRITER(Draw, stroke_width)
     DCL_ATTR_WRITER(Draw, text_antialias)
+    DCL_ATTR_WRITER(Draw, tile)
     DCL_ATTR_WRITER(Draw, undercolor)
 
     rb_define_method(Class_Draw, "annotate", Draw_annotate, 6);
@@ -1065,6 +1082,7 @@ Init_RMagick(void)
 #endif
 
     rb_define_method(Class_Info, "initialize", Info_initialize, 0);
+    rb_define_method(Class_Info, "channel", Info_channel, -1);
     rb_define_method(Class_Info, "freeze", rm_no_freeze, 0);
     rb_define_method(Class_Info, "define", Info_define, -1);
     rb_define_method(Class_Info, "[]=", Info_aset, 3);
@@ -1107,6 +1125,7 @@ Init_RMagick(void)
     DCL_ATTR_ACCESSOR(Info, size)
     DCL_ATTR_ACCESSOR(Info, subimage)   // deprecated >=5.5.6, replaced by scene
     DCL_ATTR_ACCESSOR(Info, subrange)   // deprecated >=5.5.6, replaced by number_scenes
+    DCL_ATTR_WRITER(Info, texture)
     DCL_ATTR_ACCESSOR(Info, tile)       // deprecated >=5.5.6, replaced by extract and scenes
     DCL_ATTR_ACCESSOR(Info, image_type)
     DCL_ATTR_ACCESSOR(Info, units)
@@ -1205,6 +1224,8 @@ Init_RMagick(void)
         ENUMERATOR(BlueChannel)
         ENUMERATOR(YellowChannel)
         ENUMERATOR(OpacityChannel)
+
+
         ENUMERATOR(BlackChannel)
         ENUMERATOR(MatteChannel)
 #if defined(HAVE_INDEXCHANNEL)
@@ -1216,6 +1237,29 @@ Init_RMagick(void)
 #if defined(HAVE_ALLCHANNELS)
         ENUMERATOR(AllChannels)
 #endif
+
+        // Define alternate names for ChannelType enums for Image::Info#channel=
+        // AlphaChannel == OpacityChannel
+        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("AlphaChannel")), INT2FIX(OpacityChannel));
+        rb_define_const(Module_Magick, "AlphaChannel", _enum);
+
+        // DefaultChannels
+        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("DefaultChannels")), INT2FIX(0xff & ~OpacityChannel));
+        rb_define_const(Module_Magick, "DefaultChannels", _enum);
+
+        // HueChannel == RedChannel
+        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("HueChannel")), INT2FIX(RedChannel));
+        rb_define_const(Module_Magick, "HueChannel", _enum);
+
+        // LuminosityChannel = BlueChannel
+        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("LuminosityChannel")), INT2FIX(BlueChannel));
+        rb_define_const(Module_Magick, "LuminosityChannel", _enum);
+
+        // SaturationChannel = GreenChannel
+        _enum = rm_enum_new(Class_ChannelType, ID2SYM(rb_intern("SaturationChannel")), INT2FIX(GreenChannel));
+        rb_define_const(Module_Magick, "SaturationChannel", _enum);
+
+
     END_ENUM
 
     // ClassType constants
@@ -1461,6 +1505,19 @@ Init_RMagick(void)
         ENUMERATOR(PartitionInterlace)
     END_ENUM
 
+#if defined(HAVE_INTERPOLATEPIXELCOLOR)
+    DEF_ENUM(InterpolatePixelMethod)
+        ENUMERATOR(UndefinedInterpolatePixel)
+        ENUMERATOR(AverageInterpolatePixel)
+        ENUMERATOR(BicubicInterpolatePixel)
+        ENUMERATOR(BilinearInterpolatePixel)
+        ENUMERATOR(FilterInterpolatePixel)
+        ENUMERATOR(IntegerInterpolatePixel)
+        ENUMERATOR(MeshInterpolatePixel)
+        ENUMERATOR(NearestNeighborInterpolatePixel)
+    END_ENUM
+#endif
+
 #if defined(HAVE_COMPAREIMAGELAYERS)
     DEF_ENUM(MagickLayerMethod)
         ENUMERATOR(UndefinedLayer)
@@ -1563,6 +1620,10 @@ Init_RMagick(void)
         ENUMERATOR(AndQuantumOperator)
         ENUMERATOR(DivideQuantumOperator)
         ENUMERATOR(LShiftQuantumOperator)
+#if defined(HAVE_MAXEVALUATEOPERATOR)
+        ENUMERATOR(MaxQuantumOperator)
+        ENUMERATOR(MinQuantumOperator)
+#endif
         ENUMERATOR(MultiplyQuantumOperator)
         ENUMERATOR(OrQuantumOperator)
         ENUMERATOR(RShiftQuantumOperator)
@@ -1799,7 +1860,7 @@ static void version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-        "This is %s ($Date: 2006/06/26 23:32:37 $) Copyright (C) 2006 by Timothy P. Hunter\n"
+        "This is %s ($Date: 2006/09/27 21:26:35 $) Copyright (C) 2006 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.78 2006/06/28 23:07:55 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.83 2006/09/27 21:26:36 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2006 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -574,8 +574,7 @@ Pixel_to_HSL(VALUE self)
     volatile VALUE hsl;
 
     Data_Get_Struct(self, Pixel, pixel);
-    TransformHSL(pixel->red, pixel->green, pixel->blue,
-                 &hue, &saturation, &luminosity);
+    TransformHSL(pixel->red, pixel->green, pixel->blue, &hue, &saturation, &luminosity);
 
     hsl = rb_ary_new3(3, rb_float_new(hue), rb_float_new(saturation),
                       rb_float_new(luminosity));
@@ -1076,6 +1075,27 @@ Color_Name_to_PixelPacket(PixelPacket *color, VALUE name_arg)
     }
 }
 
+
+/*
+    Extern:     Pixel_from_MagickPixelPacket
+    Purpose:    Create a Magick::Pixel from a MagickPixelPacket structure
+*/
+#if defined(HAVE_MAGICKPIXELPACKET)
+VALUE
+Pixel_from_MagickPixelPacket(MagickPixelPacket *mpp)
+{
+    PixelPacket pixel;
+
+    pixel.red = RoundToQuantum(mpp->red);
+    pixel.green = RoundToQuantum(mpp->green);
+    pixel.blue = RoundToQuantum(mpp->blue);
+    pixel.opacity = RoundToQuantum(mpp->opacity);
+
+    return Pixel_from_PixelPacket(&pixel);
+}
+#endif
+
+
 /*
     Extern:     AffineMatrix_to_AffineMatrix
     Purpose:    Convert a Magick::AffineMatrix object to a AffineMatrix structure.
@@ -1102,7 +1122,7 @@ AffineMatrix_to_AffineMatrix(AffineMatrix *am, VALUE st)
     am->sy = v == Qnil ? 1.0 : NUM2DBL(v);
     v = rb_ary_entry(values, 4);
     am->tx = v == Qnil ? 0.0 : NUM2DBL(v);
-    v = rb_ary_entry(values, 4);
+    v = rb_ary_entry(values, 5);
     am->ty = v == Qnil ? 0.0 : NUM2DBL(v);
 }
 
@@ -1569,6 +1589,44 @@ InterlaceType_new(InterlaceType interlace)
 }
 
 
+/*
+    Static:     InterpolatePixelMethod_name
+    Purpose:    Return the name of a InterpolatePixelMethod enum as a string
+*/
+#if defined(HAVE_INTERPOLATEPIXELCOLOR)
+static const char *
+InterpolatePixelMethod_name(InterpolatePixelMethod interpolate)
+{
+    switch(interpolate)
+    {
+        default:
+        ENUM_TO_NAME(UndefinedInterpolatePixel)
+        ENUM_TO_NAME(AverageInterpolatePixel)
+        ENUM_TO_NAME(BicubicInterpolatePixel)
+        ENUM_TO_NAME(BilinearInterpolatePixel)
+        ENUM_TO_NAME(FilterInterpolatePixel)
+        ENUM_TO_NAME(IntegerInterpolatePixel)
+        ENUM_TO_NAME(MeshInterpolatePixel)
+        ENUM_TO_NAME(NearestNeighborInterpolatePixel)
+    }
+}
+
+
+/*
+    External:   InterpolatePixelMethod_new
+    Purpose:    Construct an InterpolatePixelMethod enum object for the specified value.
+*/
+VALUE
+InterpolatePixelMethod_new(InterpolatePixelMethod interpolate)
+{
+    const char *name;
+
+    name = InterpolatePixelMethod_name(interpolate);
+    return rm_enum_new(Class_InterpolatePixelMethod, ID2SYM(rb_intern(name)), INT2FIX(interpolate));
+}
+#endif
+
+
 /*
     External:   MagickLayerMethod_new
     Purpose:    Construct an MagickLayerMethod enum object for the specified value.
@@ -2860,15 +2918,15 @@ rm_not_implemented(void)
 }
 
 /*
-    Static:     raise_error(msg, loc)
+    Static:     rm_magick_error(msg, loc)
     Purpose:    create a new ImageMagickError object and raise an exception
     Notes:      does not return
                 This funky technique allows me to safely add additional
                 information to the ImageMagickError object in both 1.6.8 and
                 1.8.0. See www.ruby_talk.org/36408.
 */
-static void
-raise_error(const char *msg, const char *loc)
+void
+rm_magick_error(const char *msg, const char *loc)
 {
     volatile VALUE exc, mesg, extra;
 
@@ -3321,11 +3379,11 @@ handle_exception(ExceptionInfo *exception, Image *imglist, ErrorRetention retent
      extra[sizeof(extra)-1] = '\0';
 
      DestroyExceptionInfo(exception);
-     raise_error(msg, extra);
+     rm_magick_error(msg, extra);
 
 #else
      DestroyExceptionInfo(exception);
-     raise_error(msg, NULL);
+     rm_magick_error(msg, NULL);
 #endif
 
 }