rmagick 3.1.0 → 3.2.0

data/ext/RMagick/rminfo.c

@@ -71,7 +71,7 @@ get_option(VALUE self, const char *key)
  * @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)
@@ -90,7 +90,7 @@ set_option(VALUE self, const char *key, VALUE string)
         value = StringValuePtr(string);
         (void) SetImageOption(info, key, value);
     }
-    return self;
+    return string;
 }
 
 
@@ -105,7 +105,7 @@ set_option(VALUE self, const char *key, VALUE string)
  * @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)
 {
@@ -135,7 +135,7 @@ static VALUE set_color_option(VALUE self, const char *option, VALUE color)
         (void) SetImageOption(info, option, name);
     }
 
-    return self;
+    return color;
 }
 
 
@@ -183,7 +183,7 @@ 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)
 {
@@ -215,7 +215,7 @@ static VALUE set_dbl_option(VALUE self, const char *option, VALUE value)
         (void) SetImageOption(info, option, buff);
     }
 
-    return self;
+    return value;
 }
 
 
@@ -283,7 +283,7 @@ 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:
@@ -354,7 +354,7 @@ 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);
+            (void) snprintf(ckey, sizeof(ckey), "%.60s:%.*s", format_p, (int)(sizeof(ckey)-MAX_FORMAT_LEN), key_p);
 
             value = argv[2];
             break;
@@ -443,14 +443,7 @@ Info_authenticate(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    if (info->authenticate)
-    {
-        return rb_str_new2(info->authenticate);
-    }
-    else
-    {
-        return Qnil;
-    }
+    return C_str_to_R_str(info->authenticate);
 }
 
 
@@ -461,21 +454,20 @@ Info_authenticate(VALUE self)
  *   - @verbatim Info#authenticate= @endverbatim
  *
  * @param self this object
- * @param passwd the authenticating password
- * @return self
+ * @param passwd_arg the authenticating password
+ * @return passwd_arg
  */
 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);
 
-    if (!NIL_P(passwd))
+    if (!NIL_P(passwd_arg))
     {
-        passwd_p = rm_str2cstr(passwd, &passwd_l);
+        passwd = StringValuePtr(passwd_arg);
     }
 
     if (info->authenticate)
@@ -483,12 +475,12 @@ Info_authenticate_eq(VALUE self, VALUE passwd)
         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);
     }
 
-    return self;
+    return passwd_arg;
 }
 
 
@@ -523,7 +515,7 @@ Info_background_color(VALUE self)
  *
  * @param self this object
  * @param bc_arg the background color
- * @return self
+ * @return bc_arg
  * @throw ArgumentError
  */
 VALUE
@@ -535,7 +527,7 @@ Info_background_color_eq(VALUE self, VALUE bc_arg)
     Data_Get_Struct(self, Info, info);
     Color_to_PixelColor(&info->background_color, bc_arg);
     //SetImageOption(info, "background", pixel_packet_to_hexname(&info->background_color, colorname));
-    return self;
+    return bc_arg;
 }
 
 /**
@@ -568,7 +560,7 @@ Info_border_color(VALUE self)
  *
  * @param self this object
  * @param bc_arg the border color
- * @return self
+ * @return bc_arg
  * @throw ArgumentError
  */
 VALUE
@@ -580,7 +572,7 @@ Info_border_color_eq(VALUE self, VALUE bc_arg)
     Data_Get_Struct(self, Info, info);
     Color_to_PixelColor(&info->border_color, bc_arg);
     //SetImageOption(info, "bordercolor", pixel_packet_to_hexname(&info->border_color, colorname));
-    return self;
+    return bc_arg;
 }
 
 
@@ -672,7 +664,7 @@ Info_colorspace(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return ColorspaceType_new(info->colorspace);
+    return ColorspaceType_find(info->colorspace);
 }
 
 /**
@@ -683,7 +675,7 @@ Info_colorspace(VALUE self)
  *
  * @param self this object
  * @param colorspace the colorspace type
- * @return self
+ * @return colorspace
  * @throw ArgumentError
  */
 VALUE
@@ -693,7 +685,7 @@ Info_colorspace_eq(VALUE self, VALUE colorspace)
 
     Data_Get_Struct(self, Info, info);
     VALUE_TO_ENUM(colorspace, info->colorspace, ColorspaceType);
-    return self;
+    return colorspace;
 }
 
 OPTION_ATTR_ACCESSOR(comment, Comment)
