rmagick 2.16.0 → 5.1.0

data/ext/RMagick/rminfo.c

@@ -12,15 +12,21 @@
 
 #include "rmagick.h"
 
-
-
+static void Info_free(void *infoptr);
+static size_t Info_memsize(const void *infoptr);
+
+const rb_data_type_t rm_info_data_type = {
+    "Magick::Image::Info",
+    { NULL, Info_free, Info_memsize, },
+    0, 0,
+    RUBY_TYPED_FROZEN_SHAREABLE,
+};
 
 
 /**
  * Return the value of the specified option.
  *
- * Ruby usage:
- *   - @verbatim Info#get_option(key) @endverbatim
+ * No Ruby usage (internal function)
  *
  * @param self this object
  * @param key the option key
@@ -32,7 +38,7 @@ get_option(VALUE self, const char *key)
     Info *info;
     const char *value;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     value = GetImageOption(info, key);
     if (value)
@@ -46,32 +52,32 @@ get_option(VALUE self, const char *key)
  * Set the specified option to this value. If the value is nil just unset any
  * current value.
  *
- * Ruby usage:
- *   - @verbatim Info#set_option(key,string) @endverbatim
+ * No Ruby usage (internal function)
  *
  * @param self this object
  * @param key the option key
  * @param string the value
- * @return self
+ * @return string
  */
 static VALUE
 set_option(VALUE self, const char *key, VALUE string)
 {
     Info *info;
-    char *value;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(string))
     {
-        (void) RemoveImageOption(info, key);
+        DeleteImageOption(info, key);
     }
     else
     {
-        value = StringValuePtr(string);
-        (void) SetImageOption(info, key, value);
+        char *value;
+
+        value = StringValueCStr(string);
+        SetImageOption(info, key, value);
     }
-    return self;
+    return string;
 }
 
 
@@ -81,43 +87,43 @@ set_option(VALUE self, const char *key, VALUE string)
  * No Ruby usage (internal function)
  *
  * Notes:
- *   - Call QueryColorDatabase to validate color name.
+ *   - Call QueryColorCompliance to validate color name.
  *
  * @param self this object
  * @param option the option
  * @param color the color name
- * @return self
+ * @return color
  */
 static VALUE set_color_option(VALUE self, const char *option, VALUE color)
 {
     Info *info;
-    char *name;
-    PixelPacket pp;
-    ExceptionInfo *exception;
+    PixelColor pp;
     MagickBooleanType okay;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(color))
     {
-        (void) RemoveImageOption(info, option);
+        DeleteImageOption(info, option);
     }
     else
     {
+        char *name;
+        ExceptionInfo *exception;
+
+        name = StringValueCStr(color);
         exception = AcquireExceptionInfo();
-        name = StringValuePtr(color);
-        okay = QueryColorDatabase(name, &pp, exception);
-        (void) DestroyExceptionInfo(exception);
+        okay = QueryColorCompliance(name, AllCompliance, &pp, exception);
+        DestroyExceptionInfo(exception);
         if (!okay)
         {
             rb_raise(rb_eArgError, "invalid color name `%s'", name);
         }
 
-        (void) RemoveImageOption(info, option);
-        (void) SetImageOption(info, option, name);
+        SetImageOption(info, option, name);
     }
 
-    return self;
+    return color;
 }
 
 
@@ -140,7 +146,7 @@ static VALUE get_dbl_option(VALUE self, const char *option)
     double d;
     long n;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     value = GetImageOption(info, option);
     if (!value)
@@ -165,87 +171,84 @@ static VALUE get_dbl_option(VALUE self, const char *option)
  * @param self this object
  * @param option the option name
  * @param value the value
- * @return self
+ * @return value
  */
 static VALUE set_dbl_option(VALUE self, const char *option, VALUE value)
 {
     Info *info;
-    char buff[50];
-    double d;
-    long n;
-    int len;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(value))
     {
-        (void) RemoveImageOption(info, option);
+        DeleteImageOption(info, option);
     }
     else
     {
+        char buff[50];
+        double d;
+        int len;
+        long n;
+
         d = NUM2DBL(value);
         n = floor(d);
         if (d == n)
         {
-            len = sprintf(buff, "%-10ld", n);
+            len = snprintf(buff, sizeof(buff), "%-10ld", n);
         }
         else
         {
-            len = sprintf(buff, "%-10.2f", d);
+            len = snprintf(buff, sizeof(buff), "%-10.2f", d);
         }
         memset(buff+len, '\0', sizeof(buff)-len);
-        (void) RemoveImageOption(info, option);
-        (void) SetImageOption(info, option, buff);
+        SetImageOption(info, option, buff);
     }
 
-    return self;
+    return value;
 }
 
 
-#if 0
 /**
- * Convert a PixelPacket to a hex-format color name.
- *
- * No Ruby usage (internal function)
+ * Get antialias value
  *
- * @param pp the pixel packet
- * @param name pointer to the name
- * @return the name
+ * @return [Boolean] true if antialias is enabled
  */
-static char *pixel_packet_to_hexname(PixelPacket *pp, char *name)
+VALUE
+Info_antialias(VALUE self)
 {
-    MagickPixelPacket mpp;
-
-    GetMagickPixelPacket(NULL, &mpp);
-    rm_set_magick_pixel_packet(pp, &mpp);
-    (void) GetColorTuple(&mpp, MagickTrue, name);
-    return name;
+    IMPLEMENT_TYPED_ATTR_READER(Info, antialias, boolean, &rm_info_data_type);
 }
-#endif
 
-
-DEF_ATTR_ACCESSOR(Info, antialias, bool)
+/**
+ * Set antialias value
+ *
+ * @param val [Boolean] true or false
+ * @return [Boolean] the given value
+ */
+VALUE
+Info_antialias_eq(VALUE self, VALUE val)
+{
+    IMPLEMENT_TYPED_ATTR_WRITER(Info, antialias, boolean, &rm_info_data_type);
+}
 
 /** Maximum length of a format (@see Info_aref) */
 #define MAX_FORMAT_LEN 60
 
 /**
- * Get the value of an option set by Info[]=
+ * Get the value of the specified option for the specified format.
  *
- * Ruby usage:
- *   - @verbatim Info[format, key] @endverbatim
- *   - @verbatim Info[key] @endverbatim
+ * - The 2 argument form is the original form. Added support for a single
+ *   argument after ImageMagick started using Set/GetImageOption for options
+ *   that aren't represented by fields in the ImageInfo structure.
  *
- * Notes:
- *   - The 2 argument form is the original form. Added support for a single
- *     argument after ImageMagick started using Set/GetImageOption for options
- *     that aren't represented by fields in the ImageInfo structure.
+ * @overload [](format, key)
+ *   @param format [String] An image format name such as "ps" or "tiff".
+ *   @param key [String] A string that identifies the option.
  *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return the option value
- * @see Info_aset
+ * @overload [](key)
+ *   @param key [String] A string that identifies the option.
+ *
+ * @return [String] The value of the option.
  */
 VALUE
 Info_aref(int argc, VALUE *argv, VALUE self)
@@ -266,12 +269,11 @@ Info_aref(int argc, VALUE *argv, VALUE self)
                 rb_raise(rb_eArgError, "can't reference %.60s:%.1024s - too long", format_p, key_p);
             }
 
-            sprintf(fkey, "%.60s:%.*s", format_p, (int)(MaxTextExtent-61), key_p);
+            snprintf(fkey, sizeof(fkey), "%.60s:%.*s", format_p, (int)(MaxTextExtent-61), key_p);
             break;
 
         case 1:
-            strncpy(fkey, StringValuePtr(argv[0]), sizeof(fkey)-1);
-            fkey[sizeof(fkey)-1] = '\0';
+            strlcpy(fkey, StringValueCStr(argv[0]), sizeof(fkey));
             break;
 
         default:
