rmagick 1.14.1 → 1.15.0

data/ext/RMagick/rminfo.c

@@ -1,6 +1,6 @@
-/* $Id: rminfo.c,v 1.42 2006/09/16 19:15:03 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.45 2007/01/12 00:11:19 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2006 by Timothy P. Hunter
+|                Copyright (C) 2007 by Timothy P. Hunter
 | Name:     rminfo.c
 | Author:   Tim Hunter
 | Purpose:  Info class method definitions for RMagick.
@@ -141,7 +141,7 @@ Info_aset(VALUE self, VALUE format, VALUE key, VALUE value)
     GetExceptionInfo(&exception);
     okay = AddDefinitions(info, definitions, &exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
     if (!okay)
     {
@@ -444,7 +444,7 @@ Info_define(int argc, VALUE *argv, VALUE self)
     GetExceptionInfo(&exception);
     okay = AddDefinitions(info, definitions, &exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
     if (!okay)
     {
@@ -500,8 +500,7 @@ Info_delay(VALUE self)
 static VALUE
 arg_is_integer(VALUE arg)
 {
-    double d;
-    d = NUM2INT(arg);
+    int d = NUM2INT(arg);
     d = d;      // satisfy icc
     return arg;
 }
@@ -530,7 +529,7 @@ Info_delay_eq(VALUE self, VALUE string)
     else
     {
         not_num = 0;
-        rb_protect(arg_is_integer, string, &not_num);
+        (void) rb_protect(arg_is_integer, string, &not_num);
         if (not_num)
         {
             rb_raise(rb_eTypeError, "failed to convert %s into Integer", rb_class2name(CLASS_OF(string)));
@@ -592,10 +591,10 @@ VALUE
 Info_depth_eq(VALUE self, VALUE depth)
 {
     Info *info;
-    int d;
+    unsigned long d;
 
     Data_Get_Struct(self, Info, info);
-    d = NUM2INT(depth);
+    d = NUM2ULONG(depth);
     switch (d)
     {
         case 8:                     // always okay
@@ -951,7 +950,7 @@ VALUE Info_format(VALUE self)
     {
         GetExceptionInfo(&exception);
         magick_info = GetMagickInfo(info->magick, &exception);
-        DestroyExceptionInfo(&exception);
+        (void) DestroyExceptionInfo(&exception);
 
         return magick_info ? rb_str_new2(magick_info->name) : Qnil;
     }
@@ -978,7 +977,7 @@ Info_format_eq(VALUE self, VALUE magick)
     mgk = STRING_PTR(magick);
     m = GetMagickInfo(mgk, &exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
     if (!m)
     {
@@ -1299,6 +1298,69 @@ Info_orientation_eq(VALUE self, VALUE inter)
 #endif
 }
 
+
+/*
+    Method:     Info#origin
+    Purpose:    Return origin geometry
+*/
+VALUE
+Info_origin(VALUE self)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    const char *origin;
+
+    Data_Get_Struct(self, Info, info);
+
+    origin = GetImageOption(info, "origin");
+    return origin ? rb_str_new2(origin) : Qnil;
+
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
+
+/*
+    Method:     Info#origin=+-x+-y
+    Purpose:    Set origin geometry. Argument may be a Geometry object as well
+                as a geometry string.
+*/
+VALUE
+Info_origin_eq(VALUE self, VALUE origin_arg)
+{
+#if defined(HAVE_SETIMAGEOPTION)
+    Info *info;
+    volatile VALUE origin_str;
+    char *origin;
+
+    Data_Get_Struct(self, Info, info);
+
+    if (NIL_P(origin_arg))
+    {
+        (void) RemoveImageOption(info, "origin");
+        return self;
+    }
+
+    origin_str = rb_funcall(origin_arg, ID_to_s, 0);
+    origin = GetPageGeometry(STRING_PTR(origin_str));
+
+    if (IsGeometry(origin) == MagickFalse)
+    {
+        rb_raise(rb_eArgError, "invalid origin geometry: %s", origin);
+    }
+
+    (void) SetImageOption(info, "origin", origin);
+    return self;
+
+#else
+    rm_not_implemented();
+    return (VALUE)0;
+#endif
+}
+
+
 VALUE
 Info_page(VALUE self)
 {
@@ -1307,7 +1369,6 @@ Info_page(VALUE self)
 
     Data_Get_Struct(self, Info, info);
 #if defined(HAVE_SETIMAGEOPTION)
-
     page = GetImageOption(info, "page");
 #else
     page = (const char *)info->page;
@@ -1351,7 +1412,7 @@ Info_page_eq(VALUE self, VALUE page_arg)
 }
 
 DEF_ATTR_ACCESSOR(Info, pointsize, dbl)