@@ -713,7 +705,7 @@ Info_compression(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return CompressionType_new(info->compression);
+    return CompressionType_find(info->compression);
 }
 
 /**
@@ -724,7 +716,7 @@ Info_compression(VALUE self)
  *
  * @param self this object
  * @param type the compression type
- * @return self
+ * @return type
  * @throw ArgumentError
  */
 VALUE
@@ -734,7 +726,7 @@ Info_compression_eq(VALUE self, VALUE type)
 
     Data_Get_Struct(self, Info, info);
     VALUE_TO_ENUM(type, info->compression, CompressionType);
-    return self;
+    return type;
 }
 
 /**
@@ -845,9 +837,7 @@ 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));
 }
 
 /**
@@ -861,7 +851,7 @@ arg_is_integer(VALUE arg)
  *
  * @param self this object
  * @param string the delay
- * @return self
+ * @return string
  */
 VALUE
 Info_delay_eq(VALUE self, VALUE string)
@@ -889,7 +879,7 @@ Info_delay_eq(VALUE self, VALUE string)
         sprintf(dstr, "%d", delay);
         (void) SetImageOption(info, "delay", dstr);
     }
-    return self;
+    return string;
 }
 
 /**
@@ -914,7 +904,7 @@ DEF_ATTR_READER(Info, density, str)
  *
  * @param self this object
  * @param density_arg the density
- * @return self
+ * @return density_arg
  * @throw ArgumentError
  */
 VALUE
@@ -944,7 +934,7 @@ Info_density_eq(VALUE self, VALUE density_arg)
 
     RB_GC_GUARD(density);
 
-    return self;
+    return density_arg;
 }
 
 /**
@@ -966,7 +956,7 @@ DEF_ATTR_READER(Info, depth, int)
  *
  * @param self this object
  * @param depth the depth
- * @return self
+ * @return depth
  * @throw ArgumentError
  */
 VALUE
@@ -996,7 +986,7 @@ Info_depth_eq(VALUE self, VALUE depth)
     }
 
     info->depth = d;
-    return self;
+    return depth;
 }
 
 /** A dispose option */
@@ -1093,7 +1083,7 @@ Info_dispose(VALUE self)
  *
  * @param self this object
  * @param disp the DisposeType enumerator
- * @return self
+ * @return disp
  */
 VALUE
 Info_dispose_eq(VALUE self, VALUE disp)
@@ -1124,7 +1114,7 @@ Info_dispose_eq(VALUE self, VALUE disp)
     }
 
     (void) SetImageOption(info, "dispose", option);
-    return self;
+    return disp;
 }
 
 DEF_ATTR_ACCESSOR(Info, dither, bool)
@@ -1145,7 +1135,7 @@ Info_endian(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return EndianType_new(info->endian);
+    return EndianType_find(info->endian);
 }
 
 
@@ -1157,7 +1147,7 @@ Info_endian(VALUE self)
  *
  * @param self this object
  * @param endian the endian (Magick::MSBEndian or Magick::LSBEndian)
- * @return self
+ * @return endian
  */
 VALUE
 Info_endian_eq(VALUE self, VALUE endian)
@@ -1172,7 +1162,7 @@ Info_endian_eq(VALUE self, VALUE endian)
 
     Data_Get_Struct(self, Info, info);
     info->endian = type;
-    return self;
+    return endian;
 }
 
 
@@ -1201,7 +1191,7 @@ DEF_ATTR_READER(Info, extract, str)
  *
  * @param self this object
  * @param extract_arg the extract string
- * @return self
+ * @return extract_arg
  * @throw ArgumentError
  */
 VALUE
@@ -1231,7 +1221,7 @@ Info_extract_eq(VALUE self, VALUE extract_arg)
 
     RB_GC_GUARD(extract);
 
-    return self;
+    return extract_arg;
 }
 
 
@@ -1268,7 +1258,7 @@ Info_filename(VALUE self)
  *
  * @param self this object
  * @param filename the filename
- * @return self
+ * @return filename
  * @see Image_capture
  */
 VALUE
@@ -1290,7 +1280,7 @@ Info_filename_eq(VALUE self, VALUE filename)
         fname = StringValuePtr(filename);
         strncpy(info->filename, fname, MaxTextExtent);
     }
-    return self;
+    return filename;
 }
 
 
@@ -1346,7 +1336,7 @@ DEF_ATTR_READER(Info, font, str)
  *
  * @param self this object
  * @param font_arg the font (as a String)
- * @return self
+ * @return font_arg
  */
 VALUE
 Info_font_eq(VALUE self, VALUE font_arg)
