rmagick 3.0.0 → 3.1.0

data/ext/RMagick/rmmontage.c

@@ -107,7 +107,7 @@ Montage_background_color_eq(VALUE self, VALUE color)
     Montage *montage;
 
     Data_Get_Struct(self, Montage, montage);
-    Color_to_PixelPacket(&montage->info->background_color, color);
+    Color_to_PixelColor(&montage->info->background_color, color);
     return self;
 }
 
@@ -128,7 +128,7 @@ Montage_border_color_eq(VALUE self, VALUE color)
     Montage *montage;
 
     Data_Get_Struct(self, Montage, montage);
-    Color_to_PixelPacket(&montage->info->border_color, color);
+    Color_to_PixelColor(&montage->info->border_color, color);
     return self;
 }
 
@@ -212,7 +212,7 @@ Montage_fill_eq(VALUE self, VALUE color)
     Montage *montage;
 
     Data_Get_Struct(self, Montage, montage);
-    Color_to_PixelPacket(&montage->info->fill, color);
+    Color_to_PixelColor(&montage->info->fill, color);
     return self;
 }
 
@@ -350,7 +350,7 @@ Montage_matte_color_eq(VALUE self, VALUE color)
     Montage *montage;
 
     Data_Get_Struct(self, Montage, montage);
-    Color_to_PixelPacket(&montage->info->matte_color, color);
+    Color_to_PixelColor(&montage->info->matte_color, color);
     return self;
 }
 
@@ -413,7 +413,7 @@ Montage_stroke_eq(VALUE self, VALUE color)
     Montage *montage;
 
     Data_Get_Struct(self, Montage, montage);
-    Color_to_PixelPacket(&montage->info->stroke, color);
+    Color_to_PixelColor(&montage->info->stroke, color);
     return self;
 }
 

data/ext/RMagick/rmpixel.c

@@ -13,11 +13,54 @@
 #include "rmagick.h"
 
 
