rmagick 3.1.0 → 3.2.0

data/ext/RMagick/rmkinfo.c

@@ -58,8 +58,10 @@ KernelInfo_initialize(VALUE self, VALUE kernel_string)
 
     kernel = AcquireKernelInfo(StringValueCStr(kernel_string));
 
-    if (kernel == NULL)
+    if (!kernel)
+    {
         rb_raise(rb_eRuntimeError, "failed to parse kernel string");
+    }
 
     DATA_PTR(self) = kernel;
 
@@ -75,6 +77,10 @@ KernelInfo_initialize(VALUE self, VALUE kernel_string)
  * @param self this object
  * @deprecated This method has been deprecated.
  */
+
+/* ZeroKernelNans() is private function in ImageMagick. */
+MagickExport void ZeroKernelNans(KernelInfo *kernel);
+
 VALUE
 KernelInfo_zero_nans(VALUE self)
 {
@@ -92,6 +98,10 @@ KernelInfo_zero_nans(VALUE self)
  * @param self this object
  * @param scale scale to add
  */
+
+/* UnityAddKernelInfo() was private function until IM 6.9 */
+MagickExport void UnityAddKernelInfo(KernelInfo *kernel, const double scale);
+
 VALUE
 KernelInfo_unity_add(VALUE self, VALUE scale)
 {
@@ -131,6 +141,10 @@ KernelInfo_show(VALUE self)
  *                     and/or Magick::PercentValue
  * @param self this object
  */
+
+/* ScaleKernelInfo() was private function until IM 6.9 */
+MagickExport void ScaleKernelInfo(KernelInfo *kernel, const double scaling_factor,const GeometryFlags normalize_flags);
+
 VALUE
 KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
 {
@@ -246,7 +260,9 @@ KernelInfo_builtin(VALUE self, VALUE what, VALUE geometry)
     kernel = AcquireKernelBuiltIn(kernel_type, &info);
 
     if (!kernel)
+    {
         rb_raise(rb_eRuntimeError, "failed to acquire builtin kernel");
+    }
 
     return Data_Wrap_Struct(self, NULL, rm_kernel_info_destroy, kernel);
 }

data/ext/RMagick/rmmain.c

@@ -62,17 +62,7 @@ static void features_constant(void);
  */
 static void *rm_malloc(size_t size)
 {
-    void *p;
-//    int old_state;
-
-//    old_state = rb_gc_disable();
-    p = xmalloc((long)size);
-//    if (!RTEST(old_state))
-//    {
-//        rb_gc_enable();
-//    }
-
-    return p;
+    return xmalloc((long)size);
 }
 
 
@@ -89,17 +79,7 @@ static void *rm_malloc(size_t size)
  */
 static void *rm_realloc(void *ptr, size_t size)
 {
-    void *p;
-//    int old_state;
-
-//    old_state = rb_gc_disable();
-    p = xrealloc(ptr, (long)size);
-//    if (!RTEST(old_state))
-//    {
-//        rb_gc_enable();
-//    }
-
-    return p;
+    return xrealloc(ptr, (long)size);
 }
 
 
@@ -123,20 +103,37 @@ static void rm_free(void *ptr)
  *
  * No Ruby usage (internal function)
  */
-static void set_managed_memory(void)
+static inline void managed_memory_enable(VALUE enable)
 {
-    ID enable_mm = rb_intern("RMAGICK_ENABLE_MANAGED_MEMORY");
-
-    if (RTEST(rb_const_defined(rb_cObject, enable_mm)) && RTEST(rb_const_get(rb_cObject, enable_mm)))
+    if (enable)
     {
-        rb_warning("RMagick: %s", "managed memory enabled. This is an experimental feature.");
         SetMagickMemoryMethods(rm_malloc, rm_realloc, rm_free);
-        rb_define_const(Module_Magick, "MANAGED_MEMORY", Qtrue);
     }
-    else
+    rb_define_const(Module_Magick, "MANAGED_MEMORY", enable);
+}
+
+static void set_managed_memory(void)
+{
+    char *disable = getenv("RMAGICK_DISABLE_MANAGED_MEMORY");
+
+    if (disable)
     {
-        rb_define_const(Module_Magick, "MANAGED_MEMORY", Qfalse);
+        managed_memory_enable(Qfalse);
+        return;
     }
+
+#if defined(_WIN32)
+#if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_9_0)
+    managed_memory_enable(Qtrue);
+#else
+    // Disable managed memory feature with ImageMagick 6.8.x or below because causes crash.
+    // Refer https://ci.appveyor.com/project/mockdeep/rmagick/builds/24706171
+    managed_memory_enable(Qfalse);
+#endif
+#else
+    // Not Windows
+    managed_memory_enable(Qtrue);
+#endif
 }
 
 
@@ -152,14 +149,14 @@ Init_RMagick2(void)
 {
     VALUE observable;
 
-    MagickCoreGenesis("RMagick", MagickFalse);
-
-    test_Magick_version();
-
     Module_Magick = rb_define_module("Magick");
 
     set_managed_memory();
 
+    MagickCoreGenesis("RMagick", MagickFalse);
+
+    test_Magick_version();
+
     /*-----------------------------------------------------------------------*/
     /* Create IDs for frequently used methods, etc.                          */
     /*-----------------------------------------------------------------------*/
@@ -419,7 +416,7 @@ Init_RMagick2(void)
     rb_define_method(Class_Image, "marshal_dump", Image_marshal_dump, 0);
     rb_define_method(Class_Image, "marshal_load", Image_marshal_load, 1);
     rb_define_method(Class_Image, "mask", Image_mask, -1);
-    rb_define_method(Class_Image, "matte_flood_fill", Image_matte_flood_fill, 5);
+    rb_define_method(Class_Image, "matte_flood_fill", Image_matte_flood_fill, -1);
     rb_define_method(Class_Image, "median_filter", Image_median_filter, -1);
     rb_define_method(Class_Image, "minify", Image_minify, 0);
     rb_define_method(Class_Image, "minify!", Image_minify_bang, 0);
@@ -527,6 +524,7 @@ Init_RMagick2(void)
     rb_define_method(Class_ImageList, "append", ImageList_append, 1);
     rb_define_method(Class_ImageList, "average", ImageList_average, 0);
     rb_define_method(Class_ImageList, "coalesce", ImageList_coalesce, 0);
+    rb_define_method(Class_ImageList, "combine", ImageList_combine, -1);
     rb_define_method(Class_ImageList, "composite_layers", ImageList_composite_layers, -1);
     rb_define_method(Class_ImageList, "deconstruct", ImageList_deconstruct, 0);
     rb_define_method(Class_ImageList, "display", ImageList_display, 0);
@@ -646,6 +644,7 @@ Init_RMagick2(void)
     DCL_ATTR_ACCESSOR(Pixel, red)
     DCL_ATTR_ACCESSOR(Pixel, green)
     DCL_ATTR_ACCESSOR(Pixel, blue)
+    DCL_ATTR_ACCESSOR(Pixel, alpha)
     DCL_ATTR_ACCESSOR(Pixel, opacity)
 
     // Define the CMYK attributes
@@ -861,7 +860,9 @@ Init_RMagick2(void)
     // Miscellaneous fixed-point constants
     DEF_CONST(QuantumRange);
     DEF_CONST(MAGICKCORE_QUANTUM_DEPTH);
+    DEF_CONSTV(OpaqueAlpha, QuantumRange);
     DEF_CONST(OpaqueOpacity);
+    DEF_CONSTV(TransparentAlpha, 0);
     DEF_CONST(TransparentOpacity);
 
     version_constants();
@@ -892,8 +893,8 @@ Init_RMagick2(void)
         ENUMERATOR(RightAlign)
     END_ENUM
 
-    // AlphaChannelType constants
-    DEF_ENUM(AlphaChannelType)
+    // AlphaChannelOption constants
+    DEF_ENUM(AlphaChannelOption)
         ENUMERATOR(UndefinedAlphaChannel)
         ENUMERATOR(ActivateAlphaChannel)
         ENUMERATOR(DeactivateAlphaChannel)
@@ -1003,7 +1004,6 @@ Init_RMagick2(void)
 
     // CompositeOperator constants
     DEF_ENUM(CompositeOperator)
-        ENUMERATOR(AddCompositeOp)
         ENUMERATOR(AtopCompositeOp)
         ENUMERATOR(BlendCompositeOp)
         ENUMERATOR(BlurCompositeOp)
@@ -1019,13 +1019,13 @@ Init_RMagick2(void)
         ENUMERATOR(CopyCyanCompositeOp)
         ENUMERATOR(CopyGreenCompositeOp)
         ENUMERATOR(CopyMagentaCompositeOp)
-        ENUMERATOR(CopyOpacityCompositeOp)
+        ENUMERATORV(CopyAlphaCompositeOp, CopyOpacityCompositeOp)
         ENUMERATOR(CopyRedCompositeOp)
         ENUMERATOR(CopyYellowCompositeOp)
         ENUMERATOR(DarkenCompositeOp)
         ENUMERATOR(DarkenIntensityCompositeOp)
         ENUMERATOR(DistortCompositeOp)
-        ENUMERATOR(DivideCompositeOp)
+        ENUMERATOR(DivideDstCompositeOp)
         ENUMERATOR(DivideSrcCompositeOp)
         ENUMERATOR(DstAtopCompositeOp)
         ENUMERATOR(DstCompositeOp)
@@ -1049,9 +1049,11 @@ Init_RMagick2(void)
         ENUMERATOR(LinearLightCompositeOp)
         ENUMERATOR(LuminizeCompositeOp)
         ENUMERATOR(MathematicsCompositeOp)
-        ENUMERATOR(MinusCompositeOp)
+        ENUMERATOR(MinusDstCompositeOp)
         ENUMERATOR(MinusSrcCompositeOp)
         ENUMERATOR(ModulateCompositeOp)
+        ENUMERATOR(ModulusAddCompositeOp)
+        ENUMERATOR(ModulusSubtractCompositeOp)
         ENUMERATOR(MultiplyCompositeOp)
         ENUMERATOR(NoCompositeOp)
         ENUMERATOR(OutCompositeOp)
@@ -1069,7 +1071,6 @@ Init_RMagick2(void)
         ENUMERATOR(SrcInCompositeOp)
         ENUMERATOR(SrcOutCompositeOp)
         ENUMERATOR(SrcOverCompositeOp)
-        ENUMERATOR(SubtractCompositeOp)
         ENUMERATOR(ThresholdCompositeOp)
         ENUMERATOR(UndefinedCompositeOp)
         ENUMERATOR(VividLightCompositeOp)
@@ -1118,8 +1119,8 @@ Init_RMagick2(void)
         ENUMERATOR(PreviousDispose)
     END_ENUM
 
-    // DistortImage "method" argument values
-    DEF_ENUM(DistortImageMethod)
+    // DistortMethod constants
+    DEF_ENUM(DistortMethod)
         ENUMERATOR(UndefinedDistortion)
         ENUMERATOR(AffineDistortion)
         ENUMERATOR(AffineProjectionDistortion)
@@ -1155,8 +1156,8 @@ Init_RMagick2(void)
         ENUMERATOR(MSBEndian)
     END_ENUM
 
-    // FilterTypes constants
-    DEF_ENUM(FilterTypes)
+    // FilterType constants
+    DEF_ENUM(FilterType)
         ENUMERATOR(UndefinedFilter)
         ENUMERATOR(PointFilter)
         ENUMERATOR(BoxFilter)
@@ -1214,15 +1215,15 @@ Init_RMagick2(void)
         ENUMERATOR(UndefinedType)
         ENUMERATOR(BilevelType)
         ENUMERATOR(GrayscaleType)
-        ENUMERATOR(GrayscaleMatteType)
+        ENUMERATORV(GrayscaleAlphaType, GrayscaleMatteType)
         ENUMERATOR(PaletteType)
-        ENUMERATOR(PaletteMatteType)
+        ENUMERATORV(PaletteAlphaType, PaletteMatteType)
         ENUMERATOR(TrueColorType)
-        ENUMERATOR(TrueColorMatteType)
+        ENUMERATORV(TrueColorAlphaType, TrueColorMatteType)
         ENUMERATOR(ColorSeparationType)
-        ENUMERATOR(ColorSeparationMatteType)
+        ENUMERATORV(ColorSeparationAlphaType, ColorSeparationMatteType)
         ENUMERATOR(OptimizeType)
-        ENUMERATOR(PaletteBilevelMatteType)
+        ENUMERATORV(PaletteBilevelAlphaType, PaletteBilevelMatteType)
     END_ENUM
 
     // InterlaceType constants
@@ -1237,23 +1238,6 @@ Init_RMagick2(void)
         ENUMERATOR(PNGInterlace)
     END_ENUM
 
-    DEF_ENUM(InterpolatePixelMethod)
-        ENUMERATOR(UndefinedInterpolatePixel)
-        ENUMERATOR(AverageInterpolatePixel)
-        ENUMERATOR(BicubicInterpolatePixel)
-        ENUMERATOR(BilinearInterpolatePixel)
-        ENUMERATOR(FilterInterpolatePixel)
-        ENUMERATOR(IntegerInterpolatePixel)
-        ENUMERATOR(MeshInterpolatePixel)
-        ENUMERATOR(NearestNeighborInterpolatePixel)
-        ENUMERATOR(SplineInterpolatePixel)
-        ENUMERATOR(Average9InterpolatePixel)
-        ENUMERATOR(Average16InterpolatePixel)
-        ENUMERATOR(BlendInterpolatePixel)
-        ENUMERATOR(BackgroundInterpolatePixel)
-        ENUMERATOR(CatromInterpolatePixel)
-    END_ENUM
-
     DEF_ENUM(MagickFunction)
         ENUMERATOR(UndefinedFunction)
         ENUMERATOR(PolynomialFunction)
@@ -1262,7 +1246,7 @@ Init_RMagick2(void)
         ENUMERATOR(ArctanFunction)
     END_ENUM
 
-    DEF_ENUM(ImageLayerMethod)
+    DEF_ENUM(LayerMethod)
         ENUMERATOR(UndefinedLayer)
         ENUMERATOR(CompareAnyLayer)
         ENUMERATOR(CompareClearLayer)
@@ -1283,18 +1267,17 @@ Init_RMagick2(void)
     END_ENUM
 
     DEF_ENUM(MetricType)
-        ENUMERATOR(UndefinedMetric)
+        ENUMERATORV(UndefinedErrorMetric, UndefinedMetric)
         ENUMERATOR(AbsoluteErrorMetric)
         ENUMERATOR(MeanAbsoluteErrorMetric)
-        ENUMERATOR(MeanErrorPerPixelMetric)
+        ENUMERATORV(MeanErrorPerPixelErrorMetric, MeanErrorPerPixelMetric)
         ENUMERATOR(MeanSquaredErrorMetric)
         ENUMERATOR(PeakAbsoluteErrorMetric)
-        ENUMERATOR(PeakSignalToNoiseRatioMetric)
+        ENUMERATORV(PeakSignalToNoiseRatioErrorMetric, PeakSignalToNoiseRatioMetric)
         ENUMERATOR(RootMeanSquaredErrorMetric)
         ENUMERATOR(NormalizedCrossCorrelationErrorMetric)
         ENUMERATOR(FuzzErrorMetric)
 #if defined(IMAGEMAGICK_GREATER_THAN_EQUAL_6_8_9)
-        ENUMERATOR(UndefinedErrorMetric)
         ENUMERATOR(PerceptualHashErrorMetric)
 #endif
     END_ENUM
@@ -1332,6 +1315,24 @@ Init_RMagick2(void)
         ENUMERATOR(ResetMethod)
     END_ENUM
 
+    // PixelInterpolateMethod constants
+    DEF_ENUM(PixelInterpolateMethod)
+        ENUMERATOR(UndefinedInterpolatePixel)
+        ENUMERATOR(AverageInterpolatePixel)
+        ENUMERATOR(BicubicInterpolatePixel)
+        ENUMERATOR(BilinearInterpolatePixel)
+        ENUMERATOR(FilterInterpolatePixel)
+        ENUMERATOR(IntegerInterpolatePixel)
+        ENUMERATOR(MeshInterpolatePixel)
+        ENUMERATOR(NearestNeighborInterpolatePixel)
+        ENUMERATOR(SplineInterpolatePixel)
+        ENUMERATOR(Average9InterpolatePixel)
+        ENUMERATOR(Average16InterpolatePixel)
+        ENUMERATOR(BlendInterpolatePixel)
+        ENUMERATOR(BackgroundInterpolatePixel)
+        ENUMERATOR(CatromInterpolatePixel)
+    END_ENUM
+
     // PreviewType
     DEF_ENUM(PreviewType)
         ENUMERATOR(UndefinedPreview)
@@ -1690,7 +1691,7 @@ Init_RMagick2(void)
 static void
 test_Magick_version(void)
 {
-    unsigned long version_number;
+    size_t version_number;
     const char *version_str;
     int x, n;
     ID bypass = rb_intern("RMAGICK_BYPASS_VERSION_TEST");

data/ext/RMagick/rmmontage.c

@@ -99,7 +99,7 @@ Montage_alloc(VALUE class)
  *
  * @param self this object
  * @param color the color name
- * @return self
+ * @return color
  */
 VALUE
 Montage_background_color_eq(VALUE self, VALUE color)
@@ -108,7 +108,7 @@ Montage_background_color_eq(VALUE self, VALUE color)
 
     Data_Get_Struct(self, Montage, montage);
     Color_to_PixelColor(&montage->info->background_color, color);
-    return self;
+    return color;
 }
 
 
@@ -120,7 +120,7 @@ Montage_background_color_eq(VALUE self, VALUE color)
  *
  * @param self this object
  * @param color the color name
- * @return self
+ * @return color
  */
 VALUE
 Montage_border_color_eq(VALUE self, VALUE color)
@@ -129,7 +129,7 @@ Montage_border_color_eq(VALUE self, VALUE color)
 
     Data_Get_Struct(self, Montage, montage);
     Color_to_PixelColor(&montage->info->border_color, color);
-    return self;
+    return color;
 }
 
 
@@ -141,7 +141,7 @@ Montage_border_color_eq(VALUE self, VALUE color)
  *
  * @param self this object
  * @param width the width
- * @return self
+ * @return width
  */
 VALUE
 Montage_border_width_eq(VALUE self, VALUE width)
@@ -150,7 +150,7 @@ Montage_border_width_eq(VALUE self, VALUE width)
 
     Data_Get_Struct(self, Montage, montage);
     montage->info->border_width = NUM2ULONG(width);
-    return self;
+    return width;
 }
 
 
@@ -162,7 +162,7 @@ Montage_border_width_eq(VALUE self, VALUE width)
  *
  * @param self this object
  * @param compose the composition operator
- * @return self
+ * @return compose
  */
 VALUE
 Montage_compose_eq(VALUE self, VALUE compose)
@@ -171,7 +171,7 @@ Montage_compose_eq(VALUE self, VALUE compose)
 
     Data_Get_Struct(self, Montage, montage);
     VALUE_TO_ENUM(compose, montage->compose, CompositeOperator);
-    return self;
+    return compose;
 }
 
 
