rmagick 2.2.2 → 2.3.0

data/ext/RMagick/rmutil.c

@@ -1,4 +1,4 @@
-/* $Id: rmutil.c,v 1.146 2008/01/20 17:29:42 rmagick Exp $ */
+/* $Id: rmutil.c,v 1.153 2008/03/29 15:19:15 rmagick Exp $ */
 /*============================================================================\
 |                Copyright (C) 2008 by Timothy P. Hunter
 | Name:     rmutil.c
@@ -18,6 +18,7 @@ static VALUE Enum_type_inspect(VALUE);
 static void handle_exception(ExceptionInfo *, Image *, ErrorRetention);
 static VALUE Pixel_from_MagickPixelPacket(MagickPixelPacket *);
 
+#define ENUMERATORS_CLASS_VAR "@@enumerators"
 
 /*
     Extern:     magick_safe_malloc, magick_malloc, magick_free, magick_realloc
@@ -229,7 +230,7 @@ rm_no_freeze(VALUE obj)
 
 /*
     Extern:     rm_str2cstr(str, &len);
-    Purpose:    Supply our own version of the "obsolete" rm_str2cstr.
+    Purpose:    Supply our own version of the "obsolete" rb_str2cstr.
 */
 char *
 rm_str2cstr(VALUE str, long *len)
@@ -569,10 +570,27 @@ Pixel_from_color(VALUE class, VALUE name)
     return Pixel_from_PixelPacket(&pp);
 }
 
+
 /*
-    Method:     Magick::Pixel#to_color(compliance=Magick::???Compliance,
-                                      matte=False
-                                      depth=QuantumDepth)
+    Static:     rm_set_magick_pixel_packet
+    Purpose:    Convert a PixelPacket to a MagickPixelPacket
+    Notes:      Same code as the private function SetMagickPixelPacket
+                in ImageMagick.
+*/
+static void rm_set_magick_pixel_packet(Pixel *pixel, IndexPacket *index, MagickPixelPacket *pp)
+{
+    pp->red     = (MagickRealType) pixel->red;
+    pp->green   = (MagickRealType) pixel->green;
+    pp->blue    = (MagickRealType) pixel->blue;
+    pp->opacity = (MagickRealType) (pp->matte ? pixel->opacity : OpaqueOpacity);
+    pp->index   = (MagickRealType) ((pp->colorspace == CMYKColorspace) && (index ? *index : 0));
+}
+
+
+
+/*
+    Method:     Magick::Pixel#to_color(compliance=AllCompliance, matte=false,
+                                       depth=QuantumDepth, hex=false)
     Purpose:    return the color name corresponding to the pixel values
     Notes:      the conversion respects the value of the 'opacity' field
                 in the Pixel.
@@ -583,6 +601,8 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     Info *info;
     Image *image;
     Pixel *pixel;
+    MagickPixelPacket mpp;
+    MagickBooleanType hex = MagickFalse;
     char name[MaxTextExtent];
     ExceptionInfo exception;
     ComplianceType compliance = AllCompliance;
@@ -591,6 +611,8 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
 
     switch (argc)
     {
+        case 4:
+            hex = RTEST(argv[3]);
         case 3:
             depth = NUM2UINT(argv[2]);
 
@@ -626,8 +648,12 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     image->depth = depth;
     image->matte = matte;
     (void) DestroyImageInfo(info);
+
+    GetMagickPixelPacket(image, &mpp);
+    rm_set_magick_pixel_packet(pixel, NULL, &mpp);
+
     GetExceptionInfo(&exception);
-    (void) QueryColorname(image, pixel, compliance, name, &exception);
+    (void) QueryMagickColorname(image, &mpp, compliance, hex, name, &exception);
     (void) DestroyImage(image);
     CHECK_EXCEPTION()
     (void) DestroyExceptionInfo(&exception);
@@ -637,7 +663,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
 }
 
 /*
-    Method:     Pixel#to_HSL
+    Method:     Pixel#to_HSL    *** DEPRECATED ***
     Purpose:    Converts an RGB pixel to the array
                 [hue, saturation, luminosity].
 */
