rmagick 2.7.2 → 2.8.0

data/ext/RMagick/rminfo.c

@@ -1,4 +1,4 @@
-/* $Id: rminfo.c,v 1.73 2008/11/13 00:06:57 rmagick Exp $ */
+/* $Id: rminfo.c,v 1.74 2008/11/15 21:30:50 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rminfo.c
@@ -844,6 +844,38 @@ Info_dispose_eq(VALUE self, VALUE disp)
 DEF_ATTR_ACCESSOR(Info, dither, bool)
 
 
+/*
+    Method:     Info#endian
+                Info#endian = Maigck::MSBEndian or LSBEndian
+    Purpose:    Set the Image::Info#endian attribute for reading
+*/
+VALUE
+Info_endian(VALUE self)
+{
+    Info *info;
+
+    Data_Get_Struct(self, Info, info);
+    return EndianType_new(info->endian);
+}
+
+
+VALUE
+Info_endian_eq(VALUE self, VALUE endian)
+{
+    Info *info;
+    EndianType type = UndefinedEndian;
+
+    if (endian != Qnil)
+    {
+        VALUE_TO_ENUM(endian, type, EndianType);
+    }
+
+    Data_Get_Struct(self, Info, info);
+    info->endian = type;
+    return self;
+}
+
+
 /*
     Method:     aString=Info#extract
                 Info#extract=aString
@@ -1451,9 +1483,45 @@ Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
     return self;
 }
 
-DEF_ATTR_ACCESSOR(Info, scene, ulong)
+
+/*
+    Method:     Info#scene
+                Info#scene=
+    Purpose:    Get/Set the scene number
+*/
+VALUE
+Info_scene(VALUE self)
+{
+    Info *info;
+
+    Data_Get_Struct(self, Info, info);
+    return  ULONG2NUM(info->scene);
+}
+
+
+VALUE
+Info_scene_eq(VALUE self, VALUE scene)
+{
+    Info *info;
+    char buf[25];
+
+    Data_Get_Struct(self, Info, info);
+    info->scene = NUM2ULONG(scene);
+
+#if defined(HAVE_SNPRINTF)
+    (void) snprintf(buf, sizeof(buf), "%-ld", info->scene);
+#else
+    (void) sprintf(buf, "%-l", info->scene);
+#endif
+    (void) SetImageOption(info, "scene", buf);
+
+    return self;
+}
+
+
 DEF_ATTR_READER(Info, server_name, str)
 
+
 /*
     Method:     Info#server_name=<aString>
     Purpose:    Set the server name
@@ -1624,6 +1692,39 @@ Info_tile_offset_eq(VALUE self, VALUE offset)
 }
 
 
+/*
+    Method:     Info#transparent_color
+    Purpose:    return the name of the transparent color as a String
+    Note:       Compare with Image#transparent_color!
+*/
+VALUE
+Info_transparent_color(VALUE self)
+{
+    Info *info;
+
+    Data_Get_Struct(self, Info, info);
+    return PixelPacket_to_Color_Name_Info(info, &info->transparent_color);
+}
+
+
+/*
+    Method:     Info#transparent_color=<aString>
+    Purpose:    set the transparent color
+    Raises:     ArgumentError
+*/
+VALUE
+Info_transparent_color_eq(VALUE self, VALUE tc_arg)
+{
+    Info *info;
+    char colorname[MaxTextExtent];
+
+    Data_Get_Struct(self, Info, info);
+    Color_to_PixelPacket(&info->transparent_color, tc_arg);
+    SetImageOption(info, "transparent", pixel_packet_to_hexname(&info->transparent_color, colorname));
+    return self;
+}
+
+
 /*
     Method:     Image::Info#tile_offset
     Purpose:    returns tile_offset attribute values

data/ext/RMagick/rmmain.c

@@ -1,4 +1,4 @@
-/* $Id: rmmain.c,v 1.275 2008/10/30 23:22:46 rmagick Exp $ */
+/* $Id: rmmain.c,v 1.280 2008/12/02 22:57:42 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmmain.c
@@ -169,7 +169,7 @@ 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.
+            is set to the new value. Either way the current/old limit is returned.
 */
 static VALUE
 Magick_limit_resource(int argc, VALUE *argv, VALUE class)
@@ -664,6 +664,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "to_color", Image_to_color, 1);
     rb_define_method(Class_Image, "to_blob", Image_to_blob, 0);
     rb_define_method(Class_Image, "transparent", Image_transparent, -1);
+    rb_define_method(Class_Image, "transparent_chroma", Image_transparent_chroma, -1);
     rb_define_method(Class_Image, "transpose", Image_transpose, 0);
     rb_define_method(Class_Image, "transpose!", Image_transpose_bang, 0);
     rb_define_method(Class_Image, "transverse", Image_transverse, 0);