+/*
+ *  Declare Pixel channel attribute writers
+*/
+//! Pixel channel attribute writer.
+#define DEF_PIXEL_CHANNEL_WRITER(_channel_) \
+extern VALUE \
+Pixel_##_channel_##_eq(VALUE self, VALUE v) \
+{ \
+    Pixel *pixel; \
+ \
+    rb_check_frozen(self); \
+    Data_Get_Struct(self, Pixel, pixel); \
+    pixel->_channel_ = APP2QUANTUM(v); \
+    (void) rb_funcall(self, rm_ID_changed, 0); \
+    (void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
+    return QUANTUM2NUM((pixel->_channel_)); \
+}
 
 
-static void Color_Name_to_PixelPacket(PixelPacket *, VALUE);
+/*
+ *  Declare Pixel CMYK channel attribute accessors
+*/
+//! Pixel CMYK channel attribute accessor.
+#define DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(_cmyk_channel_, _rgb_channel_) \
+extern VALUE \
+Pixel_##_cmyk_channel_##_eq(VALUE self, VALUE v) \
+{ \
+    Pixel *pixel; \
+ \
+    rb_check_frozen(self); \
+    Data_Get_Struct(self, Pixel, pixel); \
+    pixel->_rgb_channel_ = APP2QUANTUM(v); \
+    (void) rb_funcall(self, rm_ID_changed, 0); \
+    (void) rb_funcall(self, rm_ID_notify_observers, 1, self); \
+    return QUANTUM2NUM(pixel->_rgb_channel_); \
+} \
+ \
+extern VALUE \
+Pixel_##_cmyk_channel_(VALUE self) \
+{ \
+    Pixel *pixel; \
+ \
+    Data_Get_Struct(self, Pixel, pixel); \
+    return INT2NUM(pixel->_rgb_channel_); \
+}
 
 
+static void Color_Name_to_PixelColor(PixelColor *, VALUE);
 
 
 /**
@@ -176,44 +219,48 @@ color_arg_rescue(VALUE arg)
 
 
 /**
- * Convert either a String color name or a Magick::Pixel to a PixelPacket.
+ * Convert either a String color name or a Magick::Pixel to a PixelColor.
  *
  * No Ruby usage (internal function)
  *
- * @param pp the PixelPacket to modify
+ * @param pp the PixelColor to modify
  * @param color the color name or Magick::Pixel
  */
 void
-Color_to_PixelPacket(PixelPacket *pp, VALUE color)
+Color_to_PixelColor(PixelColor *pp, VALUE color)
 {
     Pixel *pixel;
 
     // Allow color name or Pixel
     if (CLASS_OF(color) == Class_Pixel)
     {
+        memset(pp, 0, sizeof(*pp));
         Data_Get_Struct(color, Pixel, pixel);
-        *pp = *pixel;
+        pp->red     = pixel->red;
+        pp->green   = pixel->green;
+        pp->blue    = pixel->blue;
+        pp->opacity = pixel->opacity;
     }
     else
     {
         // require 'to_str' here instead of just 'to_s'.
         color = rb_rescue(rb_str_to_str, color, color_arg_rescue, color);
-        Color_Name_to_PixelPacket(pp, color);
+        Color_Name_to_PixelColor(pp, color);
     }
 }
 
 
 /**
- * Convert a color name to a PixelPacket
+ * Convert a color name to a PixelColor
  *
  * No Ruby usage (internal function)
  *
- * @param color the PixelPacket to modify
+ * @param color the PixelColor to modify
  * @param name_arg the coor name
  * @throw ArgumentError
  */
 static void
-Color_Name_to_PixelPacket(PixelPacket *color, VALUE name_arg)
+Color_Name_to_PixelColor(PixelColor *color, VALUE name_arg)
 {
     MagickBooleanType okay;
     char *name;
@@ -221,7 +268,7 @@ Color_Name_to_PixelPacket(PixelPacket *color, VALUE name_arg)
 
     exception = AcquireExceptionInfo();
     name = StringValuePtr(name_arg);
-    okay = QueryColorDatabase(name, color, exception);
+    okay = QueryColorCompliance(name, AllCompliance, color, exception);
     (void) DestroyExceptionInfo(exception);
     if (!okay)
     {
@@ -408,7 +455,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eNoMemError, "not enough memory to continue");
     }
 
-    image = AcquireImage(info);
+    image = rm_acquire_image(info);
 
     // Delete Info now in case we have to raise an exception
     (void) DestroyImageInfo(info);
@@ -448,14 +495,14 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
 VALUE
 Pixel_from_color(VALUE class, VALUE name)
 {
-    PixelPacket pp;
+    PixelColor pp;
     ExceptionInfo *exception;
     MagickBooleanType okay;
 
     class = class;      // defeat "never referenced" message from icc
 
     exception = AcquireExceptionInfo();
-    okay = QueryColorDatabase(StringValuePtr(name), &pp, exception);
+    okay = QueryColorCompliance(StringValuePtr(name), AllCompliance, &pp, exception);
     CHECK_EXCEPTION()
     (void) DestroyExceptionInfo(exception);
 
@@ -464,7 +511,7 @@ Pixel_from_color(VALUE class, VALUE name)
         rb_raise(rb_eArgError, "invalid color name: %s", StringValuePtr(name));
     }
 
-    return Pixel_from_PixelPacket(&pp);
+    return Pixel_from_PixelColor(&pp);
 }
 
 
@@ -492,7 +539,7 @@ VALUE
 Pixel_from_hsla(int argc, VALUE *argv, VALUE class)
 {
     double h, s, l, a = 1.0;
-    MagickPixelPacket pp;
+    MagickPixel pp;
     ExceptionInfo *exception;
     char name[50];
     MagickBooleanType alpha = MagickFalse;
@@ -533,15 +580,6 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class)
         rb_raise(rb_eRangeError, "hue %g out of range [0.0, 360.0)", h);
     }
 
-    // Ugly way of checking for change in ImageMagick 6.5.6-5 to see whether
-    // saturation/lightness should be out of 255 or out of 100.
-    if(MagickLibVersion < 0x656 ||
-        (MagickLibVersion == 0x656 && strcmp(MagickLibSubversion,"-5") <= 0) )
-    {
-      s = s/2.55;
-      l = l/2.55;
-    }
-
     memset(name, 0, sizeof(name));
     if (alpha)
     {
@@ -559,7 +597,7 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class)
 
     (void) DestroyExceptionInfo(exception);
 
-    return Pixel_from_MagickPixelPacket(&pp);
+    return Pixel_from_MagickPixel(&pp);
 }
 
 
@@ -577,7 +615,7 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class)
 VALUE
 Pixel_from_HSL(VALUE class, VALUE hsl)
 {
-    PixelPacket rgb;
+    PixelColor rgb;
     double hue, saturation, luminosity;
 
     class = class;      // defeat "never referenced" message from icc
@@ -596,23 +634,23 @@ Pixel_from_HSL(VALUE class, VALUE hsl)
     rb_warning("Pixel#from_HSL is deprecated; use from_hsla");
     ConvertHSLToRGB(hue, saturation, luminosity,
                  &rgb.red, &rgb.green, &rgb.blue);
-    return Pixel_from_PixelPacket(&rgb);
+    return Pixel_from_PixelColor(&rgb);
 }
 
 
 /**
- * Create a Magick::Pixel object from a MagickPixelPacket structure.
+ * Create a Magick::Pixel object from a MagickPixel structure.
  *
  * No Ruby usage (internal function)
  *
  * Notes:
  *   - Bypasses normal Pixel.new, Pixel#initialize methods
  *
- * @param pp the MagickPixelPacket
+ * @param pp the MagickPixel
  * @return a new Magick::Pixel object
  */
 VALUE