@@ -280,7 +282,7 @@ Info_aref(int argc, VALUE *argv, VALUE self)
 
     }
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     value = GetImageOption(info, fkey);
     if (!value)
     {
@@ -292,26 +294,23 @@ Info_aref(int argc, VALUE *argv, VALUE self)
 
 
 /**
- * Call SetImageOption
+ * Define an option. An alternative to {Info#define}.
+ * Use this method to set options for reading or writing certain image formats.
  *
- * Ruby usage:
- *   - @verbatim Info[format, key]= @endverbatim
- *   - @verbatim Info[key]= @endverbatim
+ * - Essentially the same function as {Info#define} but paired with {Info#[]}
+ * - If the value is nil it is equivalent to {Info#undefine}.
  *
- * Notes:
- *   - Essentially the same function as Info_define but paired with Info_aref
- *   - If the value is nil it is equivalent to Info_undefine. 
- *   - The 2 argument form is the original form. Added support for a single
- *     argument after ImageMagick started using Set/GetImageOption for options
- *     that aren't represented by fields in the ImageInfo structure.
- *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return self
- * @see Info_aref
- * @see Info_define
- * @see Info_undefine
+ * @overload []=(format, key)
+ *   @param format [String] An image format name such as "ps" or "tiff".
+ *   @param key [String] A string that identifies the option.
+ *
+ * @overload []=(key)
+ *   @param key [String] A string that identifies the option.
+ *
+ * @return [Magick::Image::Info] self
+ * @see #[]
+ * @see #define
+ * @see #undefine
  */
 VALUE
 Info_aset(int argc, VALUE *argv, VALUE self)
@@ -321,10 +320,8 @@ Info_aset(int argc, VALUE *argv, VALUE self)
     char *format_p, *key_p, *value_p = NULL;
     long format_l, key_l;
     char ckey[MaxTextExtent];
-    unsigned int okay;
 
-
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     switch (argc)
     {
@@ -337,14 +334,13 @@ Info_aset(int argc, VALUE *argv, VALUE self)
                 rb_raise(rb_eArgError, "%.60s:%.1024s not defined - too long", format_p, key_p);
             }
 
-            (void) sprintf(ckey, "%.60s:%.*s", format_p, (int)(sizeof(ckey)-MAX_FORMAT_LEN), key_p);
+            snprintf(ckey, sizeof(ckey), "%.60s:%.*s", format_p, (int)(sizeof(ckey)-MAX_FORMAT_LEN), key_p);
 
             value = argv[2];
             break;
 
         case 2:
-            strncpy(ckey, StringValuePtr(argv[0]), sizeof(ckey)-1);
-            ckey[sizeof(ckey)-1] = '\0';
+            strlcpy(ckey, StringValueCStr(argv[0]), sizeof(ckey));
 
             value = argv[1];
             break;
@@ -356,15 +352,16 @@ Info_aset(int argc, VALUE *argv, VALUE self)
 
     if (NIL_P(value))
     {
-        (void) RemoveImageOption(info, ckey);
+        DeleteImageOption(info, ckey);
     }
     else
     {
+        unsigned int okay;
+
         /* Allow any argument that supports to_s */
-        value = rm_to_s(value);
-        value_p = StringValuePtr(value);
+        value = rb_String(value);
+        value_p = StringValueCStr(value);
 
-        (void) RemoveImageOption(info, ckey);
         okay = SetImageOption(info, ckey, value_p);
         if (!okay)
         {
@@ -380,13 +377,9 @@ Info_aset(int argc, VALUE *argv, VALUE self)
 
 
 /**
- * Get the attenuate attribute.
+ * Get the attenuate value.
  *
- * Ruby usage:
- *   - @verbatim Info#attenuate @endverbatim
- *
- * @param self this object
- * @return the attenuate
+ * @return [Float] the attenuate
  */
 VALUE
 Info_attenuate(VALUE self)
@@ -396,14 +389,10 @@ Info_attenuate(VALUE self)
 
 
 /**
- * Set the attenuate attribute.
+ * Set the attenuate value.
  *
- * Ruby usage:
- *   - @verbatim Info#attenuate= @endverbatim
- *
- * @param self this object
- * @param value the attenuate
- * @return self
+ * @param value [Float] the attenuate
+ * @return [Float] the attenuate
  */
 VALUE
 Info_attenuate_eq(VALUE self, VALUE value)
@@ -413,170 +402,139 @@ Info_attenuate_eq(VALUE self, VALUE value)
 
 
 /**
- * Get the authenticate attribute.
- *
- * Ruby usage:
- *   - @verbatim Info#authenticate @endverbatim
+ * Get the authenticate value.
  *
- * @param self this object
- * @return the authenticate
+ * @return [String] the authenticate
  */
 VALUE
 Info_authenticate(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    if (info->authenticate)
-    {
-        return rb_str_new2(info->authenticate);
-    }
-    else
-    {
-        return Qnil;
-    }
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+#if defined(IMAGEMAGICK_7)
+    return C_str_to_R_str(GetImageOption(info, "authenticate"));
+#else
+    return C_str_to_R_str(info->authenticate);
+#endif
 }
 
 
 /**
- * Set the authenticate attribute.
+ * Set the authenticate value.
  *
- * Ruby usage:
- *   - @verbatim Info#authenticate= @endverbatim
- *
- * @param self this object
- * @param passwd the authenticating password
- * @return self
+ * @param passwd_arg [String] the authenticating password
+ * @return [String] the given value
  */
 VALUE
-Info_authenticate_eq(VALUE self, VALUE passwd)
+Info_authenticate_eq(VALUE self, VALUE passwd_arg)
 {
     Info *info;
-    char *passwd_p = NULL;
-    long passwd_l = 0;
+    char *passwd = NULL;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
-    if (!NIL_P(passwd))
+    if (!NIL_P(passwd_arg))
     {
-        passwd_p = rm_str2cstr(passwd, &passwd_l);
+        passwd = StringValueCStr(passwd_arg);
     }
 
+#if defined(IMAGEMAGICK_7)
+    if (passwd)
+    {
+        SetImageOption(info, "authenticate", passwd);
+    }
+    else
+    {
+        RemoveImageOption(info, "authenticate");
+    }
+#else
     if (info->authenticate)
     {
         magick_free(info->authenticate);
         info->authenticate = NULL;
     }
-    if (passwd_l > 0)
+    if (passwd)
     {
-        magick_clone_string(&info->authenticate, passwd_p);
+        magick_clone_string(&info->authenticate, passwd);
     }
+#endif
 
-    return self;
+    return passwd_arg;
 }
 
 
 /**
  * Return the name of the background color as a String
  *
- * Ruby usage:
- *   - @verbatim Info#background_color @endverbatim
- *
- * @param self this object
- * @return the name of the background color
- * @see Image_background_color
+ * @return [String] the name of the background color
+ * @see Image#background_color
  */
 VALUE
 Info_background_color(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return rm_pixelpacket_to_color_name_info(info, &info->background_color);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return rm_pixelcolor_to_color_name_info(info, &info->background_color);
 }
 
 
 /**
  * Set the background color.
  *
- * Ruby usage:
- *   - @verbatim Info#background_color= @endverbatim
- *
- * Notes:
- *   - Color should be a string
- *
- * @param self this object
- * @param bc_arg the background color
- * @return self
- * @throw ArgumentError
+ * @param bc_arg [Magick::Pixel, String] the background color
+ * @return [Magick::Pixel, String] the given color
  */
 VALUE
 Info_background_color_eq(VALUE self, VALUE bc_arg)
 {
     Info *info;
-    //char colorname[MaxTextExtent];
 
-    Data_Get_Struct(self, Info, info);
-    Color_to_PixelPacket(&info->background_color, bc_arg);
-    //SetImageOption(info, "background", pixel_packet_to_hexname(&info->background_color, colorname));
-    return self;
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    Color_to_PixelColor(&info->background_color, bc_arg);
+
+    return bc_arg;
 }
 
 /**
  * Return the name of the border color as a String.
  *
- * Ruby usage:
- *   - @verbatim Info#border_color @endverbatim
- *
- * @param self this object
- * @return the border color
- * @see Image_border_color
+ * @return [String] the border color name
+ * @see Image#border_color
  */
 VALUE
 Info_border_color(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return rm_pixelpacket_to_color_name_info(info, &info->border_color);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return rm_pixelcolor_to_color_name_info(info, &info->border_color);
 }
 
 /**
  * set the border color
  *
- * Ruby usage:
- *   - @verbatim Info#border_color= @endverbatim
- *
- * Notes:
- *   - Color should be a string
- *
- * @param self this object
- * @param bc_arg the border color
- * @return self
- * @throw ArgumentError
+ * @param bc_arg [Magick::Pixel, String] the border color
+ * @return [Magick::Pixel, String] the given color
  */
 VALUE
 Info_border_color_eq(VALUE self, VALUE bc_arg)
 {
     Info *info;
-    //char colorname[MaxTextExtent];
 
-    Data_Get_Struct(self, Info, info);
-    Color_to_PixelPacket(&info->border_color, bc_arg);
-    //SetImageOption(info, "bordercolor", pixel_packet_to_hexname(&info->border_color, colorname));
-    return self;
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    Color_to_PixelColor(&info->border_color, bc_arg);
+
+    return bc_arg;
 }
 
 
 
 /**
- * Emulate the -caption option.
+ * Get a caption of image
  *
- * Ruby usage:
- *   - @verbatim Info#caption @endverbatim
- *
- * @param self this object
- * @return the caption
+ * @return [String] the caption
  */
 VALUE
 Info_caption(VALUE self)
@@ -587,14 +545,10 @@ Info_caption(VALUE self)
 
 
 /**
- * Emulate the -caption option.
+ * Assigns a caption to an image.
  *
- * Ruby usage:
- *   - @verbatim Info#caption= @endverbatim
- *
- * @param self this object
- * @param caption the caption
- * @return self
+ * @param caption [String] the caption
+ * @return [String] the given value
  */
 VALUE
 Info_caption_eq(VALUE self, VALUE caption)
@@ -606,19 +560,13 @@ Info_caption_eq(VALUE self, VALUE caption)
 /**
  * Set the channels
  *
- * Ruby usage:
- *   - @verbatim Info#channel @endverbatim
- *   - @verbatim Info#channel(channel) @endverbatim
- *   - @verbatim Info#channel(channel, ...) @endverbatim
+ * @overload channel(channel = Magick::AllChannels)
+ *   @param channel [Magick::ChannelType] the channel
  *
- * Notes:
- *   - Default channel is AllChannels
- *   - Thanks to Douglas Sellers.
+ * @overload channel(*channels)
+ *   @param channels [Magick::ChannelType] the multiple arguments of channel
  *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return self
+ * @return [Magick::Image::Info] self
  */
 VALUE
 Info_channel(int argc, VALUE *argv, VALUE self)
@@ -634,7 +582,7 @@ Info_channel(int argc, VALUE *argv, VALUE self)
         raise_ChannelType_error(argv[argc-1]);
     }
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     info->channel = channels;
     return self;
@@ -644,98 +592,93 @@ Info_channel(int argc, VALUE *argv, VALUE self)
 /**
  * Get the colorspace type.
  *
- * Ruby usage:
- *   - @verbatim Info#colorspace @endverbatim
- *
- * @param self this object
- * @return the colorspace type
+ * @return [Magick::ColorspaceType] the colorspace type
  */
 VALUE
 Info_colorspace(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return ColorspaceType_new(info->colorspace);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return ColorspaceType_find(info->colorspace);
 }
 
 /**
  * Set the colorspace type
  *
- * Ruby usage:
- *   - @verbatim Info#colorspace= @endverbatim
- *
- * @param self this object
- * @param colorspace the colorspace type
- * @return self
- * @throw ArgumentError
+ * @param colorspace [Magick::ColorspaceType] the colorspace type
+ * @return [Magick::ColorspaceType] the given colorspace
  */
 VALUE
 Info_colorspace_eq(VALUE self, VALUE colorspace)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     VALUE_TO_ENUM(colorspace, info->colorspace, ColorspaceType);
-    return self;
+    return colorspace;
 }
 
-OPTION_ATTR_ACCESSOR(comment, Comment)
+/**
+ * Get the comment.
+ *
+ * @return [String] the comment
+ */
+VALUE Info_comment(VALUE self)
+{
+    return get_option(self, "Comment");
+}
 
 /**
- * Get the compression type.
+ * Set the comment
  *
- * Ruby usage:
- *   - @verbatim Info#compression @endverbatim
+ * @param string [String] the comment
+ * @return [String] the given comment
+ */
+VALUE Info_comment_eq(VALUE self, VALUE string)
+{
+    return set_option(self, "Comment", string);
+}
+
+/**
+ * Get the compression type.
  *
- * @param self this object
- * @return the compression type
+ * @return [Magick::CompressionType] the compression type
  */
 VALUE
 Info_compression(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return CompressionType_new(info->compression);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return CompressionType_find(info->compression);
 }
 
 /**
  * Set the compression type
  *
- * Ruby usage:
- *   - @verbatim Info#compression= @endverbatim
- *
- * @param self this object
- * @param type the compression type
- * @return self
- * @throw ArgumentError
+ * @param type [Magick::CompressionType] the compression type
+ * @return [Magick::CompressionType] the given type
  */
 VALUE
 Info_compression_eq(VALUE self, VALUE type)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     VALUE_TO_ENUM(type, info->compression, CompressionType);
-    return self;
+    return type;
 }
 
 /**
- * Call SetImageOption
+ * Define an option.
  *
- * Ruby usage:
- *   - @verbatim Info#define(format, key) @endverbatim
- *   - @verbatim Info#define(format, key, value) @endverbatim
- *
- * Notes:
- *   - Default value is the empty string
- *   - This is the only method in Info that is not an attribute accessor.
+ * @overload Info#define(format, key, value = "")
+ *   @param format [String] An image format name such as "ps" or "tiff".
+ *   @param key [String] A string that identifies the option.
+ *   @param value [String] A value of option
  *
- * @param argc number of input arguments
- * @param argv array of input arguments
- * @param self this object
- * @return self
+ * @return [Magick::Image::Info] self
  */
 VALUE
 Info_define(int argc, VALUE *argv, VALUE self)
