rmagick 4.1.0.rc2 → 4.1.0

data/ext/RMagick/rmmontage.c

@@ -41,7 +41,7 @@ destroy_Montage(void *obj)
     }
     if (montage->info)
     {
-        (void) DestroyMontageInfo(montage->info);
+        DestroyMontageInfo(montage->info);
         montage->info = NULL;
     }
     xfree(montage);
@@ -51,11 +51,7 @@ destroy_Montage(void *obj)
 /**
  * Create a new Montage object.
  *
- * Ruby usage:
- *   - @verbatim Montage.new @endverbatim
- *
- * @param class the Ruby class to use
- * @return a new Montage object
+ * @return [Magick::ImageList::Montage] a new Montage object
  */
 VALUE
 Montage_alloc(VALUE class)
@@ -73,7 +69,7 @@ Montage_alloc(VALUE class)
     }
 
     montage_info = CloneMontageInfo(image_info, NULL);
-    (void) (void) DestroyImageInfo(image_info);
+    (void) DestroyImageInfo(image_info);
 
     if (!montage_info)
     {
@@ -94,12 +90,8 @@ Montage_alloc(VALUE class)
 /**
  * Set background_color value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#background_color(color-name) @endverbatim
- *
- * @param self this object
- * @param color the color name
- * @return color
+ * @param color [Magick::Pixel, String] the color name
+ * @return [Magick::Pixel, String] the given color name
  */
 VALUE
 Montage_background_color_eq(VALUE self, VALUE color)
@@ -115,12 +107,8 @@ Montage_background_color_eq(VALUE self, VALUE color)
 /**
  * Set border_color value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#border_color(color-name) @endverbatim
- *
- * @param self this object
- * @param color the color name
- * @return color
+ * @param color [Magick::Pixel, String] the color name
+ * @return [Magick::Pixel, String] the given color name
  */
 VALUE
 Montage_border_color_eq(VALUE self, VALUE color)
@@ -136,12 +124,8 @@ Montage_border_color_eq(VALUE self, VALUE color)
 /**
  * Set border_width value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#border_width(width) @endverbatim
- *
- * @param self this object
- * @param width the width
- * @return width
+ * @param width [Numeric] the width
+ * @return [Numeric] the given width
  */
 VALUE
 Montage_border_width_eq(VALUE self, VALUE width)
@@ -157,12 +141,8 @@ Montage_border_width_eq(VALUE self, VALUE width)
 /**
  * Set a composition operator.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#compose(width) @endverbatim
- *
- * @param self this object
- * @param compose the composition operator
- * @return compose
+ * @param compose [Magick::CompositeOperator] the composition operator
+ * @return [Magick::CompositeOperator] the given compose operator
  */
 VALUE
 Montage_compose_eq(VALUE self, VALUE compose)
@@ -178,12 +158,8 @@ Montage_compose_eq(VALUE self, VALUE compose)
 /**
  * Set filename value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#filename(name) @endverbatim
- *
- * @param self this object
- * @param filename the filename
- * @return filename
+ * @param filename [String] the filename
+ * @return [String] filename
  */
 VALUE
 Montage_filename_eq(VALUE self, VALUE filename)
@@ -191,7 +167,7 @@ Montage_filename_eq(VALUE self, VALUE filename)
     Montage *montage;
 
     Data_Get_Struct(self, Montage, montage);
-    strncpy(montage->info->filename, StringValuePtr(filename), MaxTextExtent-1);
+    strlcpy(montage->info->filename, StringValueCStr(filename), sizeof(montage->info->filename));
     return filename;
 }
 
@@ -199,12 +175,8 @@ Montage_filename_eq(VALUE self, VALUE filename)
 /**
  * Set fill value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#fill(color-name) @endverbatim
- *
- * @param self this object
- * @param color the color name
- * @return color
+ * @param color [Magick::Pixel, String] the color name
+ * @return [Magick::Pixel, String] the given color name
  */
 VALUE
 Montage_fill_eq(VALUE self, VALUE color)
@@ -220,12 +192,8 @@ Montage_fill_eq(VALUE self, VALUE color)
 /**
  * Set font value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#font(font-name) @endverbatim
- *
- * @param self this object
- * @param font the font name
- * @return font
+ * @param font [String] the font name
+ * @return [String] the given font name
  */
 VALUE
 Montage_font_eq(VALUE self, VALUE font)
@@ -233,7 +201,7 @@ Montage_font_eq(VALUE self, VALUE font)
     Montage *montage;
 
     Data_Get_Struct(self, Montage, montage);
-    magick_clone_string(&montage->info->font, StringValuePtr(font));
+    magick_clone_string(&montage->info->font, StringValueCStr(font));
 
     return font;
 }
@@ -242,17 +210,12 @@ Montage_font_eq(VALUE self, VALUE font)
 /**
  * Set frame value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#frame(frame-geometry) @endverbatim
- *
- * Notes:
- *   - The geometry is a string in the form:
- *     @verbatim <width>x<height>+<outer-bevel-width>+<inner-bevel-width> @endverbatim
- *     or a Geometry object
+ * - The geometry is a string in the form:
+ *      <width>x<height>+<outer-bevel-width>+<inner-bevel-width>
+ *   or a Geometry object
  *
- * @param self this object
- * @param frame_arg the frame geometry
- * @return frame_arg
+ * @param frame_arg [String] the frame geometry
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Montage_frame_eq(VALUE self, VALUE frame_arg)
@@ -261,8 +224,8 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
     VALUE frame;
 
     Data_Get_Struct(self, Montage, montage);
-    frame = rm_to_s(frame_arg);
-    magick_clone_string(&montage->info->frame, StringValuePtr(frame));
+    frame = rb_String(frame_arg);
+    magick_clone_string(&montage->info->frame, StringValueCStr(frame));
 
     RB_GC_GUARD(frame);
 
@@ -273,12 +236,13 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
 /**
  * Set geometry value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#geometry(geometry) @endverbatim
+ * - The geometry is a string in the form:
+ *      <width>x<height>+<outer-bevel-width>+<inner-bevel-width>
+ *   or a Geometry object
  *
- * @param self this object
- * @param geometry_arg the geometry
- * @return geometry_arg
+ * @param geometry_arg [String] the geometry
+ * @return [String] the given geometry
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Montage_geometry_eq(VALUE self, VALUE geometry_arg)
@@ -287,8 +251,8 @@ Montage_geometry_eq(VALUE self, VALUE geometry_arg)
     VALUE geometry;
 
     Data_Get_Struct(self, Montage, montage);
-    geometry = rm_to_s(geometry_arg);
-    magick_clone_string(&montage->info->geometry, StringValuePtr(geometry));
+    geometry = rb_String(geometry_arg);
+    magick_clone_string(&montage->info->geometry, StringValueCStr(geometry));
 
     RB_GC_GUARD(geometry);
 
@@ -299,12 +263,8 @@ Montage_geometry_eq(VALUE self, VALUE geometry_arg)
 /**
  * Set gravity value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#gravity(gravity-type) @endverbatim
- *
- * @param self this object
- * @param gravity the gravity type
- * @return gravity
+ * @param gravity [Magick::GravityType] the gravity type
+ * @return [Magick::GravityType] the given gravity
  */
 VALUE
 Montage_gravity_eq(VALUE self, VALUE gravity)