@@ -1365,7 +1355,7 @@ Info_font_eq(VALUE self, VALUE font_arg)
         font = StringValuePtr(font_arg);
         magick_clone_string(&info->font, font);
     }
-    return self;
+    return font_arg;
 }
 
 /**
@@ -1404,7 +1394,7 @@ VALUE Info_format(VALUE self)
  *
  * @param self this object
  * @param magick the encoding format
- * @return self
+ * @return magick
  */
 VALUE
 Info_format_eq(VALUE self, VALUE magick)
@@ -1429,7 +1419,7 @@ Info_format_eq(VALUE self, VALUE magick)
     }
 
     strncpy(info->magick, m->name, MaxTextExtent-1);
-    return self;
+    return magick;
 }
 
 /**
@@ -1453,7 +1443,7 @@ DEF_ATTR_READER(Info, fuzz, dbl)
  *
  * @param self this object
  * @param fuzz the fuzz
- * @return self
+ * @return fuzz
  * @see Image_fuzz_eq
  */
 VALUE Info_fuzz_eq(VALUE self, VALUE fuzz)
@@ -1462,7 +1452,7 @@ VALUE Info_fuzz_eq(VALUE self, VALUE fuzz)
 
     Data_Get_Struct(self, Info, info);
     info->fuzz = rm_fuzz_to_dbl(fuzz);
-    return self;
+    return fuzz;
 }
 
 /** A gravity option */
@@ -1563,7 +1553,7 @@ VALUE Info_gravity(VALUE self)
  *
  * @param self this object
  * @param grav the gravity enumerator
- * @return self
+ * @return grav
  */
 VALUE
 Info_gravity_eq(VALUE self, VALUE grav)
@@ -1594,11 +1584,56 @@ Info_gravity_eq(VALUE self, VALUE grav)
     }
 
     (void) SetImageOption(info, "gravity", option);
-    return self;
+    return grav;
+}
+
+
+/**
+ * Get the group attribute.
+ *
+ * Ruby usage:
+ *   - @verbatim Info#group @endverbatim
+ *
+ * @param self this object
+ * @return the group
+ * @deprecated This method has been deprecated.
+ */
+VALUE
+Info_group(VALUE self)
+{
+    Info *info;
+
+    rb_warning("Info#group is deprecated");
+    (void) rm_check_destroyed(self);
+    Data_Get_Struct(self, Info, info);
+    return C_long_to_R_long(info->group);
 }
 
 
-DEF_ATTR_ACCESSOR(Info, group, long)
+/**
+ * Set the group attribute.
+ *
+ * Ruby usage:
+ *   - @verbatim Info#group= @endverbatim
+ *
+ * @param self this object
+ * @param value the group
+ * @return value
+ * @deprecated This method has been deprecated.
+ */
+VALUE
+Info_group_eq(VALUE self, VALUE value)
+{
+    Info *info;
+
+    rb_warning("Info#group= is deprecated");
+    (void) rm_check_destroyed(self);
+    rb_check_frozen(self);
+    Data_Get_Struct(self, Info, info);
+    info->group = R_long_to_C_long(value);
+    return value;
+}
+
 
 /**
  * Get the classification type.
@@ -1615,7 +1650,7 @@ Info_image_type(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return ImageType_new(info->type);
+    return ImageType_find(info->type);
 }
 
 /**
@@ -1626,7 +1661,7 @@ Info_image_type(VALUE self)
  *
  * @param self this object
  * @param type the classification type
- * @return self
+ * @return type
  * @throw ArgumentError
  */
 VALUE
@@ -1636,7 +1671,7 @@ Info_image_type_eq(VALUE self, VALUE type)
 
     Data_Get_Struct(self, Info, info);
     VALUE_TO_ENUM(type, info->type, ImageType);
-    return self;
+    return type;
 }
 
 /**
@@ -1654,7 +1689,7 @@ Info_interlace(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return InterlaceType_new(info->interlace);
+    return InterlaceType_find(info->interlace);
 }
 
 /**
@@ -1665,7 +1700,7 @@ Info_interlace(VALUE self)
  *
  * @param self this object
  * @param inter the interlace type
- * @return self
+ * @return inter
  * @throw ArgumentError
  */
 VALUE
@@ -1675,7 +1710,7 @@ Info_interlace_eq(VALUE self, VALUE inter)
 
     Data_Get_Struct(self, Info, info);
     VALUE_TO_ENUM(inter, info->interlace, InterlaceType);