@@ -748,14 +691,14 @@ Info_define(int argc, VALUE *argv, VALUE self)
     unsigned int okay;
     VALUE fmt_arg;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     switch (argc)
     {
         case 3:
             /* Allow any argument that supports to_s */
             fmt_arg = rb_String(argv[2]);
-            value = (const char *)StringValuePtr(fmt_arg);
+            value = (const char *)StringValueCStr(fmt_arg);
         case 2:
             key = rm_str2cstr(argv[1], &key_l);
             format = rm_str2cstr(argv[0], &format_l);
@@ -768,9 +711,9 @@ Info_define(int argc, VALUE *argv, VALUE self)
     {
         rb_raise(rb_eArgError, "%.20s:%.20s not defined - format or key too long", format, key);
     }
-    (void) sprintf(ckey, "%s:%s", format, key);
+    snprintf(ckey, sizeof(ckey), "%s:%s", format, key);
 
-    (void) RemoveImageOption(info, ckey);
+    DeleteImageOption(info, ckey);
     okay = SetImageOption(info, ckey, value);
     if (!okay)
     {
@@ -784,16 +727,9 @@ Info_define(int argc, VALUE *argv, VALUE self)
 }
 
 /**
- * Get the delay attribute.
+ * Get the delay value.
  *
- * Ruby usage:
- *   - @verbatim Info#delay @endverbatim
- *
- * Notes:
- *   - Convert from string to numeric
- *
- * @param self this object
- * @return the delay
+ * @return [Numeric, nil] the delay
  */
 VALUE
 Info_delay(VALUE self)
@@ -801,13 +737,14 @@ Info_delay(VALUE self)
     Info *info;
     const char *delay;
     char *p;
-    long d;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     delay = GetImageOption(info, "delay");
     if (delay)
     {
+        long d;
+
         d = strtol(delay, &p, 10);
         if (*p != '\0')
         {
@@ -829,78 +766,62 @@ Info_delay(VALUE self)
 static VALUE
 arg_is_integer(VALUE arg)
 {
-    int d = NUM2INT(arg);
-    d = d;      // satisfy icc
-    return arg;
+    return INT2NUM(NUM2INT(arg));
 }
 
 /**
- * Set the delay attribute.
+ * Set the delay value.
  *
- * Ruby usage:
- *   - @verbatim Info#delay= @endverbatim
- *
- * Notes:
- *   - Convert from numeric value to string.
- *
- * @param self this object
- * @param string the delay
- * @return self
+ * @param string [String] the delay
+ * @return [String] the given value
  */
 VALUE
 Info_delay_eq(VALUE self, VALUE string)
 {
     Info *info;
-    int delay;
     int not_num;
-    char dstr[20];
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(string))
     {
-        (void) RemoveImageOption(info, "delay");
+        DeleteImageOption(info, "delay");
     }
     else
     {
+        char dstr[20];
+        int delay;
+
         not_num = 0;
-        (void) rb_protect(arg_is_integer, string, &not_num);
+        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)));
         }
         delay = NUM2INT(string);
-        sprintf(dstr, "%d", delay);
-        (void) RemoveImageOption(info, "delay");
-        (void) SetImageOption(info, "delay", dstr);
+        snprintf(dstr, sizeof(dstr), "%d", delay);
+        SetImageOption(info, "delay", dstr);
     }
-    return self;
+    return string;
 }
 
 /**
- * Get the density attribute
- *
- * Ruby usage:
- *   - @verbatim Info#density @endverbatim
+ * Get the density value
  *
- * @param self this object
- * @return the density
+ * @return [String] the density
  */
-DEF_ATTR_READER(Info, density, str)
+VALUE
+Info_density(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, density, str, &rm_info_data_type);
+}
 
 /**
- * Set the text rendering density
+ * Set the text rendering density geometry
  *
- * Ruby usage:
- *   - @verbatim Info#density= @endverbatim
- *
- * Notes:
- *   - density should be a string, e.g., "72x72"
- *
- * @param self this object
- * @param density_arg the density
- * @return self
- * @throw ArgumentError
+ * @param density_arg [String] the density
+ * @return [String] the given value
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Info_density_eq(VALUE self, VALUE density_arg)
@@ -909,7 +830,7 @@ Info_density_eq(VALUE self, VALUE density_arg)
     VALUE density;
     char *dens;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(density_arg))
     {
@@ -918,8 +839,8 @@ Info_density_eq(VALUE self, VALUE density_arg)
         return self;
     }
 
-    density = rm_to_s(density_arg);
-    dens = StringValuePtr(density);
+    density = rb_String(density_arg);
+    dens = StringValueCStr(density);
     if (!IsGeometry(dens))
     {
         rb_raise(rb_eArgError, "invalid density geometry: %s", dens);
@@ -929,30 +850,25 @@ Info_density_eq(VALUE self, VALUE density_arg)
 
     RB_GC_GUARD(density);
 
-    return self;
+    return density_arg;
 }
 
 /**
- * Get the depth attribute
+ * Get the depth value
  *
- * Ruby usage:
- *   - @verbatim Info#depth @endverbatim
- *
- * @param self this object
- * @return the depth
+ * @return [Numeric] the depth
  */
-DEF_ATTR_READER(Info, depth, int)
+VALUE
+Info_depth(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, depth, int, &rm_info_data_type);
+}
 
 /**
- * Set the depth (8, 16, 32).
- *
- * Ruby usage:
- *   - @verbatim Info#depth= @endverbatim
+ * Set the depth (8, 16, 32, 64).
  *
- * @param self this object
- * @param depth the depth
- * @return self
- * @throw ArgumentError
+ * @param depth [Numeric] the depth
+ * @return [Numeric] the given depth
  */
 VALUE
 Info_depth_eq(VALUE self, VALUE depth)