@@ -650,6 +676,7 @@ Pixel_to_HSL(VALUE self)
 
     Data_Get_Struct(self, Pixel, pixel);
 #if defined(HAVE_CONVERTRGBTOHSL)
+    rb_warning("Pixel#to_HSL is deprecated; use to_hsla");
     ConvertRGBToHSL(pixel->red, pixel->green, pixel->blue, &hue, &saturation, &luminosity);
 #else
     TransformHSL(pixel->red, pixel->green, pixel->blue, &hue, &saturation, &luminosity);
@@ -662,7 +689,7 @@ Pixel_to_HSL(VALUE self)
 }
 
 /*
-    Method:     Pixel.from_HSL
+    Method:     Pixel.from_HSL  *** DEPRECATED ***
     Purpose:    Constructs an RGB pixel from the array
                 [hue, saturation, luminosity].
 */
@@ -686,6 +713,7 @@ Pixel_from_HSL(VALUE class, VALUE hsl)
     luminosity = NUM2DBL(rb_ary_entry(hsl, 2));
 
 #if defined(HAVE_CONVERTHSLTORGB)
+    rb_warning("Pixel#from_HSL is deprecated; use from_hsla");
     ConvertHSLToRGB(hue, saturation, luminosity,
                  &rgb.red, &rgb.green, &rgb.blue);
 #else
@@ -695,6 +723,119 @@ Pixel_from_HSL(VALUE class, VALUE hsl)
     return Pixel_from_PixelPacket(&rgb);
 }
 