@@ -893,6 +894,7 @@ Init_RMagick2(void)
     DCL_ATTR_ACCESSOR(Info, depth)
     DCL_ATTR_ACCESSOR(Info, dispose)
     DCL_ATTR_ACCESSOR(Info, dither)
+    DCL_ATTR_ACCESSOR(Info, endian)
     DCL_ATTR_ACCESSOR(Info, extract)
     DCL_ATTR_ACCESSOR(Info, filename)
     DCL_ATTR_ACCESSOR(Info, fill)
@@ -921,6 +923,7 @@ Init_RMagick2(void)
     DCL_ATTR_ACCESSOR(Info, stroke_width)
     DCL_ATTR_WRITER(Info, texture)
     DCL_ATTR_ACCESSOR(Info, tile_offset)
+    DCL_ATTR_ACCESSOR(Info, transparent_color)
     DCL_ATTR_ACCESSOR(Info, undercolor)
     DCL_ATTR_ACCESSOR(Info, units)
     DCL_ATTR_ACCESSOR(Info, view)
@@ -1571,12 +1574,12 @@ Init_RMagick2(void)
         ENUMERATOR(PixelsPerCentimeterResolution)
     END_ENUM
 
-#if defined(HAVE_SPARSECOLORINTERPOLATE)
-    DEF_ENUM(SparseColorInterpolateMethod)
+#if defined(HAVE_SPARSECOLORIMAGE)
+    DEF_ENUM(SparseColorMethod)
         ENUMERATOR(UndefinedColorInterpolate)
         ENUMERATOR(BarycentricColorInterpolate)
         ENUMERATOR(BilinearColorInterpolate)
-        ENUMERATOR(PolynomialColorInterpolate)
+        //ENUMERATOR(PolynomialColorInterpolate)
         ENUMERATOR(ShepardsColorInterpolate)
         ENUMERATOR(VoronoiColorInterpolate)
     END_ENUM
@@ -1777,7 +1780,7 @@ test_Magick_version(void)
         }
 
         rb_raise(rb_eRuntimeError,
-                 "This version of RMagick was created to run with %s %s but %.*s is in use.\n" ,
+                 "This version of RMagick was configured with %s %s but %.*s is in use.\n" ,
                  MagickPackageName, MagickLibVersionText, x, version_str);
     }
 
@@ -1809,7 +1812,7 @@ version_constants(void)
     rb_define_const(Module_Magick, "Version", str);
 
     sprintf(long_version,
-            "This is %s ($Date: 2008/10/30 23:22:46 $) Copyright (C) 2008 by Timothy P. Hunter\n"
+            "This is %s ($Date: 2008/12/02 22:57:42 $) 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.171 2008/11/13 00:02:22 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.172 2008/11/15 21:30:51 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -3477,11 +3477,6 @@ void rm_sync_image_options(Image *image, Info *info)
         image->border_color = info->border_color;
     }
 
-    if (info->colors != 0)
-    {
-        image->colors = info->colors;
-    }
-
     if (info->colorspace != UndefinedColorspace)
     {
         image->colorspace = info->colorspace;
@@ -3562,6 +3557,12 @@ void rm_sync_image_options(Image *image, Info *info)
         image->quality = info->quality;
     }
 
+    option = GetImageOption(info, "scene");
+    if (option)
+    {
+        image->scene = info->scene;
+    }
+
 #if defined(HAVE_ST_TILE_OFFSET)
     option = GetImageOption(info, "tile-offset");
     if (option)
@@ -3570,7 +3571,7 @@ void rm_sync_image_options(Image *image, Info *info)
     }
 #endif
 
-    option = GetImageOption(info, "transparent-color");
+    option = GetImageOption(info, "transparent");
     if (option)
     {
         image->transparent_color = info->transparent_color;

data/rmagick.gemspec

@@ -1,7 +1,7 @@
 require 'date'
 Gem::Specification.new do |s|
   s.name = %q{rmagick}
-  s.version = "2.7.2"
+  s.version = "2.8.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.7.2
+  version: 2.8.0
 platform: ruby
 authors: 
 - Tim Hunter
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-13 00:00:00 -05:00
+date: 2008-12-04 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -119,6 +119,7 @@ files:
 - doc/ex/stegano.rb
 - doc/ex/roundrect.rb
 - doc/ex/wet_floor.rb
+- doc/ex/sparse_color.rb
 - doc/ex/Use02.rb
 - doc/ex/nonzero.rb
 - doc/ex/watermark.rb