@@ -183,7 +183,7 @@ Montage_compose_eq(VALUE self, VALUE compose)
  *
  * @param self this object
  * @param filename the filename
- * @return self
+ * @return filename
  */
 VALUE
 Montage_filename_eq(VALUE self, VALUE filename)
@@ -192,7 +192,7 @@ Montage_filename_eq(VALUE self, VALUE filename)
 
     Data_Get_Struct(self, Montage, montage);
     strncpy(montage->info->filename, StringValuePtr(filename), MaxTextExtent-1);
-    return self;
+    return filename;
 }
 
 
@@ -204,7 +204,7 @@ Montage_filename_eq(VALUE self, VALUE filename)
  *
  * @param self this object
  * @param color the color name
- * @return self
+ * @return color
  */
 VALUE
 Montage_fill_eq(VALUE self, VALUE color)
@@ -213,7 +213,7 @@ Montage_fill_eq(VALUE self, VALUE color)
 
     Data_Get_Struct(self, Montage, montage);
     Color_to_PixelColor(&montage->info->fill, color);
-    return self;
+    return color;
 }
 
 
@@ -225,7 +225,7 @@ Montage_fill_eq(VALUE self, VALUE color)
  *
  * @param self this object
  * @param font the font name
- * @return self
+ * @return font
  */
 VALUE
 Montage_font_eq(VALUE self, VALUE font)