@@ -320,11 +280,7 @@ Montage_gravity_eq(VALUE self, VALUE gravity)
 /**
  * Initialize a Montage object. Does nothing currently.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#initialize @endverbatim
- *
- * @param self this object
- * @return self
+ * @return [Magick::ImageList::Montage] self
  */
 VALUE
 Montage_initialize(VALUE self)
@@ -337,12 +293,8 @@ Montage_initialize(VALUE self)
 /**
  * Set matte_color value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#matte_color(color-name) @endverbatim
- *
- * @param self this object
- * @param color the color name
- * @return color
+ * @param color [Magick::Pixel, String] the color name
+ * @return [Magick::Pixel, String] the given color name
  */
 VALUE
 Montage_matte_color_eq(VALUE self, VALUE color)
@@ -358,12 +310,8 @@ Montage_matte_color_eq(VALUE self, VALUE color)
 /**
  * Set pointsize value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#pointsize= @endverbatim
- *
- * @param self this object
- * @param size the point size
- * @return size
+ * @param size [Numeric] the point size
+ * @return [Numeric] the given point size
  */
 VALUE
 Montage_pointsize_eq(VALUE self, VALUE size)
@@ -379,12 +327,8 @@ Montage_pointsize_eq(VALUE self, VALUE size)
 /**
  * Set shadow value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#shadow= @endverbatim
- *
- * @param self this object
- * @param shadow the shadow
- * @return shadow
+ * @param shadow [Bool] true if the shadow will be enabled
+ * @return [Bool] the given value
  */
 VALUE
 Montage_shadow_eq(VALUE self, VALUE shadow)
@@ -400,12 +344,8 @@ Montage_shadow_eq(VALUE self, VALUE shadow)
 /**
  * Set stroke value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#stroke(color-name) @endverbatim
- *
- * @param self this object
- * @param color the color name
- * @return self
+ * @param color [Magick::Pixel, String] the color name
+ * @return [Magick::Pixel, String] the given color name
  */
 VALUE
 Montage_stroke_eq(VALUE self, VALUE color)
@@ -421,12 +361,9 @@ Montage_stroke_eq(VALUE self, VALUE color)
 /**
  * Set texture value.
  *
- * Ruby usage:
- *   - @verbatim Montage#texture(texture-image) @endverbatim
- *
- * @param self this object
- * @param texture the texture image
- * @return texture
+ * @param texture [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *   imagelist, uses the current image.
+ * @return [Magick::Image] the given texture image
  */
 VALUE
 Montage_texture_eq(VALUE self, VALUE texture)
@@ -450,7 +387,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
     texture_image = rm_check_destroyed(texture);
 
     // Write a temp copy of the image & save its name.
-    rm_write_temp_image(texture_image, temp_name);
+    rm_write_temp_image(texture_image, temp_name, sizeof(temp_name));
     magick_clone_string(&montage->info->texture, temp_name);
 
     return texture;
@@ -460,12 +397,13 @@ Montage_texture_eq(VALUE self, VALUE texture)
 /**
  * Set tile value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#tile(tile) @endverbatim
+ * - The geometry is a string in the form:
+ *      <width>x<height>+<outer-bevel-width>+<inner-bevel-width>
+ *   or a Geometry object
  *
- * @param self this object
- * @param tile_arg the tile
- * @return tile_arg
+ * @param tile_arg [String] the tile geometry
+ * @return [String] the given tile geometry
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Montage_tile_eq(VALUE self, VALUE tile_arg)
@@ -474,8 +412,8 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
     VALUE tile;
 
     Data_Get_Struct(self, Montage, montage);
-    tile = rm_to_s(tile_arg);
-    magick_clone_string(&montage->info->tile, StringValuePtr(tile));
+    tile = rb_String(tile_arg);
+    magick_clone_string(&montage->info->tile, StringValueCStr(tile));
 
     RB_GC_GUARD(tile);
 
@@ -486,12 +424,8 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
 /**
  * Set title value.
  *
- * Ruby usage:
- *   - @verbatim Magick::Montage#title(title) @endverbatim
- *
- * @param self this object
- * @param title the title
- * @return title
+ * @param title [String] the title
+ * @return [String] the given title
  */
 VALUE
 Montage_title_eq(VALUE self, VALUE title)
@@ -499,7 +433,7 @@ Montage_title_eq(VALUE self, VALUE title)
     Montage *montage;
 
     Data_Get_Struct(self, Montage, montage);
-    magick_clone_string(&montage->info->title, StringValuePtr(title));
+    magick_clone_string(&montage->info->title, StringValueCStr(title));
     return title;
 }
 

data/ext/RMagick/rmpixel.c

@@ -16,53 +16,8 @@
     #define QueryColorname QueryMagickColorname
 #endif
 
-/*
- *  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_)); \
-}
-
-
-/*
- *  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 VALUE color_arg_rescue(VALUE, VALUE ATTRIBUTE_UNUSED) ATTRIBUTE_NORETURN;
 static void Color_Name_to_PixelColor(PixelColor *, VALUE);
 
 
@@ -81,46 +36,42 @@ destroy_Pixel(Pixel *pixel)
 
 
 /**
- * Get Pixel red attribute.
- *
- * Ruby usage:
- *   - @verbatim Pixel#red @endverbatim
+ * Get Pixel red value.
  *
- * @param self this object
- * @return the red value
+ * @return [Numeric] the red value
  */