-Pixel_from_MagickPixelPacket(const MagickPixelPacket *pp)
+Pixel_from_MagickPixel(const MagickPixel *pp)
 {
     Pixel *pixel;
 
@@ -642,8 +680,38 @@ Pixel_from_PixelPacket(const PixelPacket *pp)
 {
     Pixel *pixel;
 
-    pixel = ALLOC(Pixel);
-    *pixel = *pp;
+    pixel          = ALLOC(Pixel);
+    pixel->red     = pp->red;
+    pixel->green   = pp->green;
+    pixel->blue    = pp->blue;
+    pixel->opacity = pp->opacity;
+
+    return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
+}
+
+
+/**
+ * Create a Magick::Pixel object from a PixelColor structure.
+ *
+ * No Ruby usage (internal function)
+ *
+ * Notes:
+ *   - Bypasses normal Pixel.new, Pixel#initialize methods
+ *
+ * @param pp the PixelColor
+ * @return a new Magick::Pixel object
+ */
+VALUE
+Pixel_from_PixelColor(const PixelColor *pp)
+{
+    Pixel *pixel;
+
+    pixel          = ALLOC(Pixel);
+    pixel->red     = pp->red;
+    pixel->green   = pp->green;
+    pixel->blue    = pp->blue;
+    pixel->opacity = pp->opacity;
+
     return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
 }
 
@@ -960,6 +1028,28 @@ Pixel_to_HSL(VALUE self)
 }
 
 
+/**
+ * Convert a Pixel to a MagickPixel.
+ *
+ * No Ruby usage (internal function)
+ *
+ * Notes:
+ *   - Same code as the private function SetMagickPixelPacket in ImageMagick.
+ *
+ * @param pixel the pixel
+ * @param pp the MagickPixel to be modified
+ */
+static void
+rm_set_magick_pixel_packet(Pixel *pixel, MagickPixel *pp)
+{
+    pp->red     = (MagickRealType) pixel->red;
+    pp->green   = (MagickRealType) pixel->green;
+    pp->blue    = (MagickRealType) pixel->blue;
+    pp->opacity = (MagickRealType) pixel->opacity;
+    pp->index   = (MagickRealType) 0.0;
+}
+
+
 /**
  * Return the color name corresponding to the pixel values.
  *
@@ -988,7 +1078,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     Info *info;
     Image *image;
     Pixel *pixel;
-    MagickPixelPacket mpp;
+    MagickPixel mpp;
     MagickBooleanType hex = MagickFalse;
     char name[MaxTextExtent];
     ExceptionInfo *exception;
@@ -1031,17 +1121,22 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     Data_Get_Struct(self, Pixel, pixel);
 
     info = CloneImageInfo(NULL);
-    image = AcquireImage(info);
+    image = rm_acquire_image(info);
+    (void) DestroyImageInfo(info);
+
+    if (!image)
+    {
+        rb_raise(rb_eNoMemError, "not enough memory to continue.");
+    }
+
     image->depth = depth;
     image->matte = matte;
-    (void) DestroyImageInfo(info);
 
-    GetMagickPixelPacket(image, &mpp);
+    rm_init_magickpixel(image, &mpp);
     rm_set_magick_pixel_packet(pixel, &mpp);
 
     exception = AcquireExceptionInfo();
 
-#if defined(HAVE_NEW_QUERYMAGICKCOLORNAME)
     // Support for hex-format color names moved out of QueryMagickColorname
     // in 6.4.1-9. The 'hex' argument was removed as well.
     if (hex)
@@ -1057,9 +1152,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     {
         (void) QueryMagickColorname(image, &mpp, compliance, name, exception);
     }
-#else
-    (void) QueryMagickColorname(image, &mpp, compliance, hex, name, exception);
-#endif
+
     (void) DestroyImage(image);
     CHECK_EXCEPTION()
     (void) DestroyExceptionInfo(exception);
@@ -1090,25 +1183,3 @@ Pixel_to_s(VALUE self)
     return rb_str_new2(buff);
 }
 
-
-/**
- * Convert a PixelPacket to a MagickPixelPacket.
- *
- * No Ruby usage (internal function)
- *
- * Notes:
- *   - Same code as the private function SetMagickPixelPacket in ImageMagick.
- *
- * @param pixel the pixel
- * @param pp the MagickPixelPacket to be modified
- */
-void
-rm_set_magick_pixel_packet(Pixel *pixel, MagickPixelPacket *pp)
-{
-    pp->red     = (MagickRealType) pixel->red;
-    pp->green   = (MagickRealType) pixel->green;
-    pp->blue    = (MagickRealType) pixel->blue;
-    pp->opacity = (MagickRealType) pixel->opacity;
-    pp->index   = (MagickRealType) 0.0;
-}
-