-DEF_ATTR_ACCESSOR(Info, quality, long)
+DEF_ATTR_ACCESSOR(Info, quality, ulong)
 
 /*
     Method:     Info#sampling_factor, #sampling_factor=
@@ -1716,7 +1777,7 @@ destroy_Info(void *infoptr)
         info->texture = NULL;
     }
 
-    DestroyImageInfo(info);
+    (void) DestroyImageInfo(info);
 }
 
 /*
@@ -1795,7 +1856,7 @@ Info_initialize(VALUE self)
     if (rb_block_given_p())
     {
         // Run the block in self's context
-        rb_obj_instance_eval(0, NULL, self);
+        (void) rb_obj_instance_eval(0, NULL, self);
     }
     return self;
 }

data/ext/RMagick/rmmain.c

@@ -1,6 +1,6 @@
-/* $Id: rmmain.c,v 1.147 2006/10/21 13:43:23 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.159 2007/01/20 15:45:29 rmagick Exp $ */
 /*============================================================================\
-|                Copyright (C) 2006 by Timothy P. Hunter
+|                Copyright (C) 2007 by Timothy P. Hunter
 | Name:     rmmain.c
 | Author:   Tim Hunter
 | Purpose:  Contains all module, class, method declarations.
@@ -44,7 +44,7 @@ Magick_colors(VALUE class)
 
     color_ary = GetColorInfoArray(&exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
 
     if (rb_block_given_p())
@@ -89,7 +89,7 @@ Magick_colors(VALUE class)
 
     color_info_list = GetColorInfoList("*", &number_colors, &exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
 #endif
 
@@ -98,7 +98,7 @@ Magick_colors(VALUE class)
     {
         for(x = 0; x < number_colors; x++)
         {
-            rb_yield(Color_from_ColorInfo(color_info_list[x]));
+            (void) rb_yield(Color_from_ColorInfo(color_info_list[x]));
         }
         magick_free(color_info_list);
         return class;
@@ -108,7 +108,7 @@ Magick_colors(VALUE class)
         ary = rb_ary_new2((long) number_colors);
         for(x = 0; x < number_colors; x++)
         {
-            rb_ary_push(ary, Color_from_ColorInfo(color_info_list[x]));
+            (void) rb_ary_push(ary, Color_from_ColorInfo(color_info_list[x]));
         }
 
         magick_free(color_info_list);
@@ -125,7 +125,7 @@ Magick_colors(VALUE class)
     GetExceptionInfo(&exception);
 
     color_list = GetColorInfo("*", &exception);
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
     // The order of the colors list can change in mid-iteration,
     // so the only way we can guarantee a single pass thru the list
@@ -179,7 +179,7 @@ Magick_fonts(VALUE class)
     GetExceptionInfo(&exception);
     type_info = GetTypeInfoList("*", &number_types, &exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
 #endif
 
@@ -187,17 +187,17 @@ Magick_fonts(VALUE class)
     {
         for(x = 0; x < number_types; x++)
         {
-            rb_yield(Font_from_TypeInfo((TypeInfo *)type_info[x]));
+            (void) rb_yield(Font_from_TypeInfo((TypeInfo *)type_info[x]));
         }
         magick_free(type_info);
         return class;
     }
     else
     {
-        ary = rb_ary_new2(number_types);
+        ary = rb_ary_new2((long)number_types);
         for(x = 0; x < number_types; x++)
         {
-            rb_ary_push(ary, Font_from_TypeInfo((TypeInfo *)type_info[x]));
+            (void) rb_ary_push(ary, Font_from_TypeInfo((TypeInfo *)type_info[x]));
         }
         magick_free(type_info);
         return ary;
@@ -214,7 +214,7 @@ Magick_fonts(VALUE class)
 
     type_list = GetTypeInfo("*", &exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
     // If block, iterate over fonts
     if (rb_block_given_p())
@@ -288,7 +288,7 @@ Magick_init_formats(VALUE class)
     GetExceptionInfo(&exception);
     magick_info = (MagickInfo *)GetMagickInfoArray(&exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
     for(m = magick_info; m != NULL; m = m->next)
     {
@@ -318,15 +318,15 @@ Magick_init_formats(VALUE class)
     GetExceptionInfo(&exception);
     magick_info = GetMagickInfoList("*", &number_formats, &exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
 #endif
 
     for(x = 0; x < number_formats; x++)
     {
-        rb_hash_aset(formats
-            , rb_str_new2(magick_info[x]->name)
-            , MagickInfo_to_format((MagickInfo *)magick_info[x]));
+        (void) rb_hash_aset(formats
+                          , rb_str_new2(magick_info[x]->name)
+                          , MagickInfo_to_format((MagickInfo *)magick_info[x]));
     }
     return formats;
 
@@ -343,7 +343,7 @@ Magick_init_formats(VALUE class)
     GetExceptionInfo(&exception);
     m = (MagickInfo *)GetMagickInfo("*", &exception);
     CHECK_EXCEPTION()
-    DestroyExceptionInfo(&exception);
+    (void) DestroyExceptionInfo(&exception);
 
     for ( ; m != NULL; m = m->next)
     {
@@ -380,7 +380,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
             return class;
 
         case T_SYMBOL:
-            id = SYM2ID(resource);
+            id = (ID)SYM2ID(resource);
             if (id == rb_intern("memory"))
             {
                 res = MemoryResource;
@@ -436,7 +436,7 @@ Magick_limit_resource(int argc, VALUE *argv, VALUE class)
 
     if (argc > 1)
     {
-        SetMagickResourceLimit(res, NUM2ULONG(limit));
+        (void) SetMagickResourceLimit(res, NUM2ULONG(limit));
     }
 
     return ULONG2NUM(cur_limit);
@@ -532,8 +532,8 @@ static VALUE
 Magick_set_cache_threshold(VALUE class, VALUE threshold)
 {
     unsigned long thrshld = NUM2ULONG(threshold);
-    SetMagickResourceLimit(MemoryResource,thrshld);
-    SetMagickResourceLimit(MapResource,2*thrshld);
+    (void) SetMagickResourceLimit(MemoryResource,thrshld);
+    (void) SetMagickResourceLimit(MapResource,2*thrshld);
     return class;
 }
 
@@ -825,6 +825,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "inspect", Image_inspect, 0);
     rb_define_method(Class_Image, "level2", Image_level2, -1);
     rb_define_method(Class_Image, "level_channel", Image_level_channel, -1);
+    rb_define_method(Class_Image, "linear_stretch", Image_linear_stretch, -1);
     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);
@@ -845,6 +846,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "ordered_dither", Image_ordered_dither, -1);
     rb_define_method(Class_Image, "palette?", Image_palette_q, 0);
     rb_define_method(Class_Image, "pixel_color", Image_pixel_color, -1);
+    rb_define_method(Class_Image, "polaroid", Image_polaroid, -1);
     rb_define_method(Class_Image, "posterize", Image_posterize, -1);
 //  rb_define_method(Class_Image, "plasma", Image_plasma, 6);
     rb_define_method(Class_Image, "preview", Image_preview, 1);
@@ -856,6 +858,7 @@ Init_RMagick(void)
     rb_define_method(Class_Image, "raise", Image_raise, -1);
     rb_define_method(Class_Image, "random_channel_threshold", Image_random_channel_threshold, 2);
     rb_define_method(Class_Image, "random_threshold_channel", Image_random_threshold_channel, -1);
+    rb_define_method(Class_Image, "recolor", Image_recolor, 1);
     rb_define_method(Class_Image, "reduce_noise", Image_reduce_noise, 1);
     rb_define_method(Class_Image, "resize", Image_resize, -1);
     rb_define_method(Class_Image, "resize!", Image_resize_bang, -1);
@@ -909,6 +912,7 @@ Init_RMagick(void)
     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, "wet_floor", Image_wet_floor, -1);
     rb_define_method(Class_Image, "white_threshold", Image_white_threshold, -1);
     rb_define_method(Class_Image, "write", Image_write, 1);
 
@@ -931,6 +935,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, "fx", ImageList_fx, -1);
     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);
@@ -953,7 +958,6 @@ Init_RMagick(void)
 
     DCL_ATTR_WRITER(Draw, affine)
     DCL_ATTR_WRITER(Draw, align)
-    DCL_ATTR_WRITER(Draw, border_color)
     DCL_ATTR_WRITER(Draw, decorate)
     DCL_ATTR_WRITER(Draw, density)
     DCL_ATTR_WRITER(Draw, encoding)
@@ -984,6 +988,42 @@ Init_RMagick(void)
     rb_define_method(Class_Draw, "inspect", Draw_inspect, 0);
     rb_define_method(Class_Draw, "primitive", Draw_primitive, 1);
 
+    /*-----------------------------------------------------------------------*/
+    /* Class Magick::DrawOptions is identical to Magick::Draw but with       */
+    /* only the attribute writer methods. This is the object that is passed  */
+    /* to the block associated with the Draw.new method call.                */
+    /*-----------------------------------------------------------------------*/
+
+    Class_DrawOptions = rb_define_class_under(Class_Image, "DrawOptions", rb_cObject);
+
+#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
+    rb_define_alloc_func(Class_DrawOptions, DrawOptions_alloc);
+#else
+    rb_define_singleton_method(Class_DrawOptions, "new", DrawOptions_new, 0);
+#endif
+
+    rb_define_method(Class_DrawOptions, "initialize", DrawOptions_initialize, 0);
+
+    SHARE_ATTR_WRITER(DrawOptions, Draw, affine)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, align)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, decorate)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, density)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, encoding)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, fill)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, font)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, font_family)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, font_stretch)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, font_style)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, font_weight)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, gravity)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, pointsize)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, rotation)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, stroke)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, stroke_width)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, text_antialias)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, tile)
+    SHARE_ATTR_WRITER(DrawOptions, Draw, undercolor)
+
     /*-----------------------------------------------------------------------*/
     /* Class Magick::Pixel                                                   */
     /*-----------------------------------------------------------------------*/