-DEF_ATTR_READER(Pixel, red, int)
+VALUE
+Pixel_red(VALUE self)
+{
+    IMPLEMENT_ATTR_READER(Pixel, red, int);
+}
 
 /**
- * Get Pixel green attribute.
+ * Get Pixel green value.
  *
- * Ruby usage:
- *   - @verbatim Pixel#green @endverbatim
- *
- * @param self this object
- * @return the green value
+ * @return [Numeric] the green value
  */
-DEF_ATTR_READER(Pixel, green, int)
+VALUE
+Pixel_green(VALUE self)
+{
+    IMPLEMENT_ATTR_READER(Pixel, green, int);
+}
 
 /**
- * Get Pixel blue attribute.
- *
- * Ruby usage:
- *   - @verbatim Pixel#blue @endverbatim
+ * Get Pixel blue value.
  *
- * @param self this object
- * @return the blue value
+ * @return [Numeric] the blue value
  */
-DEF_ATTR_READER(Pixel, blue, int)
+VALUE
+Pixel_blue(VALUE self)
+{
+    IMPLEMENT_ATTR_READER(Pixel, blue, int);
+}
 
 /**
- * Get Pixel alpha attribute.
- *
- * Ruby usage:
- *   - @verbatim Pixel#alpha @endverbatim
+ * Get Pixel alpha value.
  *
- * @param self this object
- * @return the alpha value
+ * @return [Numeric] the alpha value
  */
 VALUE
 Pixel_alpha(VALUE self)
@@ -135,70 +86,87 @@ Pixel_alpha(VALUE self)
 }
 
 /**
- * Set Pixel red attribute.
+ * Set Pixel red value.
  *
- * Ruby usage:
- *   - @verbatim Pixel#red= @endverbatim
+ * - Pixel is Observable. Setters call {Magick::Pixel#changed},
+ *   {Magick::Pixel#notify_observers}
+ * - Setters return their argument values for backward compatibility to when
+ *   Pixel was a Struct class.
  *
- * Notes:
- *   - Pixel is Observable. Setters call changed, notify_observers
- *   - Setters return their argument values for backward compatibility to when
- *     Pixel was a Struct class.
- *
- * @param self this object
- * @param v the red value
- * @return self
+ * @param v [Numeric] the red value
+ * @return [Numeric] the given red value
  */
-DEF_PIXEL_CHANNEL_WRITER(red)
+VALUE
+Pixel_red_eq(VALUE self, VALUE v)
+{
+    Pixel *pixel;
+
+    rb_check_frozen(self);
+    Data_Get_Struct(self, Pixel, pixel);
+    pixel->red = APP2QUANTUM(v);
+    rb_funcall(self, rm_ID_changed, 0);
+    rb_funcall(self, rm_ID_notify_observers, 1, self);
+    return QUANTUM2NUM((pixel->red));
+}
 
 /**
- * Set Pixel green attribute.
+ * Set Pixel green value.
  *
- * Ruby usage:
- *   - @verbatim Pixel#green= @endverbatim
+ * - Pixel is Observable. Setters call {Magick::Pixel#changed},
+ *   {Magick::Pixel#notify_observers}
+ * - Setters return their argument values for backward compatibility to when
+ *   Pixel was a Struct class.
  *
- * Notes:
- *   - Pixel is Observable. Setters call changed, notify_observers
- *   - Setters return their argument values for backward compatibility to when
- *     Pixel was a Struct class.
- *
- * @param self this object
- * @param v the green value
- * @return self
+ * @param v [Numeric] the green value
+ * @return [Numeric] the given green value
  */
-DEF_PIXEL_CHANNEL_WRITER(green)
+VALUE
+Pixel_green_eq(VALUE self, VALUE v)
+{
+    Pixel *pixel;
+
+    rb_check_frozen(self);
+    Data_Get_Struct(self, Pixel, pixel);
+    pixel->green = APP2QUANTUM(v);
+    rb_funcall(self, rm_ID_changed, 0);
+    rb_funcall(self, rm_ID_notify_observers, 1, self);
+    return QUANTUM2NUM((pixel->green));
+}
 
 /**
- * Set Pixel blue attribute.
+ * Set Pixel blue value.
  *
- * Ruby usage:
- *   - @verbatim Pixel#blue= @endverbatim
+ * - Pixel is Observable. Setters call {Magick::Pixel#changed},
+ *   {Magick::Pixel#notify_observers}
+ * - Setters return their argument values for backward compatibility to when
+ *   Pixel was a Struct class.
  *
- * Notes:
- *   - Pixel is Observable. Setters call changed, notify_observers
- *   - Setters return their argument values for backward compatibility to when
- *     Pixel was a Struct class.
- *
- * @param self this object
- * @param v the blue value
- * @return self
+ * @param v [Numeric] the blue value
+ * @return [Numeric] the given blue value
  */
-DEF_PIXEL_CHANNEL_WRITER(blue)
+VALUE
+Pixel_blue_eq(VALUE self, VALUE v)
+{
+    Pixel *pixel;
+
+    rb_check_frozen(self);
+    Data_Get_Struct(self, Pixel, pixel);
+    pixel->blue = APP2QUANTUM(v);
+    rb_funcall(self, rm_ID_changed, 0);
+    rb_funcall(self, rm_ID_notify_observers, 1, self);
+    return QUANTUM2NUM((pixel->blue));
+}
 
 /**
- * Set Pixel alpha attribute.
+ * Set Pixel alpha value.
  *
- * Ruby usage:
- *   - @verbatim Pixel#alpha= @endverbatim
+ * - Pixel is Observable. Setters call {Magick::Pixel#changed},
+ *   {Magick::Pixel#notify_observers}
+ * - Setters return their argument values for backward compatibility to when
+ *   Pixel was a Struct class.
  *
- * Notes:
- *   - Pixel is Observable. Setters call changed, notify_observers
- *   - Setters return their argument values for backward compatibility to when
- *     Pixel was a Struct class.
- *
- * @param self this object
- * @param v the alpha value
- * @return self
+ * @param v [Numeric] the alpha value
+ * @return [Numeric] the given alpha value
  */
 VALUE
 Pixel_alpha_eq(VALUE self, VALUE v)
@@ -209,28 +177,168 @@ Pixel_alpha_eq(VALUE self, VALUE v)
     Data_Get_Struct(self, Pixel, pixel);
 #if defined(IMAGEMAGICK_7)
     pixel->alpha = APP2QUANTUM(v);