@@ -960,7 +876,7 @@ Info_depth_eq(VALUE self, VALUE depth)
     Info *info;
     unsigned long d;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     d = NUM2ULONG(depth);
     switch (d)
     {
@@ -981,7 +897,7 @@ Info_depth_eq(VALUE self, VALUE depth)
     }
 
     info->depth = d;
-    return self;
+    return depth;
 }
 
 /** A dispose option */
@@ -1035,29 +951,24 @@ DisposeType rm_dispose_to_enum(const char *name)
  * Retrieve the dispose option string and convert it to a DisposeType
  * enumerator.
  *
- * Ruby usage:
- *   - @verbatim Info#dispose @endverbatim
- *
- * @param self this object
- * @return a DisposeType enumerator
+ * @return [Magick::DisposeType] a DisposeType enumerator
  */
 VALUE
 Info_dispose(VALUE self)
 {
     Info *info;
-    int x;
     ID dispose_id;
     const char *dispose;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     dispose_id = rb_intern("UndefinedDispose");
 
     // Map the dispose option string to a DisposeType enumerator.
-    dispose=GetImageOption(info, "dispose");
+    dispose = GetImageOption(info, "dispose");
     if (dispose)
     {
-        for (x = 0; x < N_DISPOSE_OPTIONS; x++)
+        for (int x = 0; x < N_DISPOSE_OPTIONS; x++)
         {
             if (strcmp(dispose, Dispose_Option[x].string) == 0)
             {
@@ -1073,12 +984,8 @@ Info_dispose(VALUE self)
 /**
  * Convert a DisposeType enumerator into the equivalent dispose option string.
  *
- * Ruby usage:
- *   - @verbatim Info#dispose= @endverbatim
- *
- * @param self this object
- * @param disp the DisposeType enumerator
- * @return self
+ * @param disp [Magic::DisposeType] the DisposeType enumerator
+ * @return [Magic::DisposeType] the given value
  */
 VALUE
 Info_dispose_eq(VALUE self, VALUE disp)
@@ -1088,11 +995,11 @@ Info_dispose_eq(VALUE self, VALUE disp)
     const char *option;
     int x;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(disp))
     {
-        (void) RemoveImageOption(info, "dispose");
+        DeleteImageOption(info, "dispose");
         return self;
     }
 
@@ -1108,41 +1015,54 @@ Info_dispose_eq(VALUE self, VALUE disp)
         }
     }
 
-    (void) SetImageOption(info, "dispose", option);
-    return self;
+    SetImageOption(info, "dispose", option);
+    return disp;
 }
 
-DEF_ATTR_ACCESSOR(Info, dither, bool)
-
+/**
+ * Get dither value
+ *
+ * @return [Boolean] true if dither is enabled
+ */
+VALUE
+Info_dither(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, dither, boolean, &rm_info_data_type);
+}
 
 /**
- * Get the endian attribute.
+ * Set dither value
  *
- * Ruby usage:
- *   - @verbatim Info#endian @endverbatim
+ * @param val [Boolean] true if dither will be enabled
+ * @return [Boolean] true if dither is enabled
+ */
+VALUE
+Info_dither_eq(VALUE self, VALUE val)
+{
+    IMPLEMENT_TYPED_ATTR_WRITER(Info, dither, boolean, &rm_info_data_type);
+}
+
+
+/**
+ * Get the endian value.
  *
- * @param self this object
- * @return the endian (Magick::MSBEndian or Magick::LSBEndian)
+ * @return [Magick::EndianType] the endian
  */
 VALUE
 Info_endian(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return EndianType_new(info->endian);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return EndianType_find(info->endian);
 }
 
 
 /**
- * Set the endian attribute.
+ * Set the endian value.
  *
- * Ruby usage:
- *   - @verbatim Info#endian= @endverbatim
- *
- * @param self this object
- * @param endian the endian (Magick::MSBEndian or Magick::LSBEndian)
- * @return self
+ * @param endian [Magick::EndianType] the endian
+ * @return [Magick::EndianType] the given endian
  */
 VALUE
 Info_endian_eq(VALUE self, VALUE endian)
@@ -1155,39 +1075,30 @@ Info_endian_eq(VALUE self, VALUE endian)
         VALUE_TO_ENUM(endian, type, EndianType);
     }
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     info->endian = type;
-    return self;
+    return endian;
 }
 
 
 /**
- * Get the extract string, e.g. "200x200+100+100"
+ * Get the extract geometry, e.g. "200x200+100+100"
  *
- * Ruby usage:
- *   - @verbatim Info#extract @endverbatim
- *
- * Notes:
- *   - Defined for ImageMagick 5.5.6 and later
- *
- * @param self this object
- * @return the extract string
+ * @return [String] the extract string
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
-DEF_ATTR_READER(Info, extract, str)
+VALUE
+Info_extract(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, extract, str, &rm_info_data_type);
+}
 
 /**
- * Set the extract string, e.g. "200x200+100+100"
- *
- * Ruby usage:
- *   - @verbatim Info#extract= @endverbatim
- *
- * Notes:
- *   - Defined for ImageMagick 5.5.6 and later
+ * Set the extract geometry.
  *
- * @param self this object
- * @param extract_arg the extract string
- * @return self
- * @throw ArgumentError
+ * @param extract_arg [String] the extract string
+ * @return [String] the given value
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Info_extract_eq(VALUE self, VALUE extract_arg)
@@ -1196,7 +1107,7 @@ Info_extract_eq(VALUE self, VALUE extract_arg)
     char *extr;
     VALUE extract;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(extract_arg))
     {
@@ -1205,8 +1116,8 @@ Info_extract_eq(VALUE self, VALUE extract_arg)
         return self;
     }
 
-    extract = rm_to_s(extract_arg);
-    extr = StringValuePtr(extract);
+    extract = rb_String(extract_arg);
+    extr = StringValueCStr(extract);
     if (!IsGeometry(extr))
     {
         rb_raise(rb_eArgError, "invalid extract geometry: %s", extr);
@@ -1216,77 +1127,62 @@ Info_extract_eq(VALUE self, VALUE extract_arg)
 
     RB_GC_GUARD(extract);
 
-    return self;
+    return extract_arg;
 }
 
 
 /**
- * Get the "filename".
+ * Get the "filename" value.
  *
- * Ruby usage:
- *   - @verbatim Info#filename @endverbatim
- *
- * Notes:
- *   - Only used for Image_capture
- *
- * @param self this object
- * @return the filename ("" if filename not set)
- * @see Image_capture
+ * @return [String] the file name ("" if filename not set)
+ * @note Only used for Image#capture
+ * @see Image#capture
  */
 VALUE
 Info_filename(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     return rb_str_new2(info->filename);
 }
 
 /**
- * Set the "filename".
+ * Set the "filename" value.
  *
- * Ruby usage:
- *   - @verbatim Info#filename= @endverbatim
- *
- * Notes:
- *   - Only used for Image_capture
- *
- * @param self this object
- * @param filename the filename
- * @return self
- * @see Image_capture
+ * @param filename [String] the file name
+ * @return [String] the given file name
+ * @note Only used for Image#capture
+ * @see Image#capture
  */
 VALUE
 Info_filename_eq(VALUE self, VALUE filename)
 {
     Info *info;
-    char *fname;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     // Allow "nil" - remove current filename
-    if (NIL_P(filename) || StringValuePtr(filename) == NULL)
+    if (NIL_P(filename) || StringValueCStr(filename) == NULL)
     {
         info->filename[0] = '\0';
     }
     else
     {
+        char *fname;
+
         // Otherwise copy in filename
-        fname = StringValuePtr(filename);
-        strncpy(info->filename, fname, MaxTextExtent);
+        fname = StringValueCStr(filename);
+        strlcpy(info->filename, fname, sizeof(info->filename));
     }
-    return self;
+    return filename;
 }
 
 
 /**
  * Return the fill color as a String.
  *
- * Ruby usage:
- *   - @verbatim Info#fill @endverbatim
- *
- * @param self this object
- * @return the fill color
+ * @return [String] the fill color
  */
 VALUE
 Info_fill(VALUE self)
@@ -1297,13 +1193,8 @@ Info_fill(VALUE self)
 /**
  * Set the fill color
  *
- * Ruby usage:
- *   - @verbatim Info#fill= @endverbatim
- *
- * @param self this object
- * @param color the fill color (as a String)
- * @return self
- * @throw ArgumentError
+ * @param color [String] the fill color
+ * @return [String] the given value
  */
 VALUE
 Info_fill_eq(VALUE self, VALUE color)
@@ -1315,65 +1206,59 @@ Info_fill_eq(VALUE self, VALUE color)
 /**
  * Get the text font.
  *
- * Ruby usage:
- *   - @verbatim Info#font @endverbatim
- *
- * @param self this object
- * @return the font
+ * @return [String] the font
  */