@@ -991,7 +1031,7 @@ Init_RMagick(void)
     Class_Pixel = rb_define_class_under(Module_Magick, "Pixel", rb_cObject);
 
     // include Observable in Pixel for Image::View class
-    rb_require("observer");
+    (void) rb_require("observer");
     observable = rb_const_get(rb_cObject, rb_intern("Observable"));
     rb_include_module(Class_Pixel, observable);
 
@@ -1116,6 +1156,7 @@ Init_RMagick(void)
     DCL_ATTR_ACCESSOR(Info, monochrome)
     DCL_ATTR_ACCESSOR(Info, number_scenes)  // new in 5.5.6, replaces subrange
     DCL_ATTR_ACCESSOR(Info, orientation)    // new in 6.0.0
+    DCL_ATTR_ACCESSOR(Info, origin)         // new in 6.3.1
     DCL_ATTR_ACCESSOR(Info, page)
     DCL_ATTR_ACCESSOR(Info, pointsize)
     DCL_ATTR_ACCESSOR(Info, quality)
@@ -1131,6 +1172,41 @@ Init_RMagick(void)
     DCL_ATTR_ACCESSOR(Info, units)
     DCL_ATTR_ACCESSOR(Info, view)
 
+
+    /*-----------------------------------------------------------------------*/
+    /* Class Magick::Image::PolaroidOptions                                  */
+    /*-----------------------------------------------------------------------*/
+
+    Class_PolaroidOptions = rb_define_class_under(Class_Image, "PolaroidOptions", rb_cObject);
+
+#if defined(HAVE_RB_DEFINE_ALLOC_FUNC)
+    rb_define_alloc_func(Class_PolaroidOptions, PolaroidOptions_alloc);
+#else
+    rb_define_singleton_method(Class_PolaroidOptions, "new", PolaroidOptions_new, 0);
+#endif
+
+    rb_define_method(Class_PolaroidOptions, "initialize", PolaroidOptions_initialize, 0);
+
+    DCL_ATTR_WRITER(PolaroidOptions, shadow_color)
+    // The other attribute writer methods are implemented by Draw's functions
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, align)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, decorate)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, density)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, encoding)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, fill)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, font)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, font_family)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, font_stretch)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, font_style)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, font_weight)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, gravity)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, pointsize)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, stroke)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, stroke_width)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, text_antialias)
+    SHARE_ATTR_WRITER(PolaroidOptions, Draw, undercolor)
+
+
     /*-----------------------------------------------------------------------*/
     /* Magick::******Fill classes and methods                                */
     /*-----------------------------------------------------------------------*/