-    (void) rb_funcall(self, rm_ID_changed, 0);
-    (void) rb_funcall(self, rm_ID_notify_observers, 1, self);
+    rb_funcall(self, rm_ID_changed, 0);
+    rb_funcall(self, rm_ID_notify_observers, 1, self);
     return QUANTUM2NUM(pixel->alpha);
 #else
     pixel->opacity = QuantumRange - APP2QUANTUM(v);
-    (void) rb_funcall(self, rm_ID_changed, 0);
-    (void) rb_funcall(self, rm_ID_notify_observers, 1, self);
+    rb_funcall(self, rm_ID_changed, 0);
+    rb_funcall(self, rm_ID_notify_observers, 1, self);
     return QUANTUM2NUM(QuantumRange - pixel->opacity);
 #endif
 }
 
-/*
- * Get/set Pixel CMYK attributes.
+/**
+ * Get Pixel cyan value.
+ *
+ * @return [Numeric] the cyan value
  */
-DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(cyan, red)
-DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(magenta, green)
-DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(yellow, blue)
-#if defined(IMAGEMAGICK_7)
-DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(black, black)
-#else
-DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(black, opacity)
-#endif
+VALUE
+Pixel_cyan(VALUE self)
+{
+    Pixel *pixel;
+
+    Data_Get_Struct(self, Pixel, pixel);
+    return INT2NUM(pixel->red);
+}
+
+/**
+ * Set Pixel cyan value.
+ *
+ * - Pixel is Observable. Setters call {Magick::Pixel#changed},
+ *   {Magick::Pixel#notify_observers}
+ * - Setters return their argument values for backward compatibility to when
+ *   Pixel was a Struct class.
+ *
+ * @param v [Numeric] the cyan value
+ * @return [Numeric] the given cyan value
+ */
+VALUE
+Pixel_cyan_eq(VALUE self, VALUE v)
+{
+    Pixel *pixel;
+
+    rb_check_frozen(self);
+    Data_Get_Struct(self, Pixel, pixel);
+    pixel->red = APP2QUANTUM(v);
+    rb_funcall(self, rm_ID_changed, 0);
+    rb_funcall(self, rm_ID_notify_observers, 1, self);
+    return QUANTUM2NUM(pixel->red);
+}
+
+/**
+ * Get Pixel magenta value.
+ *
+ * @return [Numeric] the magenta value
+ */
+VALUE
+Pixel_magenta(VALUE self)
+{
+    Pixel *pixel;
+
+    Data_Get_Struct(self, Pixel, pixel);
+    return INT2NUM(pixel->green);
+}
+
+/**
+ * Set Pixel magenta value.
+ *
+ * - Pixel is Observable. Setters call {Magick::Pixel#changed},
+ *   {Magick::Pixel#notify_observers}
+ * - Setters return their argument values for backward compatibility to when
+ *   Pixel was a Struct class.
+ *
+ * @param v [Numeric] the magenta value
+ * @return [Numeric] the given magenta value
+ */
+VALUE
+Pixel_magenta_eq(VALUE self, VALUE v)
+{
+    Pixel *pixel;
+
+    rb_check_frozen(self);
+    Data_Get_Struct(self, Pixel, pixel);
+    pixel->green = APP2QUANTUM(v);
+    rb_funcall(self, rm_ID_changed, 0);
+    rb_funcall(self, rm_ID_notify_observers, 1, self);
+    return QUANTUM2NUM(pixel->green);
+}
+
+/**
+ * Get Pixel yellow value.
+ *
+ * @return [Numeric] the yellow value
+ */
+VALUE
+Pixel_yellow(VALUE self)
+{
+    Pixel *pixel;
+
+    Data_Get_Struct(self, Pixel, pixel);
+    return INT2NUM(pixel->blue);
+}
+
+/**
+ * Set Pixel yellow value.
+ *
+ * - Pixel is Observable. Setters call {Magick::Pixel#changed},
+ *   {Magick::Pixel#notify_observers}
+ * - Setters return their argument values for backward compatibility to when
+ *   Pixel was a Struct class.
+ *
+ * @param v [Numeric] the yellow value
+ * @return [Numeric] the given yellow value
+ */
+VALUE
+Pixel_yellow_eq(VALUE self, VALUE v)
+{
+    Pixel *pixel;
+
+    rb_check_frozen(self);
+    Data_Get_Struct(self, Pixel, pixel);
+    pixel->blue = APP2QUANTUM(v);
+    rb_funcall(self, rm_ID_changed, 0);
+    rb_funcall(self, rm_ID_notify_observers, 1, self);
+    return QUANTUM2NUM(pixel->blue);
+}
+
+/**
+ * Get Pixel black value.
+ *
+ * @return [Numeric] the black value
+ */
+VALUE
+Pixel_black(VALUE self)
+{
+    Pixel *pixel;
+
+    Data_Get_Struct(self, Pixel, pixel);
+    return INT2NUM(pixel->black);
+}
+
+/**
+ * Set Pixel black value.
+ *
+ * - Pixel is Observable. Setters call {Magick::Pixel#changed},
+ *   {Magick::Pixel#notify_observers}
+ * - Setters return their argument values for backward compatibility to when
+ *   Pixel was a Struct class.
+ *
+ * @param v [Numeric] the black value
+ * @return [Numeric] the given black value
+ */
+VALUE
+Pixel_black_eq(VALUE self, VALUE v)
+{
+    Pixel *pixel;
+
+    rb_check_frozen(self);
+    Data_Get_Struct(self, Pixel, pixel);
+    pixel->black = APP2QUANTUM(v);
+    rb_funcall(self, rm_ID_changed, 0);
+    rb_funcall(self, rm_ID_notify_observers, 1, self);
+    return QUANTUM2NUM(pixel->black);
+}
 
 
 /**
@@ -244,11 +352,10 @@ DEF_PIXEL_CMYK_CHANNEL_ACCESSOR(black, opacity)
  * @throw ArgumentError
  */
 static VALUE
-color_arg_rescue(VALUE arg)
+color_arg_rescue(VALUE arg, VALUE raised_exc ATTRIBUTE_UNUSED)
 {
     rb_raise(rb_eTypeError, "argument must be color name or pixel (%s given)",
             rb_class2name(CLASS_OF(arg)));
-    return (VALUE)0;
 }
 
 