@@ -235,7 +235,7 @@ Montage_font_eq(VALUE self, VALUE font)
     Data_Get_Struct(self, Montage, montage);
     magick_clone_string(&montage->info->font, StringValuePtr(font));
 
-    return self;
+    return font;
 }
 
 
@@ -252,7 +252,7 @@ Montage_font_eq(VALUE self, VALUE font)
  *
  * @param self this object
  * @param frame_arg the frame geometry
- * @return self
+ * @return frame_arg
  */
 VALUE
 Montage_frame_eq(VALUE self, VALUE frame_arg)
@@ -266,7 +266,7 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
 
     RB_GC_GUARD(frame);
 
-    return self;
+    return frame_arg;
 }
 
 
@@ -278,7 +278,7 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
  *
  * @param self this object
  * @param geometry_arg the geometry
- * @return self
+ * @return geometry_arg
  */
 VALUE
 Montage_geometry_eq(VALUE self, VALUE geometry_arg)
@@ -292,7 +292,7 @@ Montage_geometry_eq(VALUE self, VALUE geometry_arg)
 
     RB_GC_GUARD(geometry);
 
-    return self;
+    return geometry_arg;
 }
 
 
@@ -304,7 +304,7 @@ Montage_geometry_eq(VALUE self, VALUE geometry_arg)
  *
  * @param self this object
  * @param gravity the gravity type