-DEF_ATTR_READER(Info, font, str)
+VALUE
+Info_font(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, font, str, &rm_info_data_type);
+}
 
 /**
  * Set the text font.
  *
- * Ruby usage:
- *   - @verbatim Info#font= @endverbatim
- *
- * @param self this object
- * @param font_arg the font (as a String)
- * @return self
+ * @param font_arg [String] the font
+ * @return [String] the given font
  */
 VALUE
 Info_font_eq(VALUE self, VALUE font_arg)
 {
     Info *info;
-    char *font;
 
-    Data_Get_Struct(self, Info, info);
-    if (NIL_P(font_arg) || StringValuePtr(font_arg) == NULL)
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    if (NIL_P(font_arg) || StringValueCStr(font_arg) == NULL)
     {
         magick_free(info->font);
         info->font = NULL;
     }
     else
     {
-        font = StringValuePtr(font_arg);
+        char *font;
+
+        font = StringValueCStr(font_arg);
         magick_clone_string(&info->font, font);
     }
-    return self;
+    return font_arg;
 }
 
 /**
  * Return the image encoding format.
  *
- * Ruby usage:
- *   - @verbatim Info#format @endverbatim
- *
- * @param self this object
- * @return the encoding format
+ * @return [String, nil] the encoding format
  */
 VALUE Info_format(VALUE self)
 {
     Info *info;
-    const MagickInfo *magick_info ;
-    ExceptionInfo *exception;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     if (*info->magick)
     {
+        const MagickInfo *magick_info;
+        ExceptionInfo *exception;
+
         exception = AcquireExceptionInfo();
         magick_info = GetMagickInfo(info->magick, exception);
-        (void) DestroyExceptionInfo(exception);
+        DestroyExceptionInfo(exception);
 
         return magick_info ? rb_str_new2(magick_info->name) : Qnil;
     }
@@ -1384,12 +1269,8 @@ VALUE Info_format(VALUE self)
 /**
  * Set the image encoding format.
  *
- * Ruby usage:
- *   - @verbatim Info#format= @endverbatim
- *
- * @param self this object
- * @param magick the encoding format
- * @return self
+ * @param magick [String] the encoding format
+ * @return [String] the given format
  */
 VALUE
 Info_format_eq(VALUE self, VALUE magick)
@@ -1399,55 +1280,52 @@ Info_format_eq(VALUE self, VALUE magick)
     char *mgk;
     ExceptionInfo *exception;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
-    exception = AcquireExceptionInfo();
+    mgk = StringValueCStr(magick);
 
-    mgk = StringValuePtr(magick);
+    exception = AcquireExceptionInfo();
     m = GetMagickInfo(mgk, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 
     if (!m)
     {
         rb_raise(rb_eArgError, "unknown format: %s", mgk);
     }
 
-    strncpy(info->magick, m->name, MaxTextExtent-1);
-    return self;
+    strlcpy(info->magick, m->name, sizeof(info->magick));
+    return magick;
 }
 
 /**
  * Get the fuzz.
  *
- * Ruby usage:
- *   - @verbatim Info#fuzz @endverbatim
- *
- * @param self this object
- * @return the fuzz
- * @see Image_fuzz
+ * @return [Float] the fuzz
+ * @see Image#fuzz
  */
-DEF_ATTR_READER(Info, fuzz, dbl)
+VALUE
+Info_fuzz(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, fuzz, dbl, &rm_info_data_type);
+}
 
 /**
  * Set the fuzz.
  *
- * Ruby usage:
- *   - @verbatim Info#fuzz=number @endverbatim
- *   - @verbatim Info#fuzz=NN% @endverbatim
- *
- * @param self this object
- * @param fuzz the fuzz
- * @return self
- * @see Image_fuzz_eq
+ * @param fuzz [Float, String] the fuzz with Float or
+ *   percent format "xx%" with String
+ * @return [Float, String] the given value
+ * @see Image#fuzz=
  */
-VALUE Info_fuzz_eq(VALUE self, VALUE fuzz)
+VALUE
+Info_fuzz_eq(VALUE self, VALUE fuzz)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     info->fuzz = rm_fuzz_to_dbl(fuzz);
-    return self;
+    return fuzz;
 }
 
 /** A gravity option */
@@ -1468,8 +1346,7 @@ static struct
     { "SouthEast",  "SouthEastGravity", SouthEastGravity},
     { "South",      "SouthGravity",     SouthGravity},
     { "SouthWest",  "SouthWestGravity", SouthWestGravity},
-    { "West",       "WestGravity",      WestGravity},
-    { "Static",     "StaticGravity",    StaticGravity}
+    { "West",       "WestGravity",      WestGravity}
 };
 
 /** Number of gravity options */
@@ -1505,28 +1382,23 @@ GravityType rm_gravity_to_enum(const char *name)
 /**
  * Return the value of the gravity option as a GravityType enumerator.
  *
- * Ruby usage:
- *   - @verbatim Info#gravity @endverbatim
- *
- * @param self this object
- * @return the gravity enumerator
+ * @return [Magick::GravityType] the gravity enumerator
  */
 VALUE Info_gravity(VALUE self)
 {
     Info *info;
     const char *gravity;
-    int x;
     ID gravity_id;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     gravity_id = rb_intern("UndefinedGravity");
 
     // Map the gravity option string to a GravityType enumerator.
-    gravity=GetImageOption(info, "gravity");
+    gravity = GetImageOption(info, "gravity");
     if (gravity)
     {
-        for (x = 0; x < N_GRAVITY_OPTIONS; x++)
+        for (int x = 0; x < N_GRAVITY_OPTIONS; x++)
         {
             if (strcmp(gravity, Gravity_Option[x].string) == 0)
             {
@@ -1543,12 +1415,8 @@ VALUE Info_gravity(VALUE self)
  * Convert a GravityType enum to a gravity option name and store in the Info
  * structure.
  *
- * Ruby usage:
- *   - @verbatim Info#gravity= @endverbatim
- *
- * @param self this object
- * @param grav the gravity enumerator
- * @return self
+ * @param grav [Magick::GravityType] the gravity enumerator
+ * @return [Magick::GravityType] the given gravity
  */
 VALUE
 Info_gravity_eq(VALUE self, VALUE grav)
@@ -1558,11 +1426,11 @@ Info_gravity_eq(VALUE self, VALUE grav)
     const char *option;
     int x;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(grav))
     {
-        (void) RemoveImageOption(info, "gravity");
+        DeleteImageOption(info, "gravity");
         return self;
     }
 
@@ -1578,222 +1446,207 @@ Info_gravity_eq(VALUE self, VALUE grav)
         }
     }
 
-    (void) SetImageOption(info, "gravity", option);
-    return self;
+    SetImageOption(info, "gravity", option);
+    return grav;
 }
 
 
-DEF_ATTR_ACCESSOR(Info, group, long)
-
 /**
  * Get the classification type.
  *
- * Ruby usage:
- *   - @verbatim Info#image_type @endverbatim
- *
- * @param self this object
- * @return the classification type
+ * @return [Magick::ImageType] the classification type
  */
 VALUE
 Info_image_type(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return ImageType_new(info->type);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return ImageType_find(info->type);
 }
 
 /**
  * Set the classification type.
  *
- * Ruby usage:
- *   - @verbatim Info#image_type= @endverbatim
- *
- * @param self this object
- * @param type the classification type
- * @return self
- * @throw ArgumentError
+ * @param type [Magick::ImageType] the classification type
+ * @return [Magick::ImageType] the given type
  */
 VALUE
 Info_image_type_eq(VALUE self, VALUE type)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     VALUE_TO_ENUM(type, info->type, ImageType);
-    return self;
+    return type;
 }
 
 /**
  * Get the interlace type.
  *
- * Ruby usage:
- *   - @verbatim Info#interlace @endverbatim
- *
- * @param self this object
- * @return the interlace type
+ * @return [Magick::InterlaceType] the interlace type
  */
 VALUE
 Info_interlace(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return InterlaceType_new(info->interlace);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return InterlaceType_find(info->interlace);
 }
 
 /**
  * Set the interlace type
  *
- * Ruby usage:
- *   - @verbatim Info#interlace= @endverbatim
- *
- * @param self this object
- * @param inter the interlace type
- * @return self
- * @throw ArgumentError
+ * @param inter [Magick::InterlaceType] the interlace type
+ * @return [Magick::InterlaceType] the given interlace
  */
 VALUE
 Info_interlace_eq(VALUE self, VALUE inter)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     VALUE_TO_ENUM(inter, info->interlace, InterlaceType);
-    return self;
+    return inter;
 }
 