@@ -275,6 +382,7 @@ Color_to_PixelColor(PixelColor *pp, VALUE color)
         pp->blue    = pixel->blue;
 #if defined(IMAGEMAGICK_7)
         pp->alpha   = pixel->alpha;
+        pp->black   = pixel->black;
 #else
         pp->opacity = pixel->opacity;
 #endif
@@ -288,6 +396,44 @@ Color_to_PixelColor(PixelColor *pp, VALUE color)
 }
 
 
+/**
+ * Convert either a String color name or a {Magick::Pixel} to a Pixel.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param pp the Pixel to modify
+ * @param color the color name or Magick::Pixel
+ */
+void
+Color_to_Pixel(Pixel *pp, VALUE color)
+{
+    PixelColor pixel_color;
+
+    memset(pp, 0, sizeof(*pp));
+    // Allow color name or Pixel
+    if (CLASS_OF(color) == Class_Pixel)
+    {
+        Pixel *pixel;
+
+        Data_Get_Struct(color, Pixel, pixel);
+        memcpy(pp, pixel, sizeof(Pixel));
+    }
+    else
+    {
+        Color_to_PixelColor(&pixel_color, color);
+        pp->red   = pixel_color.red;
+        pp->green = pixel_color.green;
+        pp->blue  = pixel_color.blue;
+#if defined(IMAGEMAGICK_7)
+        pp->alpha = pixel_color.alpha;
+        pp->black = pixel_color.black;
+#else
+        pp->opacity = pixel_color.opacity;
+#endif
+    }
+}
+
+
 /**
  * Convert a color name to a PixelColor
  *
@@ -305,9 +451,9 @@ Color_Name_to_PixelColor(PixelColor *color, VALUE name_arg)
     ExceptionInfo *exception;
 
     exception = AcquireExceptionInfo();
-    name = StringValuePtr(name_arg);
+    name = StringValueCStr(name_arg);
     okay = QueryColorCompliance(name, AllCompliance, color, exception);
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
     if (!okay)
     {
         rb_raise(rb_eArgError, "invalid color name %s", name);
@@ -319,10 +465,7 @@ Color_Name_to_PixelColor(PixelColor *color, VALUE name_arg)
 /**
  * Allocate a Pixel object.
  *
- * No Ruby usage (internal function)
- *
- * @param class the Ruby class to use
- * @return a new Magick::Pixel object
+ * @return [Magick::Pixel] a new Magick::Pixel object
  */
 VALUE
 Pixel_alloc(VALUE class)