data/ext/RMagick/rmstruct.c

@@ -15,16 +15,6 @@
 
 
 
-static const char *ComplianceType_name(ComplianceType *);
-static VALUE ComplianceType_new(ComplianceType);
-static const char *StretchType_name(StretchType);
-static VALUE StretchType_new(StretchType);
-static const char *StyleType_name(StyleType);
-static VALUE StyleType_new(StyleType);
-
-
-
-
 /**
  * Given a C AffineMatrix, create the equivalent AffineMatrix object.
  *
@@ -244,7 +234,7 @@ Import_ColorInfo(const ColorInfo *ci)
 
     compliance_type = ci->compliance;
     compliance = ComplianceType_new(compliance_type);
-    color      = Pixel_from_MagickPixelPacket(&(ci->color));
+    color      = Pixel_from_MagickPixel(&(ci->color));
 
     RB_GC_GUARD(name);
     RB_GC_GUARD(compliance);
@@ -266,7 +256,7 @@ Import_ColorInfo(const ColorInfo *ci)
 void
 Export_ColorInfo(ColorInfo *ci, VALUE st)
 {
-    Pixel *pixel;
+    PixelColor pixel;
     VALUE members, m;
 
     if (CLASS_OF(st) != Class_Color)
@@ -292,13 +282,13 @@ Export_ColorInfo(ColorInfo *ci, VALUE st)
     m = rb_ary_entry(members, 2);
     if (m != Qnil)
     {
-        Data_Get_Struct(m, Pixel, pixel);
+        Color_to_PixelColor(&pixel, m);
         // For >= 6.3.0, ColorInfo.color is a MagickPixelPacket so we have to
         // convert the PixelPacket.
-        GetMagickPixelPacket(NULL, &ci->color);
-        ci->color.red = (MagickRealType) pixel->red;
-        ci->color.green = (MagickRealType) pixel->green;
-        ci->color.blue = (MagickRealType) pixel->blue;
+        rm_init_magickpixel(NULL, &ci->color);
+        ci->color.red = (MagickRealType) pixel.red;
+        ci->color.green = (MagickRealType) pixel.green;
+        ci->color.blue = (MagickRealType) pixel.blue;
         ci->color.opacity = (MagickRealType) OpaqueOpacity;
         ci->color.index = (MagickRealType) 0;
     }
@@ -309,27 +299,26 @@ Export_ColorInfo(ColorInfo *ci, VALUE st)
 
 
 /**
- * Convert either a String color name or a Magick::Pixel to a MagickPixelPacket.
+ * Convert either a String color name or a Magick::Pixel to a MagickPixel.
  *
  * No Ruby usage (internal function)
  *
  * Notes:
- *   - The channel values in a MagickPixelPacket are doubles.
+ *   - The channel values in a MagickPixel are doubles.
  *
  * @param image the Image
- * @param mpp The MagickPixelPacket to modify
+ * @param mpp The MagickPixel to modify
  * @param color the name of the color
  */
 void
-Color_to_MagickPixelPacket(Image *image, MagickPixelPacket *mpp, VALUE color)
+Color_to_MagickPixel(Image *image, MagickPixel *mpp, VALUE color)
 {
-    PixelPacket pp;
+    PixelColor pp;
 
     // image can be NULL
-    GetMagickPixelPacket(image, mpp);
+    rm_init_magickpixel(image, mpp);
 
-    memset(&pp, '\0', sizeof(pp));
-    Color_to_PixelPacket(&pp, color);
+    Color_to_PixelColor(&pp, color);
     mpp->red = (MagickRealType) pp.red;
     mpp->green = (MagickRealType) pp.green;
     mpp->blue = (MagickRealType) pp.blue;
@@ -384,76 +373,6 @@ Color_to_s(VALUE self)
     return rb_str_new2(buff);
 }
 