-    return self;
+    return inter;
 }
 
 OPTION_ATTR_ACCESSOR(label, Label)
@@ -1707,7 +1742,7 @@ Info_matte_color(VALUE self)
  *
  * @param self this object
  * @param matte_arg the name of the matte as a String
- * @return self
+ * @return matte_arg
  * @throw ArgumentError
  */
 VALUE
@@ -1719,7 +1754,7 @@ Info_matte_color_eq(VALUE self, VALUE matte_arg)
     Data_Get_Struct(self, Info, info);
     Color_to_PixelColor(&info->matte_color, matte_arg);
     //SetImageOption(info, "mattecolor", pixel_packet_to_hexname(&info->matte_color, colorname));
-    return self;
+    return matte_arg;
 }
 
 /**
@@ -1730,7 +1765,7 @@ Info_matte_color_eq(VALUE self, VALUE matte_arg)
  *
  * @param self this object
  * @param monitor the monitor
- * @return self
+ * @return monitor
  * @see Image_monitor_eq
  */
 VALUE
@@ -1749,7 +1784,7 @@ Info_monitor_eq(VALUE self, VALUE monitor)
         (void) SetImageInfoProgressMonitor(info, rm_progress_monitor, (void *)monitor);
     }
 
-    return self;
+    return monitor;
 }
 
 
@@ -1774,7 +1809,7 @@ Info_orientation(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return OrientationType_new(info->orientation);
+    return OrientationType_find(info->orientation);
 }
 
 
@@ -1786,7 +1821,7 @@ Info_orientation(VALUE self)
  *
  * @param self this object
  * @param inter the orientation type as an OrientationType enum value
- * @return self
+ * @return inter
  * @throw ArgumentError
  */
 VALUE
@@ -1796,7 +1831,7 @@ Info_orientation_eq(VALUE self, VALUE inter)
 
     Data_Get_Struct(self, Info, info);
     VALUE_TO_ENUM(inter, info->orientation, OrientationType);
-    return self;
+    return inter;
 }
 
 
@@ -1831,7 +1866,7 @@ Info_origin(VALUE self)
  *
  * @param self this object
  * @param origin_arg the origin geometry
- * @return self
+ * @return origin_arg
  */
 VALUE
 Info_origin_eq(VALUE self, VALUE origin_arg)
@@ -1862,7 +1897,7 @@ Info_origin_eq(VALUE self, VALUE origin_arg)
 
     RB_GC_GUARD(origin_str);
 
-    return self;
+    return origin_arg;
 }
 
 
@@ -1894,7 +1929,7 @@ Info_page(VALUE self)
  *
  * @param self this object
  * @param page_arg the geometry
- * @return self
+ * @return page_arg
  */
 VALUE
 Info_page_eq(VALUE self, VALUE page_arg)
@@ -1922,7 +1957,7 @@ Info_page_eq(VALUE self, VALUE page_arg)
 
     RB_GC_GUARD(geom_str);
 
-    return self;
+    return page_arg;
 }
 
 DEF_ATTR_ACCESSOR(Info, pointsize, dbl)
@@ -1961,7 +1996,7 @@ Info_sampling_factor(VALUE self)
  *
  * @param self this object
  * @param sampling_factor the sampling factors
- * @return self
+ * @return sampling_factor
  */
 VALUE
 Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
@@ -1987,7 +2022,7 @@ Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
         magick_clone_string(&info->sampling_factor, sampling_factor_p);
     }
 
-    return self;
+    return sampling_factor;
 }
 
 
@@ -2018,7 +2053,7 @@ Info_scene(VALUE self)
  *
  * @param self this object
  * @param scene the scene number
- * @return self
+ * @return scene
  */
 VALUE
 Info_scene_eq(VALUE self, VALUE scene)
@@ -2029,14 +2064,10 @@ Info_scene_eq(VALUE self, VALUE scene)
     Data_Get_Struct(self, Info, info);
     info->scene = NUM2ULONG(scene);
 
-#if defined(HAVE_SNPRINTF)
     (void) snprintf(buf, sizeof(buf), "%-ld", info->scene);
-#else
-    (void) sprintf(buf, "%-l", info->scene);
-#endif
     (void) SetImageOption(info, "scene", buf);
 
-    return self;
+    return scene;
 }
 
 
@@ -2060,7 +2091,7 @@ DEF_ATTR_READER(Info, server_name, str)
  *
  * @param self this object
  * @param server_arg the server name as a String