-OPTION_ATTR_ACCESSOR(label, Label)
+/**
+ * Get the label.
+ *
+ * @return [String] the label
+ */
+VALUE Info_label(VALUE self)
+{
+    return get_option(self, "Label");
+}
 
 /**
- * Return the name of the matte color as a String.
+ * Set the label.
  *
- * Ruby usage:
- *   - @verbatim Info#matte_color @endverbatim
+ * @param string [String] the label
+ * @return [String] the given label
+ */
+VALUE Info_label_eq(VALUE self, VALUE string)
+{
+    return set_option(self, "Label", string);
+}
+
+/**
+ * Return the name of the matte color as a String.
  *
- * @param self this object
- * @return the name of the matte color
- * @see Image_matte_color
+ * @return [String] the name of the matte color
+ * @see Image#matte_color
  */
 VALUE
 Info_matte_color(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return rm_pixelpacket_to_color_name_info(info, &info->matte_color);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return rm_pixelcolor_to_color_name_info(info, &info->matte_color);
 }
 
 /**
  * Set the matte color.
  *
- * Ruby usage:
- *   - @verbatim Info#matte_color= @endverbatim
- *
- * @param self this object
- * @param matte_arg the name of the matte as a String
- * @return self
- * @throw ArgumentError
+ * @param matte_arg [Magick::Pixel, String] the name of the matte as a String
+ * @return [Magick::Pixel, String] the given value
  */
 VALUE
 Info_matte_color_eq(VALUE self, VALUE matte_arg)
 {
     Info *info;
-    //char colorname[MaxTextExtent];
 
-    Data_Get_Struct(self, Info, info);
-    Color_to_PixelPacket(&info->matte_color, matte_arg);
-    //SetImageOption(info, "mattecolor", pixel_packet_to_hexname(&info->matte_color, colorname));
-    return self;
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    Color_to_PixelColor(&info->matte_color, matte_arg);
+
+    return matte_arg;
 }
 
 /**
- * Establish a progress monitor.
+ * Get the monochrome value.
  *
- * Ruby usage:
- *   - @verbatim Info#monitor= @endverbatim
- *
- * @param self this object
- * @param monitor the monitor
- * @return self
- * @see Image_monitor_eq
+ * @return [Boolean] true or false
  */
 VALUE
-Info_monitor_eq(VALUE self, VALUE monitor)
+Info_monochrome(VALUE self)
 {
-    Info *info;
-
-    Data_Get_Struct(self, Info, info);
-
-    if (NIL_P(monitor))
-    {
-        info->progress_monitor = NULL;
-    }
-    else
-    {
-        (void) SetImageInfoProgressMonitor(info, rm_progress_monitor, (void *)monitor);
-    }
-
-
-    return self;
+    IMPLEMENT_TYPED_ATTR_READER(Info, monochrome, boolean, &rm_info_data_type);
 }
 
+/**
+ * Set the monochrome value.
+ *
+ * @param val [Boolean] true or false
+ * @return [Boolean] the given value
+ */
+VALUE
+Info_monochrome_eq(VALUE self, VALUE val)
+{
+    IMPLEMENT_TYPED_ATTR_WRITER(Info, monochrome, boolean, &rm_info_data_type);
+}
 
+/**
+ * Get the scene number of an image or the first image in a sequence.
+ *
+ * @return [Numeric] the scene number
+ */
+VALUE
+Info_number_scenes(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, number_scenes, ulong, &rm_info_data_type);
+}
 
-
-DEF_ATTR_ACCESSOR(Info, monochrome, bool)
-
-DEF_ATTR_ACCESSOR(Info, number_scenes, ulong)
+/**
+ * Set the scene number of an image or the first image in a sequence.
+ *
+ * @param val [Numeric] the scene number
+ * @return [Numeric] the given value
+ */
+VALUE
+Info_number_scenes_eq(VALUE self, VALUE val)
+{
+    IMPLEMENT_TYPED_ATTR_WRITER(Info, number_scenes, ulong, &rm_info_data_type);
+}
 
 /**
  * Return the orientation attribute as an OrientationType enum value.
  *
- * Ruby usage:
- *   - @verbatim Info#orientation @endverbatim
- *
- * @param self this object
- * @return the orientation
+ * @return [Magick::OrientationType] the orientation
  */
 VALUE
 Info_orientation(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return OrientationType_new(info->orientation);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return OrientationType_find(info->orientation);
 }
 
 
 /**
  * Set the Orientation type.
  *
- * Ruby usage:
- *   - @verbatim Info#Orientation= @endverbatim
- *
- * @param self this object
- * @param inter the orientation type as an OrientationType enum value
- * @return self
- * @throw ArgumentError
+ * @param inter [Magick::OrientationType] the orientation type as an OrientationType enum value
+ * @return [Magick::OrientationType] the given value
  */
 VALUE
 Info_orientation_eq(VALUE self, VALUE inter)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     VALUE_TO_ENUM(inter, info->orientation, OrientationType);
-    return self;
+    return inter;
 }
 
 
 /**
  * Return origin geometry.
  *
- * Ruby usage:
- *   - @verbatim Info#origin @endverbatim
- *
- * @param self this object
- * @return the origin geometry
+ * @return [String] the origin geometry
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Info_origin(VALUE self)
@@ -1801,7 +1654,7 @@ Info_origin(VALUE self)
     Info *info;
     const char *origin;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     origin = GetImageOption(info, "origin");
     return origin ? rb_str_new2(origin) : Qnil;
@@ -1812,12 +1665,12 @@ Info_origin(VALUE self)
  * Set origin geometry. Argument may be a Geometry object as well as a geometry
  * string.
  *
- * Ruby usage:
- *   - @verbatim Info#origin=+-x+-y @endverbatim
+ * The geometry format is
+ *     +-x+-y
  *
- * @param self this object
- * @param origin_arg the origin geometry
- * @return self
+ * @param origin_arg [String] the origin geometry
+ * @return [String] the given value
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Info_origin_eq(VALUE self, VALUE origin_arg)
@@ -1826,45 +1679,43 @@ Info_origin_eq(VALUE self, VALUE origin_arg)
     VALUE origin_str;
     char *origin;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(origin_arg))
     {
-        (void) RemoveImageOption(info, "origin");
+        DeleteImageOption(info, "origin");
         return self;
     }
 
-    origin_str = rm_to_s(origin_arg);
-    origin = GetPageGeometry(StringValuePtr(origin_str));
+    origin_str = rb_String(origin_arg);
+    origin = GetPageGeometry(StringValueCStr(origin_str));
 
     if (IsGeometry(origin) == MagickFalse)
     {
-        rb_raise(rb_eArgError, "invalid origin geometry: %s", origin);
+        magick_free(origin);
+        rb_raise(rb_eArgError, "invalid origin geometry");
     }
 
-    (void) SetImageOption(info, "origin", origin);
+    SetImageOption(info, "origin", origin);
+    magick_free(origin);
 
     RB_GC_GUARD(origin_str);
 
-    return self;
+    return origin_arg;
 }
 
 
 /**
  * Get the Postscript page geometry.
  *
- * Ruby usage:
- *   - @verbatim Info_page @endverbatim
- *
- * @param self this object
- * @return the page geometry
+ * @return [String] the page geometry
  */
 VALUE
 Info_page(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     return info->page ? rb_str_new2(info->page) : Qnil;
 
 }
@@ -1873,12 +1724,9 @@ Info_page(VALUE self)
  * Store the Postscript page geometry. Argument may be a Geometry object as well
  * as a geometry string.
  *
- * Ruby usage:
- *   - @verbatim Info#page= @endverbatim
- *
- * @param self this object
- * @param page_arg the geometry
- * @return self
+ * @param page_arg [String] the geometry
+ * @return [String] the given value
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Info_page_eq(VALUE self, VALUE page_arg)
@@ -1887,46 +1735,85 @@ Info_page_eq(VALUE self, VALUE page_arg)
     VALUE geom_str;
     char *geometry;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     if (NIL_P(page_arg))
     {
         magick_free(info->page);
         info->page = NULL;
         return self;
     }
-    geom_str = rm_to_s(page_arg);
-    geometry=GetPageGeometry(StringValuePtr(geom_str));
+    geom_str = rb_String(page_arg);
+    geometry = GetPageGeometry(StringValueCStr(geom_str));
     if (*geometry == '\0')
     {
         magick_free(info->page);
         info->page = NULL;
         return self;
     }
-    magick_clone_string(&info->page, geometry);
+    info->page = geometry;
 
     RB_GC_GUARD(geom_str);
 
-    return self;
+    return page_arg;
 }
 