-
-/**
- * Return the string representation of a ComplianceType value.
- *
- * No Ruby usage (internal function)
- *
- * Notes:
- *   - xMagick will OR multiple compliance types so we have to arbitrarily pick
- *     one name.
- *   - Set the compliance argument to the selected value.
- *
- * @param c the ComplianceType value
- * @return the string
- */
-static const char *
-ComplianceType_name(ComplianceType *c)
-{
-    if ((*c & (SVGCompliance|X11Compliance|XPMCompliance))
-        == (SVGCompliance|X11Compliance|XPMCompliance))
-    {
-        return "AllCompliance";
-    }
-    else if (*c & SVGCompliance)
-    {
-        *c = SVGCompliance;
-        return "SVGCompliance";
-    }
-    else if (*c & X11Compliance)
-    {
-        *c = X11Compliance;
-        return "X11Compliance";
-    }
-    else if (*c & XPMCompliance)
-    {
-        *c = XPMCompliance;
-        return "XPMCompliance";
-    }
-    else if (*c == NoCompliance)
-    {
-        *c = NoCompliance;
-        return "NoCompliance";
-    }
-    else
-    {
-        *c = UndefinedCompliance;
-        return "UndefinedCompliance";
-    }
-}
-
-
-/**
- * Construct a ComplianceType enum object for the specified value.
- *
- * No Ruby usage (internal function)
- *
- * @param compliance the C ComplianceType value
- * @return the Ruby ComplianceType enum object
- */
-static VALUE
-ComplianceType_new(ComplianceType compliance)
-{
-    const char *name;
-
-    // Turn off undefined bits
-    compliance &= (SVGCompliance|X11Compliance|XPMCompliance);
-    name = ComplianceType_name(&compliance);
-    return rm_enum_new(Class_ComplianceType, ID2SYM(rb_intern(name)), INT2FIX(compliance));
-}
-
-
 /**
  * Convert a TypeInfo structure to a Magick::Font.
  *
@@ -907,92 +826,6 @@ SegmentInfo_to_s(VALUE self)
 }
 
 
-/**
- * Return the string representation of a StretchType value.
- *
- * No Ruby usage (internal function)
- *
- * @param stretch the StretchType value
- * @return the string
- */
-static const char *
-StretchType_name(StretchType stretch)
-{
-    switch (stretch)
-    {
-        ENUM_TO_NAME(UndefinedStretch)
-        ENUM_TO_NAME(NormalStretch)
-        ENUM_TO_NAME(UltraCondensedStretch)
-        ENUM_TO_NAME(ExtraCondensedStretch)
-        ENUM_TO_NAME(CondensedStretch)
-        ENUM_TO_NAME(SemiCondensedStretch)
-        ENUM_TO_NAME(SemiExpandedStretch)
-        ENUM_TO_NAME(ExpandedStretch)
-        ENUM_TO_NAME(ExtraExpandedStretch)
-        ENUM_TO_NAME(UltraExpandedStretch)
-        ENUM_TO_NAME(AnyStretch)
-    }
-
-    return "UndefinedStretch";
-}
-
-
-/**
- * Construct a StretchType enum for a specified StretchType value.
- *
- * No Ruby usage (internal function)
- *
- * @param stretch the C StretchType value
- * @return a Ruby StretchType enum
- */
-static VALUE
-StretchType_new(StretchType stretch)
-{
-    const char *name = StretchType_name(stretch);
-    return rm_enum_new(Class_StretchType, ID2SYM(rb_intern(name)), INT2FIX(stretch));
-}
-
-
-/**
- * Return the string representation of a StyleType value.
- *
- * No Ruby usage (internal function)
- *
- * @param style the StyleType value
- * @return the string
- */
-static const char *
-StyleType_name(StyleType style)
-{
-    switch (style)
-    {
-        ENUM_TO_NAME(UndefinedStyle)
-        ENUM_TO_NAME(NormalStyle)
-        ENUM_TO_NAME(ItalicStyle)
-        ENUM_TO_NAME(ObliqueStyle)
-        ENUM_TO_NAME(AnyStyle)
-    }
-
-    return "UndefinedStyle";
-}
-
-
-/**
- * Construct a StyleType enum for a specified StyleType value.
- *
- * No Ruby usage (internal function)
- *
- * @param style the C StyleType value
- * @return a Ruby StyleType enum
- */
-static VALUE
-StyleType_new(StyleType style)
-{
-    const char *name = StyleType_name(style);
-    return rm_enum_new(Class_StyleType, ID2SYM(rb_intern(name)), INT2FIX(style));
-}
-
-
 /**
  * Convert a TypeMetric structure to a Magick::TypeMetric.
  *