@@ -338,21 +481,17 @@ Pixel_alloc(VALUE class)
 /**
  * "Case equal" operator for Pixel.
  *
- * Ruby usage:
- *   - @verbatim Pixel#=== @endverbatim
- *
- * @param self this object
- * @param other the other object
- * @return true or false
+ * @param other [Object] the other object
+ * @return [Boolean] true or false
  */
 
 VALUE
 Pixel_case_eq(VALUE self, VALUE other)
 {
-    Pixel *this, *that;
-
     if (CLASS_OF(self) == CLASS_OF(other))
     {
+        Pixel *this, *that;
+
         Data_Get_Struct(self, Pixel, this);
         Data_Get_Struct(other, Pixel, that);
         return (this->red == that->red
@@ -372,13 +511,9 @@ Pixel_case_eq(VALUE self, VALUE other)
 /**
  * Clone a Pixel.
  *
- * Ruby usage:
- *   - @verbatim Pixel#clone @endverbatim
- *
- * @param self this object
- * @return a clone
- * @see Pixel_dup
- * @see Pixel_init_copy
+ * @return [Magick::Pixel] a clone object
+ * @see #dup
+ * @see #initialize_copy
  */
 VALUE
 Pixel_clone(VALUE self)
@@ -400,13 +535,9 @@ Pixel_clone(VALUE self)
 /**
  * Duplicate a Pixel.
  *
- * Ruby usage:
- *   - @verbatim Pixel#dup @endverbatim
- *
- * @param self this object
- * @return a clone
- * @see Pixel_clone
- * @see Pixel_init_copy
+ * @return [Magick::Pixel] a duplicated object
+ * @see #clone
+ * @see #initialize_copy
  */
 VALUE
 Pixel_dup(VALUE self)
@@ -417,11 +548,6 @@ Pixel_dup(VALUE self)
     pixel = ALLOC(Pixel);
     memset(pixel, '\0', sizeof(Pixel));
     dup = Data_Wrap_Struct(CLASS_OF(self), NULL, destroy_Pixel, pixel);
-    if (rb_obj_tainted(self))
-    {
-        (void) rb_obj_taint(dup);
-    }
-
     RB_GC_GUARD(dup);
 
     return rb_funcall(dup, rm_ID_initialize_copy, 1, self);
@@ -429,14 +555,10 @@ Pixel_dup(VALUE self)
 
 
 /**
- * For use with Hash.
+ * Equality. Returns true only if receiver and other are the same object.
  *
- * Ruby usage:
- *   - @verbatim Pixel#eql? @endverbatim
- *
- * @param self this object
- * @param other the other object
- * @return true if hash to the same value, otherwise false
+ * @param other [Object] the other object
+ * @return [Boolean] true if other is the same value, otherwise false
  */
 VALUE
 Pixel_eql_q(VALUE self, VALUE other)
@@ -448,17 +570,11 @@ Pixel_eql_q(VALUE self, VALUE other)
 /**
  * Compare pixel values for equality.
  *
- * Ruby usage:
- *   - @verbatim Pixel#fcmp(other, fuzz, colorspace) @endverbatim
- *
- * Notes:
- *   - Default fuzz is 0.0
- *   - Default colorspace is RGBColorspace
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return true if equal, otherwise false
+ * @overload fcmp(other, fuzz = 0.0, colorspace = Magick::RGBColorspace)
+ *   @param other [Magick::Pixel] The pixel to which the receiver is compared
+ *   @param fuzz [Float] The amount of fuzz to allow before the colors are considered to be different
+ *   @param colorspace [Magick::ColorspaceType] The colorspace
+ *   @return [Boolean] true if equal, otherwise false
  */
 VALUE
 Pixel_fcmp(int argc, VALUE *argv, VALUE self)
@@ -466,12 +582,10 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     double fuzz = 0.0;
     unsigned int equal;
     ColorspaceType colorspace = RGBColorspace;
-#if defined(IMAGEMAGICK_7)
     PixelColor this, that;
-#else
+#if defined(IMAGEMAGICK_6)
     Image *image;
     Info *info;
-    Pixel *this, *that;
 #endif
 
     switch (argc)
@@ -488,18 +602,16 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
             break;
     }
 
-#if defined(IMAGEMAGICK_7)
     Color_to_PixelColor(&this, self);
     Color_to_PixelColor(&that, argv[0]);
+
+#if defined(IMAGEMAGICK_7)
     this.fuzz = fuzz;
     this.colorspace = colorspace;
     that.fuzz = fuzz;
     that.colorspace = colorspace;
     equal = IsFuzzyEquivalencePixelInfo(&this, &that);
 #else
-    Data_Get_Struct(self, Pixel, this);
-    Data_Get_Struct(argv[0], Pixel, that);
-
     // The IsColorSimilar function expects to get the
     // colorspace and fuzz parameters from an Image structure.
 
@@ -512,7 +624,7 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     image = rm_acquire_image(info);
 
     // Delete Info now in case we have to raise an exception
-    (void) DestroyImageInfo(info);
+    DestroyImageInfo(info);
 
     if (!image)
     {
@@ -522,8 +634,8 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
     image->colorspace = colorspace;
     image->fuzz = fuzz;
 
-    equal = IsColorSimilar(image, this, that);
-    (void) DestroyImage(image);
+    equal = IsColorSimilar(image, &this, &that);
+    DestroyImage(image);
 #endif
 
     return equal ? Qtrue : Qfalse;
@@ -531,21 +643,16 @@ Pixel_fcmp(int argc, VALUE *argv, VALUE self)
 
 
 /**
- * Construct an Magick::Pixel corresponding to the given color name.
+ * Construct an {Magick::Pixel} corresponding to the given color name.
  *
- * Ruby usage:
- *   - @verbatim Magick::Pixel.from_color(string) @endverbatim
+ * - The "inverse" is {Image#to_color}, b/c the conversion of a pixel to a
+ *   color name requires both a color depth and if the opacity value has
+ *   meaning.
  *
- * Notes:
- *   - The "inverse" is Image_to_color, b/c the conversion of a pixel to a
- *     color name requires both a color depth and if the opacity value has
- *     meaning (i.e. whether image->matte == True or not).
- *
- * @param class the Ruby class to use
- * @param name the color name
- * @return a new Magic::Pixel object
- * @see Image_to_color
- * @see Pixel_to_color
+ * @param name [String] the color name
+ * @return [Magick::Pixel] a new Magic::Pixel object
+ * @see Magick::Image#to_color
+ * @see Magick::Pixel#to_color
  */
 VALUE
 Pixel_from_color(VALUE class ATTRIBUTE_UNUSED, VALUE name)
@@ -555,13 +662,13 @@ Pixel_from_color(VALUE class ATTRIBUTE_UNUSED, VALUE name)
     MagickBooleanType okay;
 
     exception = AcquireExceptionInfo();
-    okay = QueryColorCompliance(StringValuePtr(name), AllCompliance, &pp, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    okay = QueryColorCompliance(StringValueCStr(name), AllCompliance, &pp, exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 
     if (!okay)
     {
-        rb_raise(rb_eArgError, "invalid color name: %s", StringValuePtr(name));
+        rb_raise(rb_eArgError, "invalid color name: %s", StringValueCStr(name));
     }
 
     return Pixel_from_PixelColor(&pp);
@@ -571,21 +678,17 @@ Pixel_from_color(VALUE class ATTRIBUTE_UNUSED, VALUE name)
 /**
  * Construct an RGB pixel.
  *
- * Ruby usage:
- *   - @verbatim Pixel#from_hsla(hue, saturation, lightness) @endverbatim
- *   - @verbatim Pixel#from_hsla(hue, saturation, lightness, alpha) @endverbatim
- *
- * Notes:
- *   - Default alpha is 1.0
- *   - 0 <= hue < 360 OR "0%" <= hue < "100%"
- *   - 0 <= saturation <= 255 OR "0%" <= saturation <= "100%"
- *   - 0 <= lightness <= 255 OR "0%" <= lightness <= "100%"
- *   - 0 <= alpha <= 1 (0 is transparent, 1 is opaque) OR "0%" <= alpha <= "100%"
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param class the Ruby class to use
- * @return a new Magick::Pixel object
+ * - 0 <= +hue+ < 360 OR "0%" <= +hue+ < "100%"
+ * - 0 <= +saturation+ <= 255 OR "0%" <= +saturation+ <= "100%"
+ * - 0 <= +lightness+ <= 255 OR "0%" <= +lightness+ <= "100%"
+ * - 0 <= +alpha+ <= 1 (0 is transparent, 1 is opaque) OR "0%" <= +alpha+ <= "100%"
+ *
+ * @overload from_hsla(hue, saturation, lightness, alpha = 1.0)
+ *   @param hue [Numeric, String] A value in the range.
+ *   @param saturation [Numeric, String] A value in the range.
+ *   @param lightness [Numeric, String] A value in the range.
+ *   @param alpha [Numeric] The alpha value.
+ *   @return [Magick::Pixel] a new Magick::Pixel object
  */
 VALUE
 Pixel_from_hsla(int argc, VALUE *argv, VALUE class ATTRIBUTE_UNUSED)
@@ -599,14 +702,14 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class ATTRIBUTE_UNUSED)
     switch (argc)
     {
         case 4:
-            a = rm_percentage(argv[3],1.0);
+            a = rm_percentage(argv[3], 1.0);
             alpha = MagickTrue;
         case 3:
             // saturation and lightness are out of 255 in new ImageMagicks and
             // out of 100 in old ImageMagicks. Compromise: always use %.
-            l = rm_percentage(argv[2],255.0);
-            s = rm_percentage(argv[1],255.0);
-            h = rm_percentage(argv[0],360.0);
+            l = rm_percentage(argv[2], 255.0);
+            s = rm_percentage(argv[1], 255.0);
+            h = rm_percentage(argv[0], 360.0);
             break;
         default:
             rb_raise(rb_eArgError, "wrong number of arguments (%d for 3 or 4)", argc);
@@ -633,23 +736,23 @@ Pixel_from_hsla(int argc, VALUE *argv, VALUE class ATTRIBUTE_UNUSED)
     memset(name, 0, sizeof(name));
     if (alpha)
     {
-        sprintf(name, "hsla(%-2.1f,%-2.1f,%-2.1f,%-2.1f)", h, s, l, a);
+        snprintf(name, sizeof(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);
+        snprintf(name, sizeof(name), "hsl(%-2.1f,%-2.1f,%-2.1f)", h, s, l);
     }
 
     exception = AcquireExceptionInfo();
 
 #if defined(IMAGEMAGICK_7)
-    (void) QueryColorCompliance(name, AllCompliance, &pp, exception);
+    QueryColorCompliance(name, AllCompliance, &pp, exception);
 #else
-    (void) QueryMagickColor(name, &pp, exception);
+    QueryMagickColor(name, &pp, exception);
 #endif
-    CHECK_EXCEPTION()
+    CHECK_EXCEPTION();
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 
     return Pixel_from_MagickPixel(&pp);
 }
@@ -672,14 +775,15 @@ Pixel_from_MagickPixel(const MagickPixel *pp)
     Pixel *pixel;
 
     pixel          = ALLOC(Pixel);
-    pixel->red     = ROUND_TO_QUANTUM(pp->red);
-    pixel->green   = ROUND_TO_QUANTUM(pp->green);
-    pixel->blue    = ROUND_TO_QUANTUM(pp->blue);
+    pixel->red     = pp->red;
+    pixel->green   = pp->green;
+    pixel->blue    = pp->blue;
 #if defined(IMAGEMAGICK_7)
-    pixel->alpha   = ROUND_TO_QUANTUM(pp->alpha);
+    pixel->alpha   = pp->alpha;
 #else
-    pixel->opacity = ROUND_TO_QUANTUM(pp->opacity);
+    pixel->opacity = pp->opacity;
 #endif
+    pixel->black   = pp->index;
 
     return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
 }
@@ -707,8 +811,10 @@ Pixel_from_PixelPacket(const PixelPacket *pp)
     pixel->blue    = pp->blue;
 #if defined(IMAGEMAGICK_7)
     pixel->alpha   = pp->alpha;
+    pixel->black   = pp->black;
 #else
     pixel->opacity = pp->opacity;
+    pixel->black   = 0;
 #endif
 
     return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
@@ -737,8 +843,10 @@ Pixel_from_PixelColor(const PixelColor *pp)
     pixel->blue    = pp->blue;
 #if defined(IMAGEMAGICK_7)
     pixel->alpha   = pp->alpha;
+    pixel->black   = pp->black;
 #else
     pixel->opacity = pp->opacity;
+    pixel->black   = 0;
 #endif
 
     return Data_Wrap_Struct(Class_Pixel, NULL, destroy_Pixel, pixel);
@@ -746,15 +854,9 @@ Pixel_from_PixelColor(const PixelColor *pp)
 
 
 /**
- * Ruby usage:
- *   - @verbatim Pixel#hash @endverbatim
- *
- * Notes:
- *   - INT2FIX left-shifts 1 bit. Sacrifice 1 bit from the opacity attribute to
- *     the FIXNUM_FLAG.
+ * Compute a hash-code.
  *
- * @param self this object
- * @return the hash of self
+ * @return [Numeric] the hash of self
  */
 VALUE
 Pixel_hash(VALUE self)
@@ -780,14 +882,10 @@ Pixel_hash(VALUE self)
 /**
  * Initialize clone, dup methods.
  *
- * Ruby usage:
- *   - @verbatim Pixel#initialize_copy @endverbatim
- *
- * @param self this object
- * @param orig the original Pixel
- * @return self
- * @see Pixel_clone
- * @see Pixel_dup
+ * @param orig [Magick::Pixel] the original Pixel
+ * @return [Magick::Pixel] self
+ * @see #clone
+ * @see #dup
  */
 VALUE
 Pixel_init_copy(VALUE self, VALUE orig)
@@ -804,24 +902,14 @@ Pixel_init_copy(VALUE self, VALUE orig)
 
 
 /**
- * Ruby usage:
- *   - @verbatim Pixel#initialize @endverbatim
- *   - @verbatim Pixel#initialize(red) @endverbatim
- *   - @verbatim Pixel#initialize(red,green) @endverbatim
- *   - @verbatim Pixel#initialize(red,green,blue) @endverbatim
- *   - @verbatim Pixel#initialize(red,green,blue,opacity) @endverbatim
- *
- * Notes:
- *   - Default red is 0.0
- *   - Default green is 0.0
- *   - Default blue is 0.0
- *   - Default opacity is 0.0
- *   - For backward compatibility, arguments may be nil.
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return self
+ * Initialize Pixel object.
+ *
+ * @overload initialize(red = 0, green = 0, blue = 0, opacity = 0)
+ *   @param red [Numeric] The red value
+ *   @param green [Numeric] The green value
+ *   @param blue [Numeric] The blue value
+ *   @param opacity [Numeric] The opacity value
+ *   @return [Magick::Pixel] self
  */
 VALUE
 Pixel_initialize(int argc, VALUE *argv, VALUE self)
@@ -876,11 +964,7 @@ Pixel_initialize(int argc, VALUE *argv, VALUE self)
 /**
  * Return the "intensity" of a pixel.
  *
- * Ruby usage:
- *   - @verbatim Pixel#intensity @endverbatim
- *
- * @param self this object
- * @return the intensity
+ * @return [Numeric] the intensity
  */
 VALUE
 Pixel_intensity(VALUE self)
@@ -901,11 +985,7 @@ Pixel_intensity(VALUE self)
 /**
  * Support Marshal.dump.
  *
- * Ruby usage:
- *   - @verbatim Pixel#marshal_dump @endverbatim
- *
- * @param self this object
- * @return a string representing the dumped pixel
+ * @return [Hash] a representing the dumped pixel
  */
 VALUE
 Pixel_marshal_dump(VALUE self)
@@ -933,11 +1013,7 @@ Pixel_marshal_dump(VALUE self)
 /**
  * Support Marshal.load.
  *
- * Ruby usage:
- *   - @verbatim Pixel#marshal_load @endverbatim
- *
- * @param self this object
- * @param dpixel the dumped pixel
+ * @param dpixel [Hash] the dumped pixel
  * @return self
  */
 VALUE
@@ -961,12 +1037,8 @@ Pixel_marshal_load(VALUE self, VALUE dpixel)
 /**
  * Support Comparable mixin.
  *
- * Ruby usage:
- *   - @verbatim Pixel#<=> @endverbatim
- *
- * @param self this object
- * @param other the other Pixel
- * @return -1, 0, 1
+ * @param other [Object] the other Pixel
+ * @return [-1, 0, 1, nil] the result of compare
  */
 VALUE
 Pixel_spaceship(VALUE self, VALUE other)
@@ -978,25 +1050,25 @@ Pixel_spaceship(VALUE self, VALUE other)
 
     if (this->red != that->red)
     {
-        return INT2NUM((this->red - that->red)/abs(this->red - that->red));
+        return INT2NUM((this->red - that->red)/abs((int)(this->red - that->red)));
     }
     else if(this->green != that->green)
     {
-        return INT2NUM((this->green - that->green)/abs(this->green - that->green));
+        return INT2NUM((this->green - that->green)/abs((int)(this->green - that->green)));
     }
     else if(this->blue != that->blue)
     {
-        return INT2NUM((this->blue - that->blue)/abs(this->blue - that->blue));
+        return INT2NUM((this->blue - that->blue)/abs((int)(this->blue - that->blue)));
     }
 #if defined(IMAGEMAGICK_7)
     else if(this->alpha != that->alpha)
     {
-        return INT2NUM((this->alpha - that->alpha)/abs(this->alpha - that->alpha));
+        return INT2NUM((this->alpha - that->alpha)/abs((int)(this->alpha - that->alpha)));
     }
 #else
     else if(this->opacity != that->opacity)
     {
-        return INT2NUM(((QuantumRange - this->opacity) - (QuantumRange - that->opacity))/abs((QuantumRange - this->opacity) - (QuantumRange - that->opacity)));
+        return INT2NUM(((QuantumRange - this->opacity) - (QuantumRange - that->opacity))/abs((int)((QuantumRange - this->opacity) - (QuantumRange - that->opacity))));
     }
 #endif
 
@@ -1008,16 +1080,11 @@ Pixel_spaceship(VALUE self, VALUE other)
 
 
 /**
- * Return [hue, saturation, lightness, alpha] in the same ranges as
- * Pixel_from_hsla.
- *
- *
- * Ruby usage:
- *   - @verbatim Pixel#to_hsla @endverbatim
+ * Return [+hue+, +saturation+, +lightness+, +alpha+] in the same ranges as
+ * {Magick::Pixel.from_hsla}.
  *
- * @param self this object
- * @return an array with hsla data
- * @see Pixel_from_hsla
+ * @return [Array<Float>] an array with hsla data
+ * @see Pixel.from_hsla
  */
 VALUE
 Pixel_to_hsla(VALUE self)
@@ -1098,24 +1165,12 @@ rm_set_magick_pixel_packet(Pixel *pixel, MagickPixel *pp)
 /**
  * Return the color name corresponding to the pixel values.
  *
- * Ruby usage:
- *   - @verbatim Magick::Pixel#to_color @endverbatim
- *   - @verbatim Magick::Pixel#to_color(compliance) @endverbatim
- *   - @verbatim Magick::Pixel#to_color(compliance, alpha) @endverbatim
- *   - @verbatim Magick::Pixel#to_color(compliance, alpha, depth) @endverbatim
- *   - @verbatim Magick::Pixel#to_color(compliance, alpha, depth, hex) @endverbatim
- *
- * Notes:
- *   - Default compliance is AllCompliance
- *   - Default alpha is false
- *   - Default depth is MAGICKCORE_QUANTUM_DEPTH
- *   - Default hex is false
- *   - The conversion respects the value of the 'opacity' field in the Pixel
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return the color name as a String
+ * @overload to_color(compliance = Magick::AllCompliance, alpha = false, depth = Magick::MAGICKCORE_QUANTUM_DEPTH, hex = false)
+ *   @param compliance [Magick::ComplianceType] A ComplianceType constant
+ *   @param alpha [Boolean] If false, the pixel's alpha attribute is ignored
+ *   @param depth [Numeric] An image depth
+ *   @param hex [Boolean] If true, represent the color name in hex format
+ *   @return [String] the color name as a String
  */
 VALUE
 Pixel_to_color(int argc, VALUE *argv, VALUE self)
@@ -1167,7 +1222,7 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
 
     info = CloneImageInfo(NULL);
     image = rm_acquire_image(info);
-    (void) DestroyImageInfo(info);
+    DestroyImageInfo(info);
 
     if (!image)
     {
@@ -1177,7 +1232,12 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
     exception = AcquireExceptionInfo();
 
     image->depth = depth;
-#if defined(IMAGEMAGICK_6)
+#if defined(IMAGEMAGICK_7)
+    if (alpha)
+    {
+        image->alpha_trait = BlendPixelTrait;
+    }
+#else
     image->matte = alpha;
 #endif
 
@@ -1197,16 +1257,16 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
 #endif
             mpp.depth = (unsigned long) min(1.0 * image->depth, 16.0);
         }
-        (void) GetColorTuple(&mpp, MagickTrue, name);
+        GetColorTuple(&mpp, MagickTrue, name);
     }
     else
     {
-        (void) QueryColorname(image, &mpp, compliance, name, exception);
+        QueryColorname(image, &mpp, compliance, name, exception);
     }
 
-    (void) DestroyImage(image);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    DestroyImage(image);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 
     // Always return a string, even if it's ""
     return rb_str_new2(name);
@@ -1214,13 +1274,9 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
 
 
 /**
- * Create a string representation of a Magick::Pixel.
- *
- * Ruby usage:
- *   - @verbatim Magick::Pixel#to_s @endverbatim
+ * Return a string representation of a {Magick::Pixel} object.
  *
- * @param self this object
- * @return the string
+ * @return [String] the string
  */
 VALUE
 Pixel_to_s(VALUE self)
@@ -1229,7 +1285,7 @@ Pixel_to_s(VALUE self)
     char buff[100];
 
     Data_Get_Struct(self, Pixel, pixel);
-    sprintf(buff, "red=" QuantumFormat ", green=" QuantumFormat ", blue=" QuantumFormat ", alpha=" QuantumFormat,
+    snprintf(buff, sizeof(buff), "red=" QuantumFormat ", green=" QuantumFormat ", blue=" QuantumFormat ", alpha=" QuantumFormat,
             pixel->red, pixel->green, pixel->blue,
 #if defined(IMAGEMAGICK_7)
             pixel->alpha);