- * @return self
+ * @return gravity
  */
 VALUE
 Montage_gravity_eq(VALUE self, VALUE gravity)
@@ -313,7 +313,7 @@ Montage_gravity_eq(VALUE self, VALUE gravity)
 
     Data_Get_Struct(self, Montage, montage);
     VALUE_TO_ENUM(gravity, montage->info->gravity, GravityType);
-    return self;
+    return gravity;
 }
 
 
@@ -342,7 +342,7 @@ Montage_initialize(VALUE self)
  *
  * @param self this object
  * @param color the color name
- * @return self
+ * @return color
  */
 VALUE
 Montage_matte_color_eq(VALUE self, VALUE color)
@@ -351,7 +351,7 @@ Montage_matte_color_eq(VALUE self, VALUE color)
 
     Data_Get_Struct(self, Montage, montage);
     Color_to_PixelColor(&montage->info->matte_color, color);
-    return self;
+    return color;
 }
 
 
@@ -363,7 +363,7 @@ Montage_matte_color_eq(VALUE self, VALUE color)
  *
  * @param self this object
  * @param size the point size
- * @return self
+ * @return size
  */
 VALUE
 Montage_pointsize_eq(VALUE self, VALUE size)
@@ -372,7 +372,7 @@ Montage_pointsize_eq(VALUE self, VALUE size)
 
     Data_Get_Struct(self, Montage, montage);
     montage->info->pointsize = NUM2DBL(size);