@@ -1345,12 +1421,10 @@ Init_RMagick(void)
         ENUMERATOR(CopyGreenCompositeOp)
         ENUMERATOR(CopyOpacityCompositeOp)
         ENUMERATOR(CopyRedCompositeOp)
-#if defined(HAVE_COPYCYANCOMPOSITEOP)   // CYMK added 5.5.7
         ENUMERATOR(CopyCyanCompositeOp)
         ENUMERATOR(CopyMagentaCompositeOp)
         ENUMERATOR(CopyYellowCompositeOp)
         ENUMERATOR(CopyBlackCompositeOp)
-#endif
         ENUMERATOR(DarkenCompositeOp)
         ENUMERATOR(DifferenceCompositeOp)
         ENUMERATOR(DisplaceCompositeOp)
@@ -1494,6 +1568,9 @@ Init_RMagick(void)
         ENUMERATOR(ColorSeparationType)
         ENUMERATOR(ColorSeparationMatteType)
         ENUMERATOR(OptimizeType)
+#if defined(HAVE_PALETTEBILEVELMATTETYPE)
+        ENUMERATOR(PaletteBilevelMatteType)
+#endif
     END_ENUM
 
     // InterlaceType constants
@@ -1851,15 +1928,15 @@ static void version_constants(void)
     mgk_version = GetMagickVersion(NULL);
 
     str = rb_str_new2(mgk_version);
-    rb_obj_freeze(str);
+    (void) rb_obj_freeze(str);
     rb_define_const(Module_Magick, "Magick_version", str);
 
     str = rb_str_new2(PACKAGE_STRING);
-    rb_obj_freeze(str);
+    (void) rb_obj_freeze(str);
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-        "This is %s ($Date: 2006/10/21 13:43:23 $) Copyright (C) 2006 by Timothy P. Hunter\n"
+        "This is %s ($Date: 2007/01/20 15:45:29 $) Copyright (C) 2007 by Timothy P. Hunter\n"
         "Built with %s\n"
         "Built for %s\n"
         "Web page: http://rmagick.rubyforge.org\n"
@@ -1867,7 +1944,7 @@ static void version_constants(void)
         PACKAGE_STRING, mgk_version, RUBY_VERSION_STRING);
 
     str = rb_str_new2(long_version);
-    rb_obj_freeze(str);
+    (void) rb_obj_freeze(str);
     rb_define_const(Module_Magick, "Long_version", str);
 
 }