- * @return self
+ * @return server_arg
  */
 VALUE
 Info_server_name_eq(VALUE self, VALUE server_arg)
@@ -2079,7 +2110,7 @@ Info_server_name_eq(VALUE self, VALUE server_arg)
         server = StringValuePtr(server_arg);
         magick_clone_string(&info->server_name, server);
     }
-    return self;
+    return server_arg;
 }
 
 /**
@@ -2102,7 +2133,7 @@ DEF_ATTR_READER(Info, size, str)
  *
  * @param self this object
  * @param size_arg the size
- * @return self
+ * @return size_arg
  * @throw ArgumentError
  */
 VALUE
@@ -2132,7 +2163,7 @@ Info_size_eq(VALUE self, VALUE size_arg)
 
     RB_GC_GUARD(size);
 
-    return self;
+    return size_arg;
 }
 
 
@@ -2216,7 +2247,7 @@ Info_stroke_width_eq(VALUE self, VALUE stroke_width)
  *
  * @param self this object
  * @param texture the name of the texture image
- * @return self
+ * @return texture
  */
 VALUE
 Info_texture_eq(VALUE self, VALUE texture)
@@ -2238,7 +2269,7 @@ 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
@@ -2247,7 +2278,7 @@ Info_texture_eq(VALUE self, VALUE texture)
 
     magick_clone_string(&info->texture, name);
 
-    return self;
+    return texture;
 }
 
 
@@ -2259,7 +2290,7 @@ Info_texture_eq(VALUE self, VALUE texture)
  *
  * @param self this object
  * @param offset the offset
- * @return self
+ * @return offset
  */
 VALUE
 Info_tile_offset_eq(VALUE self, VALUE offset)
@@ -2282,7 +2313,7 @@ Info_tile_offset_eq(VALUE self, VALUE offset)
 
     RB_GC_GUARD(offset_str);
 
-    return self;
+    return offset;
 }
 
 
@@ -2314,7 +2345,7 @@ Info_transparent_color(VALUE self)
  *
  * @param self this object
  * @param tc_arg the transparent color as a String
- * @return self
+ * @return tc_arg
  * @throw ArgumentError
  */
 VALUE
@@ -2326,7 +2357,7 @@ Info_transparent_color_eq(VALUE self, VALUE tc_arg)
     Data_Get_Struct(self, Info, info);
     Color_to_PixelColor(&info->transparent_color, tc_arg);
     //SetImageOption(info, "transparent", pixel_packet_to_hexname(&info->transparent_color, colorname));
-    return self;
+    return tc_arg;
 }
 
 
@@ -2385,7 +2416,7 @@ 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);
     (void) DeleteImageOption(info, fkey);
@@ -2441,7 +2472,7 @@ Info_units(VALUE self)
     Info *info;
 
     Data_Get_Struct(self, Info, info);
-    return ResolutionType_new(info->units);
+    return ResolutionType_find(info->units);
 }
 
 /**
@@ -2452,7 +2483,7 @@ Info_units(VALUE self)
  *
  * @param self this object
  * @param units the resolution type
- * @return self
+ * @return units
  * @throw ArgumentError
  */
 VALUE
@@ -2462,7 +2493,7 @@ Info_units_eq(VALUE self, VALUE units)
 
     Data_Get_Struct(self, Info, info);
     VALUE_TO_ENUM(units, info->units, ResolutionType);
-    return self;
+    return units;
 }
 
 /**
@@ -2474,7 +2505,14 @@ Info_units_eq(VALUE self, VALUE units)
  * @param self this object.
  * @return the viewing parameters
  */
-DEF_ATTR_READER(Info, view, str)
+VALUE
+Info_view(VALUE self)
+{
+    Info *info;
+
+    Data_Get_Struct(self, Info, info);
+    return C_str_to_R_str(info->view);
+}
 
 /**
  * Set FlashPix viewing parameters.
@@ -2484,27 +2522,31 @@ DEF_ATTR_READER(Info, view, str)
  *
  * @param self this object
  * @param view_arg the viewing parameters
- * @return self
+ * @return view_arg
  */
 VALUE
 Info_view_eq(VALUE self, VALUE view_arg)
 {
     Info *info;
-    char *view;
+    char *view = NULL;
 
     Data_Get_Struct(self, Info, info);
 
-    if (NIL_P(view_arg) || StringValuePtr(view_arg) == NULL)
+    if (!NIL_P(view_arg))
+    {
+        view = StringValuePtr(view_arg);
+    }
+
+    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;
+    return view_arg;
 }