+
+
+/*
+    Method:     Pixel#from_hsla(hue, saturation, lightness, alpha=1)
+    Purpose:    Replace brain-dead from_HSL, above.
+    Notes:      0 <= hue < 360, 0 <= saturation <= 1, 0 <= lightness <= 1
+                0 <= alpha <= 1 (0 is transparent, 1 is opaque)
+*/
+VALUE
+Pixel_from_hsla(int argc, VALUE *argv, VALUE class)
+{
+    double h, s, l, a = 1.0;
+    MagickPixelPacket pp;
+    ExceptionInfo exception;
+    char name[50];
+    MagickBooleanType alpha = MagickFalse;
+
+    class = class;          // defeat "unused parameter" message.
+
+    switch (argc)
+    {
+        case 4:
+            a = NUM2DBL(argv[3]);
+            alpha = MagickTrue;
+        case 3:
+            l = NUM2DBL(argv[2]);
+            s = NUM2DBL(argv[1]);
+            h = NUM2DBL(argv[0]);
+            break;
+        default:
+            rb_raise(rb_eArgError, "wrong number of arguments (%d for 3 or 4)", argc);
+            break;
+    }
+
+    if (alpha && (a < 0.0 || a > 1.0))
+    {
+        rb_raise(rb_eRangeError, "alpha %g out of range [0.0, 1.0]", a);
+    }
+    if (l < 0.0 || l > 100.0)
+    {
+        rb_raise(rb_eRangeError, "lightness %g out of range [0.0, 100.0]", l);
+    }
+    if (s < 0.0 || s > 100.0)
+    {
+        rb_raise(rb_eRangeError, "saturation %g out of range [0.0, 100.0]", s);
+    }
+    if (h < 0.0 || h >= 360.0)
+    {
+        rb_raise(rb_eRangeError, "hue %g out of range [0.0, 360.0)", h);
+    }
+
+    memset(name, 0, sizeof(name));
+    if (alpha)
+    {
+        sprintf(name, "hsla(%-2.1f,%-2.1f,%-2.1f,%-2.1f)", h, s, l, a);
+    }
+    else
+    {
+        sprintf(name, "hsl(%-2.1f,%-2.1f,%-2.1f)", h, s, l);
+    }
+
+    GetExceptionInfo(&exception);
+
+    (void) QueryMagickColor(name, &pp, &exception);
+    CHECK_EXCEPTION()
+
+    (void) DestroyExceptionInfo(&exception);
+
+    return Pixel_from_MagickPixelPacket(&pp);
+}
+
+
+/*
+    Method:     Pixel#to_hsla()
+    Purpose:    Replace brain-dead to_HSL, above.
+    Notes:      Returns [hue, saturation, lightness, alpha] in the same ranges as from_hsla()
+*/
+VALUE
+Pixel_to_hsla(VALUE self)
+{
+    double hue, sat, lum, alpha;
+    Pixel *pixel;
+    volatile VALUE hsla;
+
+    Data_Get_Struct(self, Pixel, pixel);
+
+#if defined(HAVE_CONVERTRGBTOHSL)
+    ConvertRGBToHSL(pixel->red, pixel->green, pixel->blue, &hue, &sat, &lum);
+#else
+    TransformHSL(pixel->red, pixel->green, pixel->blue, &hue, &sat, &lum);
+#endif
+    hue *= 360.0;
+    sat *= 100.0;
+    lum *= 100.0;
+
+    if (pixel->opacity == OpaqueOpacity)
+    {
+        alpha = 1.0;
+    }
+    else if (pixel->opacity == TransparentOpacity)
+    {
+        alpha = 0.0;
+    }
+    else
+    {
+        alpha = ROUND_TO_QUANTUM(QuantumRange - (pixel->opacity / QuantumRange));
+    }
+
+    hsla = rb_ary_new3(4, rb_float_new(hue), rb_float_new(sat), rb_float_new(lum), rb_float_new(alpha));
+    return hsla;
+}
+
+
 /*
     Method:     Pixel#eql?
     Purpose:    For use with Hash
@@ -1395,6 +1536,15 @@ CompressionType_name(CompressionType ct)
         ENUM_TO_NAME(UndefinedCompression)
         ENUM_TO_NAME(NoCompression)
         ENUM_TO_NAME(BZipCompression)
+#if defined(HAVE_ENUM_DXT1COMPRESSION)
+        ENUM_TO_NAME(DXT1Compression)
+#endif
+#if defined(HAVE_ENUM_DXT3COMPRESSION)
+        ENUM_TO_NAME(DXT3Compression)
+#endif
+#if defined(HAVE_ENUM_DXT5COMPRESSION)
+        ENUM_TO_NAME(DXT5Compression)
+#endif
         ENUM_TO_NAME(FaxCompression)
         ENUM_TO_NAME(Group4Compression)
         ENUM_TO_NAME(JPEGCompression)
@@ -2627,7 +2777,7 @@ VALUE rm_enum_new(VALUE class, VALUE sym, VALUE val)
 
     argv[0] = sym;
     argv[1] = val;
-    return rb_class_new_instance(2, argv, class);
+    return rb_obj_freeze(rb_class_new_instance(2, argv, class));
 }
 
 /*
@@ -2640,7 +2790,7 @@ VALUE Enum_alloc(VALUE class)
    volatile VALUE enumr;
 
    enumr = Data_Make_Struct(class, MagickEnum, NULL, NULL, magick_enum);
-   OBJ_FREEZE(enumr);
+   rb_obj_freeze(enumr);
    return enumr;
 }
 
@@ -2749,16 +2899,12 @@ VALUE Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
     super_argv[1] = val;
     (void) rb_call_super(2, (VALUE *)super_argv);
 
-    if (rb_cvar_defined(CLASS_OF(self), rm_ID_enumerators) != Qtrue)
+    if (rb_cvar_defined(CLASS_OF(self), rb_intern(ENUMERATORS_CLASS_VAR)) != Qtrue)
     {
-#if defined(HAVE_NEW_RB_CVAR_SET)
-        rb_cvar_set(CLASS_OF(self), rm_ID_enumerators, rb_ary_new());
-#else
-        rb_cvar_set(CLASS_OF(self), rm_ID_enumerators, rb_ary_new(), 0);
-#endif
+        rb_cv_set(CLASS_OF(self), ENUMERATORS_CLASS_VAR, rb_ary_new());
     }
 
-    enumerators = rb_cvar_get(CLASS_OF(self), rm_ID_enumerators);
+    enumerators = rb_cv_get(CLASS_OF(self), ENUMERATORS_CLASS_VAR);
     (void) rb_ary_push(enumerators, self);
 
     return self;
@@ -2792,7 +2938,7 @@ static VALUE Enum_type_values(VALUE class)
     volatile VALUE rv;
     int x;
 
-    enumerators = rb_cvar_get(class, rm_ID_enumerators);
+    enumerators = rb_cv_get(class, ENUMERATORS_CLASS_VAR);
 
     if (rb_block_given_p())
     {
@@ -2809,7 +2955,7 @@ static VALUE Enum_type_values(VALUE class)
         {
             (void) rb_ary_push(copy, rb_ary_entry(enumerators, x));
         }
-        OBJ_FREEZE(copy);
+        rb_obj_freeze(copy);
         rv = copy;
     }
 
@@ -2940,6 +3086,8 @@ rm_write_temp_image(Image *image, char *tmpnam)
 {
 
 #if defined(HAVE_SETIMAGEREGISTRY)
+#define TMPNAM_CLASS_VAR "@@_tmpnam_"
+
     MagickBooleanType okay;
     ExceptionInfo exception;
     volatile VALUE id_value;
@@ -2949,24 +3097,19 @@ rm_write_temp_image(Image *image, char *tmpnam)
 
 
     // 'id' is always the value of its previous use
-    if (rb_cvar_defined(Module_Magick, rm_ID__tmpnam_) == Qtrue)
+    if (rb_cvar_defined(Module_Magick, rb_intern(TMPNAM_CLASS_VAR)) == Qtrue)
     {
-        id_value = rb_cvar_get(Module_Magick, rm_ID__tmpnam_);
+        id_value = rb_cv_get(Module_Magick, TMPNAM_CLASS_VAR);
         id = FIX2INT(id_value);
     }
     else
     {
         id = 0;
-        rb_define_class_variable(Module_Magick, "@@__tmpnam__", INT2FIX(id));
+        rb_cv_set(Module_Magick, TMPNAM_CLASS_VAR, INT2FIX(id));
     }
 
     id += 1;
-#if defined(HAVE_NEW_RB_CVAR_SET)
-    rb_cvar_set(Module_Magick, rm_ID__tmpnam_, INT2FIX(id));
-#else
-    rb_cvar_set(Module_Magick, rm_ID__tmpnam_, INT2FIX(id), 0);
-#endif
-
+    rb_cv_set(Module_Magick, TMPNAM_CLASS_VAR, INT2FIX(id));
     sprintf(tmpnam, "mpri:%d", id);
 
     // Omit "mpri:" from filename to form the key

data/lib/RMagick.rb

@@ -1,6 +1,6 @@
-# $Id: RMagick.rb,v 1.65 2008/01/25 00:43:01 rmagick Exp $
+# $Id: RMagick.rb,v 1.67 2008/03/14 23:02:02 rmagick Exp $
 #==============================================================================
-#                  Copyright (C) 2007 by Timothy P. Hunter
+#                  Copyright (C) 2008 by Timothy P. Hunter
 #   Name:       RMagick.rb
 #   Author:     Tim Hunter
 #   Purpose:    Extend Ruby to interface with ImageMagick.
@@ -32,11 +32,11 @@ class GeometryValue < Enum
     # no methods
 end
 
-PercentGeometry  = GeometryValue.new(:PercentGeometry, 1)
-AspectGeometry   = GeometryValue.new(:AspectGeometry, 2)
-LessGeometry     = GeometryValue.new(:LessGeometry, 3)
-GreaterGeometry  = GeometryValue.new(:GreaterGeometry, 4)
-AreaGeometry     = GeometryValue.new(:AreaGeometry, 5)
+PercentGeometry  = GeometryValue.new(:PercentGeometry, 1).freeze
+AspectGeometry   = GeometryValue.new(:AspectGeometry, 2).freeze
+LessGeometry     = GeometryValue.new(:LessGeometry, 3).freeze
+GreaterGeometry  = GeometryValue.new(:GreaterGeometry, 4).freeze
+AreaGeometry     = GeometryValue.new(:AreaGeometry, 5).freeze
 
 class Geometry
     FLAGS = ['', '%', '!', '<', '>', '@']

data/lib/rvg/clippath.rb

@@ -1,6 +1,6 @@
 #--
-# $Id: clippath.rb,v 1.3 2007/01/20 17:39:48 rmagick Exp $
-# Copyright (C) 2007 Timothy P. Hunter
+# $Id: clippath.rb,v 1.4 2008/02/24 18:26:36 rmagick Exp $
+# Copyright (C) 2008 Timothy P. Hunter
 #++
 module Magick
     class RVG

data/lib/rvg/container.rb

@@ -1,6 +1,6 @@
 #--
-# $Id: container.rb,v 1.3 2007/01/20 17:39:49 rmagick Exp $
-# Copyright (C) 2007 Timothy P. Hunter
+# $Id: container.rb,v 1.4 2008/02/24 18:26:36 rmagick Exp $
+# Copyright (C) 2008 Timothy P. Hunter
 #++
 
 module Magick

data/lib/rvg/describable.rb

@@ -1,6 +1,6 @@
 #--
-# $Id: describable.rb,v 1.3 2007/01/20 17:39:49 rmagick Exp $
-# Copyright (C) 2007 Timothy P. Hunter
+# $Id: describable.rb,v 1.4 2008/02/24 18:26:36 rmagick Exp $
+# Copyright (C) 2008 Timothy P. Hunter
 #++
 
 module Magick

data/lib/rvg/embellishable.rb

@@ -1,6 +1,6 @@
 #--
-# $Id: embellishable.rb,v 1.7 2007/01/20 17:39:49 rmagick Exp $
-# Copyright (C) 2007 Timothy P. Hunter
+# $Id: embellishable.rb,v 1.8 2008/02/24 18:26:36 rmagick Exp $
+# Copyright (C) 2008 Timothy P. Hunter
 #++
 
 module Magick

data/lib/rvg/misc.rb

@@ -1,5 +1,5 @@
-# $Id: misc.rb,v 1.11 2007/09/30 22:22:17 rmagick Exp $
-# Copyright (C) 2007 Timothy P. Hunter
+# $Id: misc.rb,v 1.12 2008/02/24 18:26:36 rmagick Exp $
+# Copyright (C) 2008 Timothy P. Hunter
 module Magick
     class RVG
 

data/lib/rvg/paint.rb

@@ -1,6 +1,6 @@
 #--
-# $Id: paint.rb,v 1.4 2007/01/20 17:39:49 rmagick Exp $
-# Copyright (C) 2007 Timothy P. Hunter
+# $Id: paint.rb,v 1.5 2008/02/24 18:26:36 rmagick Exp $
+# Copyright (C) 2008 Timothy P. Hunter
 #++
 # Defines paint server classes.
 # Eventually this will include gradients.
@@ -18,6 +18,11 @@ module Magick
             include Duplicatable
             include Stylable
 
+            # Return upper-left corner, width, height of viewport in user coordinates.
+            # Usually these are the values specified when the Pattern object is
+            # created, but they can be changed by a call to the viewbox method.
+            attr_reader :x, :y, :width, :height
+
             # Create a pattern that can be used with the :fill or :stroke styles.
             # The +width+ and +height+ arguments define the viewport.
             # The pattern will be repeated at <tt>x+m*width</tt> and <tt>y+n*height</tt>

data/lib/rvg/pathdata.rb

@@ -1,6 +1,6 @@
 #--
-# $Id: pathdata.rb,v 1.3 2007/01/20 17:39:49 rmagick Exp $
-# Copyright (C) 2007 Timothy P. Hunter
+# $Id: pathdata.rb,v 1.4 2008/02/24 18:26:37 rmagick Exp $
+# Copyright (C) 2008 Timothy P. Hunter
 #++
 
 module Magick

data/lib/rvg/rvg.rb

@@ -1,7 +1,7 @@
 #--############################################################################
-# $Id: rvg.rb,v 1.8 2007/01/20 17:39:50 rmagick Exp $
+# $Id: rvg.rb,v 1.9 2008/02/24 21:15:24 rmagick Exp $
 #
-#                    Copyright (C) 2007 by Timothy P. Hunter
+#                    Copyright (C) 2008 by Timothy P. Hunter
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -222,7 +222,7 @@ module Magick
             @background_fill_opacity = 1.0  # applies only if background_fill= is used
             @background_position = :scaled
             @background_pattern, @background_image, @desc, @title, @metadata = nil
-            @x, @y = 0.0
+            @x, @y = 0.0, 0.0
             @nested = false
             yield(self) if block_given?
         end