-DEF_ATTR_ACCESSOR(Info, pointsize, dbl)
-DEF_ATTR_ACCESSOR(Info, quality, ulong)
+/**
+ * Get the point size.
+ *
+ * @return [Float] the point size
+ */
+VALUE
+Info_pointsize(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, pointsize, dbl, &rm_info_data_type);
+}
 
 /**
- * Get sampling factors used by JPEG or MPEG-2 encoder and YUV decoder/encoder.
+ * Set the point size.
  *
- * Ruby usage:
- *   - @verbatim Info#sampling_factor @endverbatim
+ * @param val [Float] the point size
+ * @return [Float] the given value
+ */
+VALUE
+Info_pointsize_eq(VALUE self, VALUE val)
+{
+    IMPLEMENT_TYPED_ATTR_WRITER(Info, pointsize, dbl, &rm_info_data_type);
+}
+
+/**
+ * Get the compression level for JPEG, etc.
  *
- * @param self this object
- * @return the sampling factors
+ * @return [Numeric] the compression level
+ */
+VALUE
+Info_quality(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, quality, ulong, &rm_info_data_type);
+}
+
+/**
+ * Get the compression level for JPEG, etc.
+ *
+ * @param val [Numeric] the compression level
+ * @return [Numeric] the given value
+ */
+VALUE
+Info_quality_eq(VALUE self, VALUE val)
+{
+    IMPLEMENT_TYPED_ATTR_WRITER(Info, quality, ulong, &rm_info_data_type);
+}
+
+/**
+ * Get sampling factors used by JPEG or MPEG-2 encoder and YUV decoder/encoder.
+ *
+ * @return [String, nil] the sampling factors
  */
 VALUE
 Info_sampling_factor(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     if (info->sampling_factor)
     {
         return rb_str_new2(info->sampling_factor);
@@ -1940,12 +1827,8 @@ Info_sampling_factor(VALUE self)
 /**
  * Set sampling factors used by JPEG or MPEG-2 encoder and YUV decoder/encoder.
  *
- * Ruby usage:
- *   - @verbatim Info#sampling_factor= @endverbatim
- *
- * @param self this object
- * @param sampling_factor the sampling factors
- * @return self
+ * @param sampling_factor [String] the sampling factors
+ * @return [String] the given value
  */
 VALUE
 Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
@@ -1954,7 +1837,7 @@ Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
     char *sampling_factor_p = NULL;
     long sampling_factor_len = 0;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (!NIL_P(sampling_factor))
     {
@@ -1971,25 +1854,21 @@ Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
         magick_clone_string(&info->sampling_factor, sampling_factor_p);
     }
 
-    return self;
+    return sampling_factor;
 }
 
 
 /**
  * Get the scene number.
  *
- * Ruby usage:
- *   - @verbatim Info#scene @endverbatim
- *
- * @param self this object
- * @return the scene number
+ * @return [Numeric] the scene number
  */
 VALUE
 Info_scene(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     return  ULONG2NUM(info->scene);
 }
 
@@ -1997,12 +1876,8 @@ Info_scene(VALUE self)
 /**
  * Set the scene number.
  *
- * Ruby usage:
- *   - @verbatim Info#scene= @endverbatim
- *
- * @param self this object
- * @param scene the scene number
- * @return self
+ * @param scene [Numeric] the scene number
+ * @return [Numeric] the given value
  */
 VALUE
 Info_scene_eq(VALUE self, VALUE scene)
@@ -2010,84 +1885,73 @@ Info_scene_eq(VALUE self, VALUE scene)
     Info *info;
     char buf[25];
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, 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);
+    snprintf(buf, sizeof(buf), "%"RMIuSIZE"", info->scene);
+    SetImageOption(info, "scene", buf);
 
-    return self;
+    return scene;
 }
 
 
 /**
  * Get the server name.
  *
- * Ruby usage:
- *   - @verbatim Info#server_name @endverbatim
- *
- * @param self this object
- * @return the server name
+ * @return [String] the server name
  */
-DEF_ATTR_READER(Info, server_name, str)
+VALUE
+Info_server_name(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, server_name, str, &rm_info_data_type);
+}
 
 
 /**
  * Set the server name.
  *
- * Ruby usage:
- *   - @verbatim Info#server_name= @endverbatim
- *
- * @param self this object
- * @param server_arg the server name as a String
- * @return self
+ * @param server_arg [String] the server name
+ * @return [String] the given value
  */
 VALUE
 Info_server_name_eq(VALUE self, VALUE server_arg)
 {
     Info *info;
-    char *server;
 
-    Data_Get_Struct(self, Info, info);
-    if (NIL_P(server_arg) || StringValuePtr(server_arg) == NULL)
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    if (NIL_P(server_arg) || StringValueCStr(server_arg) == NULL)
     {
         magick_free(info->server_name);
         info->server_name = NULL;
     }
     else
     {
-        server = StringValuePtr(server_arg);
+        char *server;
+
+        server = StringValueCStr(server_arg);
         magick_clone_string(&info->server_name, server);
     }
-    return self;
+    return server_arg;
 }
 
 /**
  * Get ths size
  *
- * Ruby usage:
- *   - @verbatim Info#size @endverbatim
- *
- * @param self this object
- * @return the size as a Geometry object
+ * @return [String] the size as a Geometry object
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
-DEF_ATTR_READER(Info, size, str)
+VALUE
+Info_size(VALUE self)
+{
+    IMPLEMENT_TYPED_ATTR_READER(Info, size, str, &rm_info_data_type);
+}
 
 /**
- * Set the size (either as a Geometry object or a Geometry string, i.e.
- * WxH{+-}x{+-}y)
+ * Set the size (either as a Geometry object or a Geometry string
  *
- * Ruby usage:
- *   - @verbatim Info#size= @endverbatim
- *
- * @param self this object
- * @param size_arg the size
- * @return self
- * @throw ArgumentError
+ * @param size_arg [String] the size
+ * @return [String] the given value
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Info_size_eq(VALUE self, VALUE size_arg)
@@ -2096,7 +1960,7 @@ Info_size_eq(VALUE self, VALUE size_arg)
     VALUE size;
     char *sz;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     if (NIL_P(size_arg))
     {
@@ -2105,8 +1969,8 @@ Info_size_eq(VALUE self, VALUE size_arg)
         return self;
     }
 
-    size = rm_to_s(size_arg);
-    sz = StringValuePtr(size);
+    size = rb_String(size_arg);
+    sz = StringValueCStr(size);
     if (!IsGeometry(sz))
     {
         rb_raise(rb_eArgError, "invalid size geometry: %s", sz);
@@ -2116,18 +1980,14 @@ Info_size_eq(VALUE self, VALUE size_arg)
 
     RB_GC_GUARD(size);
 
-    return self;
+    return size_arg;
 }
 
 
 /**
  * Return the stroke color as a String.
  *
- * Ruby usage:
- *   - @verbatim Info#stroke @endverbatim
- *
- * @param self this object
- * @return the stroke color
+ * @return [String] the stroke color
  */
 VALUE
 Info_stroke(VALUE self)
@@ -2138,13 +1998,8 @@ Info_stroke(VALUE self)
 /**
  * Set the stroke color
  *
- * Ruby usage:
- *   - @verbatim Info#stroke= @endverbatim
- *
- * @param self this object
- * @param color the stroke color as a String
- * @return self
- * @throw ArgumentError
+ * @param color [String] the stroke color
+ * @return [String] the given value
  */
 VALUE
 Info_stroke_eq(VALUE self, VALUE color)
@@ -2154,16 +2009,9 @@ Info_stroke_eq(VALUE self, VALUE color)
 
 
 /**
- * Support for caption: format.
- *
- * Ruby usage:
- *   - @verbatim Info#stroke_width @endverbatim
- *
- * Notes:
- *   - Supported in ImageMagick >= 6.3.2-6
+ * Get stroke width.
  *
- * @param self this object
- * @return the stroke width
+ * @return [Float] the stroke width
  */
 VALUE
 Info_stroke_width(VALUE self)
@@ -2173,17 +2021,10 @@ Info_stroke_width(VALUE self)
 
 
 /**
- * Support for caption: format.
- *
- * Ruby usage:
- *   - @verbatim Info#stroke_width= @endverbatim
- *
- * Notes:
- *   - Supported in ImageMagick >= 6.3.2-6
+ * Set stroke width.
  *
- * @param self this object
- * @param stroke_width the stroke width
- * @return self
+ * @param stroke_width [Float] the stroke width
+ * @return [Float] the given value
  */
 VALUE
 Info_stroke_width_eq(VALUE self, VALUE stroke_width)
@@ -2195,12 +2036,8 @@ Info_stroke_width_eq(VALUE self, VALUE stroke_width)
 /**
  * Set name of texture to tile onto the image background.
  *
- * Ruby usage:
- *   - @verbatim Image::Info#texture= @endverbatim
- *
- * @param self this object
- * @param texture the name of the texture image
- * @return self
+ * @param texture [Magick::Image] the texture image
+ * @return [Magick::Image] the given image
  */
 VALUE
 Info_texture_eq(VALUE self, VALUE texture)
@@ -2209,7 +2046,7 @@ Info_texture_eq(VALUE self, VALUE texture)
     Image *image;
     char name[MaxTextExtent];
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
     // Delete any existing texture file
     if (info->texture)
@@ -2222,28 +2059,50 @@ Info_texture_eq(VALUE self, VALUE texture)
     // If argument is nil we're done
     if (texture == Qnil)
     {
-        return self;
+        return texture;
     }
 
     // Create a temp copy of the texture and store its name in the texture field
     image = rm_check_destroyed(texture);
-    rm_write_temp_image(image, name);
+    rm_write_temp_image(image, name, sizeof(name));
 
     magick_clone_string(&info->texture, name);
 
-    return self;
+    return texture;
 }
 
 
 /**
- * info.tile_offset = [+/-]x[+/-]y.
+ * Return tile_offset geometry.
  *
- * Ruby usage:
- *   - @verbatim Image::Info#tile_offset= @endverbatim
+ * @return [String, nil] the tile offset
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
+ */
+VALUE
+Info_tile_offset(VALUE self)
+{
+    Info *info;
+    const char *tile_offset;
+
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+
+    tile_offset = GetImageOption(info, "tile-offset");
+
+    if (!tile_offset)
+    {
+        return Qnil;
+    }
+
+    return rb_str_new2(tile_offset);
+}
+
+
+/**
+ * Set tile offset geometry.
  *
- * @param self this object
- * @param offset the offset
- * @return self
+ * @param offset [String] the offset geometry
+ * @return [String] the given value
+ * @see https://www.imagemagick.org/Magick++/Geometry.html
  */
 VALUE
 Info_tile_offset_eq(VALUE self, VALUE offset)
@@ -2252,106 +2111,64 @@ Info_tile_offset_eq(VALUE self, VALUE offset)
     VALUE offset_str;
     char *tile_offset;
 