-    return self;
+    return size;
 }
 
 
@@ -384,7 +384,7 @@ Montage_pointsize_eq(VALUE self, VALUE size)
  *
  * @param self this object
  * @param shadow the shadow
- * @return self
+ * @return shadow
  */
 VALUE
 Montage_shadow_eq(VALUE self, VALUE shadow)
@@ -393,7 +393,7 @@ Montage_shadow_eq(VALUE self, VALUE shadow)
 
     Data_Get_Struct(self, Montage, montage);
     montage->info->shadow = (MagickBooleanType) RTEST(shadow);
-    return self;
+    return shadow;
 }
 
 
@@ -414,7 +414,7 @@ Montage_stroke_eq(VALUE self, VALUE color)
 
     Data_Get_Struct(self, Montage, montage);
     Color_to_PixelColor(&montage->info->stroke, color);
-    return self;
+    return color;
 }
 
 
@@ -426,7 +426,7 @@ Montage_stroke_eq(VALUE self, VALUE color)
  *
  * @param self this object
  * @param texture the texture image
- * @return self
+ * @return texture
  */
 VALUE
 Montage_texture_eq(VALUE self, VALUE texture)
@@ -453,7 +453,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
     rm_write_temp_image(texture_image, temp_name);
     magick_clone_string(&montage->info->texture, temp_name);
 
-    return self;
+    return texture;
 }
 
 
@@ -465,7 +465,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
  *
  * @param self this object
  * @param tile_arg the tile
- * @return self
+ * @return tile_arg
  */
 VALUE
 Montage_tile_eq(VALUE self, VALUE tile_arg)
@@ -479,7 +479,7 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
 
     RB_GC_GUARD(tile);
 
-    return self;
+    return tile_arg;
 }
 
 
@@ -491,7 +491,7 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
  *
  * @param self this object
  * @param title the title
- * @return self
+ * @return title
  */
 VALUE
 Montage_title_eq(VALUE self, VALUE title)
@@ -500,7 +500,7 @@ Montage_title_eq(VALUE self, VALUE title)
 
     Data_Get_Struct(self, Montage, montage);
     magick_clone_string(&montage->info->title, StringValuePtr(title));
-    return self;
+    return title;
 }