-    offset_str = rm_to_s(offset);
-    tile_offset = StringValuePtr(offset_str);
+    offset_str = rb_String(offset);
+    tile_offset = StringValueCStr(offset_str);
     if (!IsGeometry(tile_offset))
     {
         rb_raise(rb_eArgError, "invalid tile offset geometry: %s", tile_offset);
     }
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
-    (void) DeleteImageOption(info, "tile-offset");
-    (void) SetImageOption(info, "tile-offset", tile_offset);
+    DeleteImageOption(info, "tile-offset");
+    SetImageOption(info, "tile-offset", tile_offset);
 
     RB_GC_GUARD(offset_str);
 
-    return self;
+    return offset;
 }
 
 
 /**
- * Return the name of the transparent color as a String.
- *
- * Ruby usage:
- *   - @verbatim Info#transparent_color @endverbatim
+ * Return the name of the transparent color.
  *
- * @param self this object
- * @return the name of the transparent color
- * @see Image_transparent_color
+ * @return [String] the name of the transparent color
+ * @see Image#transparent_color
  */
 VALUE
 Info_transparent_color(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return rm_pixelpacket_to_color_name_info(info, &info->transparent_color);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return rm_pixelcolor_to_color_name_info(info, &info->transparent_color);
 }
 
 
 /**
  * Set the transparent color.
  *
- * Ruby usage:
- *   - @verbatim Info#transparent_color= @endverbatim
- *
- * @param self this object
- * @param tc_arg the transparent color as a String
- * @return self
- * @throw ArgumentError
+ * @param tc_arg [String] the transparent color
+ * @return [Magick::Pixel, String] the given value
  */
 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;
-}
-
-
-/**
- * Return tile_offset attribute values.
- *
- * Ruby usage:
- *   - @verbatim Image::Info#tile_offset @endverbatim
- *
- * @param self this object
- * @return the tile offset
- */
-VALUE
-Info_tile_offset(VALUE self)
-{
-    Info *info;
-    const char *tile_offset;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    Color_to_PixelColor(&info->transparent_color, tc_arg);
 
-    tile_offset = GetImageOption(info, "tile-offset");
-
-    if (!tile_offset)
-    {
-        return Qnil;
-    }
-
-    return rb_str_new2(tile_offset);
+    return tc_arg;
 }
 
 
 /**
  * Undefine image option.
  *
- * Ruby usage:
- *   - @verbatim Info#undefine(format,key) @endverbatim
- *
- * @param self this object
- * @param format the format
- * @param key the key
- * @return self
+ * @param format [String] the format
+ * @param key [String] the key
+ * @return [Magick::Info] self
  */
 VALUE
 Info_undefine(VALUE self, VALUE format, VALUE key)
@@ -2369,25 +2186,19 @@ Info_undefine(VALUE self, VALUE format, VALUE key)
         rb_raise(rb_eArgError, "can't undefine %.60s:%.1024s - too long", format_p, key_p);
     }
 
-    sprintf(fkey, "%.60s:%.*s", format_p, (int)(MaxTextExtent-61), key_p);
+    snprintf(fkey, sizeof(fkey), "%.60s:%.*s", format_p, (int)(MaxTextExtent-61), key_p);
 
-    Data_Get_Struct(self, Info, info);
-    /* Depending on the IM version, RemoveImageOption returns either */
-    /* char * or MagickBooleanType. Ignore the return value.         */
-    (void) RemoveImageOption(info, fkey);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    DeleteImageOption(info, fkey);
 
     return self;
 }
 
 
 /**
- * Return the undercolor color as a String.
- *
- * Ruby usage:
- *   - @verbatim Info#undercolor @endverbatim
+ * Return the undercolor color.
  *
- * @param self this object
- * @return the undercolor
+ * @return [String] the undercolor
  */
 VALUE
 Info_undercolor(VALUE self)
@@ -2398,13 +2209,8 @@ Info_undercolor(VALUE self)
 /**
  * Set the undercolor color.
  *
- * Ruby usage:
- *   - @verbatim Info#undercolor= @endverbatim
- *
- * @param self this object
- * @param color the undercolor color as a String
- * @return self
- * @throw ArgumentError
+ * @param color [String] the undercolor color
+ * @return [String] the given value
  */
 VALUE
 Info_undercolor_eq(VALUE self, VALUE color)
@@ -2415,87 +2221,96 @@ Info_undercolor_eq(VALUE self, VALUE color)
 /**
  * Get the resolution type.
  *
- * Ruby usage:
- *   - @verbatim Info#units @endverbatim
- *
- * @param self this object
- * @return the resolution type
+ * @return [Magick::ResolutionType] the resolution type
  */
 VALUE
 Info_units(VALUE self)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
-    return ResolutionType_new(info->units);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    return ResolutionType_find(info->units);
 }
 
 /**
  * Set the resolution type
  *
- * Ruby usage:
- *   - @verbatim Info#units= @endverbatim
- *
- * @param self this object
- * @param units the resolution type
- * @return self
- * @throw ArgumentError
+ * @param units [Magick::ResolutionType] the resolution type
+ * @return [Magick::ResolutionType] the given value
  */
 VALUE
 Info_units_eq(VALUE self, VALUE units)
 {
     Info *info;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
     VALUE_TO_ENUM(units, info->units, ResolutionType);
-    return self;
+    return units;
 }
 
 /**
  * Get FlashPix viewing parameters.
  *
- * Ruby usage:
- *   - @verbatim Info#view @endverbatim
- *
- * @param self this object.
- * @return the viewing parameters
+ * @return [String] the viewing parameters
  */
-DEF_ATTR_READER(Info, view, str)
+VALUE
+Info_view(VALUE self)
+{
+    Info *info;
+
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+#if defined(IMAGEMAGICK_7)
+    return C_str_to_R_str(GetImageOption(info, "fpx:view"));
+#else
+    return C_str_to_R_str(info->view);
+#endif
+}
 
 /**
  * Set FlashPix viewing parameters.
  *
- * Ruby usage:
- *   - @verbatim Info#view= @endverbatim
- *
- * @param self this object
- * @param view_arg the viewing parameters
- * @return self
+ * @param view_arg [String] the viewing parameters
+ * @return [String] the given value
  */
 VALUE
 Info_view_eq(VALUE self, VALUE view_arg)
 {
     Info *info;
-    char *view;
+    char *view = NULL;
 
-    Data_Get_Struct(self, Info, info);
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
 
-    if (NIL_P(view_arg) || StringValuePtr(view_arg) == NULL)
+    if (!NIL_P(view_arg))
+    {
+        view = StringValueCStr(view_arg);
+    }
+
+#if defined(IMAGEMAGICK_7)
+    if (view)
+    {
+        SetImageOption(info, "fpx:view", view);
+    }
+    else
+    {
+        RemoveImageOption(info, "fpx:view");
+    }
+#else
+    if (info->view)
     {
         magick_free(info->view);
         info->view = NULL;
     }
-    else
+    if (view)
     {
-        view = StringValuePtr(view_arg);
         magick_clone_string(&info->view, view);
     }
-    return self;
+#endif
+    return view_arg;
 }
 
 
 /**
- * If there is a texture image, delete it before destroying the ImageInfo
+ * If there is a texture image, delete it before destroying the Image::Info
  * structure.
  *
  * No Ruby usage (internal function)
@@ -2503,7 +2318,7 @@ Info_view_eq(VALUE self, VALUE view_arg)
  * @param infoptr pointer to the Info object
  */
 static void
-destroy_Info(void *infoptr)
+Info_free(void *infoptr)
 {
     Info *info = (Info *)infoptr;
 
@@ -2514,12 +2329,24 @@ destroy_Info(void *infoptr)
         info->texture = NULL;
     }
 
-    (void) DestroyImageInfo(info);
+    DestroyImageInfo(info);
 }
 
+/**
+  * Get Info object size.
+  *
+  * No Ruby usage (internal function)
+  *
+  * @param infoptr pointer to the Info object
+  */
+static size_t
+Info_memsize(const void *infoptr)
+{
+    return sizeof(Info);
+}
 
 /**
- * Create an ImageInfo object.
+ * Create an Image::Info object.
  *
  * No Ruby usage (internal function)
  *
@@ -2537,7 +2364,7 @@ Info_alloc(VALUE class)
     {
         rb_raise(rb_eNoMemError, "not enough memory to initialize Info object");
     }
-    info_obj = Data_Wrap_Struct(class, NULL, destroy_Info, info);
+    info_obj = TypedData_Wrap_Struct(class, &rm_info_data_type, info);
 
     RB_GC_GUARD(info_obj);
 
@@ -2571,10 +2398,11 @@ rm_info_new(void)
 /**
  * If an initializer block is present, run it.
  *
- * Ruby usage:
- *   - @verbatim Info#initialize @endverbatim
+ * @overload initialize
+ *
+ * @overload initialize
+ *   @yield [Magick::Image::Info]
  *
- * @param self this object
  * @return self
  */
 VALUE
@@ -2582,8 +2410,7 @@ Info_initialize(VALUE self)
 {
     if (rb_block_given_p())
     {
-        // Run the block in self's context
-        (void) rb_obj_instance_eval(0, NULL, self);
+        rb_yield(self);
     }
     return self;
 }