rmagick 7.1.7 → 7.2.0

data/ext/RMagick/rminfo.cpp

@@ -22,6 +22,25 @@ const rb_data_type_t rm_info_data_type = {
 };
 
 
+/**
+ * Return the Info struct of an object that is about to be changed.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param self the Info object
+ * @return the Info struct
+ * @throw RuntimeError if an offloaded call is using the Info
+ */
+static Info *
+get_writable_info(VALUE self)
+{
+    Info *info;
+
+    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    rm_gvl_check_writable(info);
+    return info;
+}
+
 /**
  * Return the value of the specified option.
  *
@@ -82,7 +101,7 @@ set_option(VALUE self, const char *key, VALUE string)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(string))
     {
@@ -119,7 +138,7 @@ static VALUE set_color_option(VALUE self, const char *option, VALUE color)
     PixelColor pp;
     MagickBooleanType okay;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(color))
     {
@@ -196,7 +215,7 @@ static VALUE set_dbl_option(VALUE self, const char *option, VALUE value)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(value))
     {
@@ -352,7 +371,7 @@ Info_aset(int argc, VALUE *argv, VALUE self)
     size_t format_l, key_l;
     char ckey[MaxTextExtent];
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     switch (argc)
     {
@@ -464,7 +483,7 @@ Info_authenticate_eq(VALUE self, VALUE passwd_arg)
     Info *info;
     char *passwd = NULL;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (!NIL_P(passwd_arg))
     {
@@ -523,7 +542,7 @@ Info_background_color_eq(VALUE self, VALUE bc_arg)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     Color_to_PixelColor(&info->background_color, bc_arg);
 
     return bc_arg;
@@ -555,7 +574,7 @@ Info_border_color_eq(VALUE self, VALUE bc_arg)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     Color_to_PixelColor(&info->border_color, bc_arg);
 
     return bc_arg;
@@ -617,7 +636,7 @@ Info_channel(int argc, VALUE *argv, VALUE self)
         raise_ChannelType_error(argv[argc-1]);
     }
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     info->channel = channels;
     return self;
@@ -649,7 +668,7 @@ Info_colorspace_eq(VALUE self, VALUE colorspace)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     VALUE_TO_ENUM(colorspace, info->colorspace, ColorspaceType);
     return colorspace;
 }
@@ -703,7 +722,7 @@ Info_compression_eq(VALUE self, VALUE type)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     VALUE_TO_ENUM(type, info->compression, CompressionType);
     return type;
 }
@@ -729,7 +748,7 @@ Info_define(int argc, VALUE *argv, VALUE self)
     unsigned int okay;
     VALUE fmt_arg;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     switch (argc)
     {
@@ -819,7 +838,7 @@ Info_delay_eq(VALUE self, VALUE string)
     Info *info;
     int not_num;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(string))
     {
@@ -868,7 +887,7 @@ Info_density_eq(VALUE self, VALUE density_arg)
     VALUE density;
     char *dens;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(density_arg))
     {
@@ -914,7 +933,7 @@ Info_depth_eq(VALUE self, VALUE depth)
     Info *info;
     unsigned long d;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     d = NUM2ULONG(depth);
     switch (d)
     {
@@ -1033,7 +1052,7 @@ Info_dispose_eq(VALUE self, VALUE disp)
     const char *option;
     int x;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(disp))
     {
@@ -1113,7 +1132,7 @@ Info_endian_eq(VALUE self, VALUE endian)
         VALUE_TO_ENUM(endian, type, EndianType);
     }
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     info->endian = type;
     return endian;
 }
@@ -1145,7 +1164,7 @@ Info_extract_eq(VALUE self, VALUE extract_arg)
     char *extr;
     VALUE extract;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(extract_arg))
     {
@@ -1198,7 +1217,7 @@ Info_filename_eq(VALUE self, VALUE filename)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     // Allow "nil" - remove current filename
     if (NIL_P(filename) || StringValueCStr(filename) == NULL)
@@ -1263,7 +1282,7 @@ Info_font_eq(VALUE self, VALUE font_arg)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     if (NIL_P(font_arg) || StringValueCStr(font_arg) == NULL)
     {
         magick_free(info->font);
@@ -1318,7 +1337,7 @@ Info_format_eq(VALUE self, VALUE magick)
     char *mgk;
     ExceptionInfo *exception;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     mgk = StringValueCStr(magick);
 
@@ -1361,7 +1380,7 @@ Info_fuzz_eq(VALUE self, VALUE fuzz)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     info->fuzz = rm_fuzz_to_dbl(fuzz);
     return fuzz;
 }
@@ -1464,7 +1483,7 @@ Info_gravity_eq(VALUE self, VALUE grav)
     const char *option;
     int x;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(grav))
     {
@@ -1514,7 +1533,7 @@ Info_image_type_eq(VALUE self, VALUE type)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     VALUE_TO_ENUM(type, info->type, ImageType);
     return type;
 }
@@ -1544,7 +1563,7 @@ Info_interlace_eq(VALUE self, VALUE inter)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     VALUE_TO_ENUM(inter, info->interlace, InterlaceType);
     return inter;
 }
@@ -1599,7 +1618,7 @@ Info_matte_color_eq(VALUE self, VALUE matte_arg)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     Color_to_PixelColor(&info->matte_color, matte_arg);
 
     return matte_arg;
@@ -1677,7 +1696,7 @@ Info_orientation_eq(VALUE self, VALUE inter)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     VALUE_TO_ENUM(inter, info->orientation, OrientationType);
     return inter;
 }
@@ -1720,7 +1739,7 @@ Info_origin_eq(VALUE self, VALUE origin_arg)
     VALUE origin_str;
     char *origin;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(origin_arg))
     {
@@ -1776,7 +1795,7 @@ Info_page_eq(VALUE self, VALUE page_arg)
     VALUE geom_str;
     char *geometry;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     if (NIL_P(page_arg))
     {
         magick_free(info->page);
@@ -1880,7 +1899,7 @@ Info_sampling_factor_eq(VALUE self, VALUE sampling_factor)
     char *sampling_factor_p = NULL;
     size_t sampling_factor_len = 0;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (!NIL_P(sampling_factor))
     {
@@ -1928,7 +1947,7 @@ Info_scene_eq(VALUE self, VALUE scene)
     Info *info;
     char buf[25];
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     info->scene = NUM2ULONG(scene);
 
     snprintf(buf, sizeof(buf), "%" RMIuSIZE "", info->scene);
@@ -1961,7 +1980,7 @@ Info_server_name_eq(VALUE self, VALUE server_arg)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     if (NIL_P(server_arg) || StringValueCStr(server_arg) == NULL)
     {
         magick_free(info->server_name);
@@ -2003,7 +2022,7 @@ Info_size_eq(VALUE self, VALUE size_arg)
     VALUE size;
     char *sz;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (NIL_P(size_arg))
     {
@@ -2089,7 +2108,7 @@ Info_texture_eq(VALUE self, VALUE texture)
     Image *image;
     char name[MaxTextExtent];
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     // Delete any existing texture file
     if (info->texture)
@@ -2106,7 +2125,7 @@ Info_texture_eq(VALUE self, VALUE texture)
     }
 
     // Create a temp copy of the texture and store its name in the texture field
-    image = rm_check_destroyed(texture);
+    image = rm_check_readable(texture);
     rm_write_temp_image(image, name, sizeof(name));
 
     magick_clone_string(&info->texture, name);
@@ -2161,7 +2180,7 @@ Info_tile_offset_eq(VALUE self, VALUE offset)
         rb_raise(rb_eArgError, "invalid tile offset geometry: %s", tile_offset);
     }
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     DeleteImageOption(info, "tile-offset");
     SetImageOption(info, "tile-offset", tile_offset);
@@ -2199,7 +2218,7 @@ Info_transparent_color_eq(VALUE self, VALUE tc_arg)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     Color_to_PixelColor(&info->transparent_color, tc_arg);
 
     return tc_arg;
@@ -2231,7 +2250,7 @@ Info_undefine(VALUE self, VALUE format, VALUE key)
 
     snprintf(fkey, sizeof(fkey), "%.60s:%.*s", format_p, (int)(MaxTextExtent-61), key_p);
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     DeleteImageOption(info, fkey);
 
     return self;
@@ -2286,7 +2305,7 @@ Info_units_eq(VALUE self, VALUE units)
 {
     Info *info;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
     VALUE_TO_ENUM(units, info->units, ResolutionType);
     return units;
 }
@@ -2321,7 +2340,7 @@ Info_view_eq(VALUE self, VALUE view_arg)
     Info *info;
     char *view = NULL;
 
-    TypedData_Get_Struct(self, Info, &rm_info_data_type, info);
+    info = get_writable_info(self);
 
     if (!NIL_P(view_arg))
     {

data/ext/RMagick/rmkinfo.cpp

@@ -128,6 +128,11 @@ KernelInfo_initialize(VALUE self, VALUE kernel_string)
     }
 
     old_kernel = (KernelInfo *)DATA_PTR(self);
+    if (old_kernel && rm_gvl_in_use(old_kernel))
+    {
+        DestroyKernelInfo(kernel);
+        rm_gvl_check_writable(old_kernel);
+    }
     DATA_PTR(self) = kernel;
     if (old_kernel)
     {
@@ -173,12 +178,17 @@ get_kernel_info(VALUE self)
  * @param self the KernelInfo object
  * @return the KernelInfo struct
  * @throw FrozenError if the object is frozen
+ * @throw RuntimeError if an offloaded call is using the kernel
  */
 static KernelInfo *
-get_unfrozen_kernel_info(VALUE self)
+get_writable_kernel_info(VALUE self)
 {
+    KernelInfo *kernel;
+
     rb_check_frozen(self);
-    return get_kernel_info(self);
+    kernel = get_kernel_info(self);
+    rm_gvl_check_writable(kernel);
+    return kernel;
 }
 
 
@@ -190,8 +200,8 @@ get_unfrozen_kernel_info(VALUE self)
 VALUE
 KernelInfo_unity_add(VALUE self, VALUE scale)
 {
-    GVL_STRUCT_TYPE(UnityAddKernelInfo) args = { get_unfrozen_kernel_info(self), NUM2DBL(scale) };
-    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(UnityAddKernelInfo), &args);
+    DECLARE_GVL_CALL(call, UnityAddKernelInfo, get_writable_kernel_info(self), NUM2DBL(scale));
+    call.update(self).run<void>();
     return Qnil;
 }
 
@@ -213,8 +223,8 @@ KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
 
     VALUE_TO_ENUM(flags, geoflags, GeometryFlags);
 
-    GVL_STRUCT_TYPE(ScaleKernelInfo) args = { get_unfrozen_kernel_info(self), NUM2DBL(scale), geoflags };
-    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ScaleKernelInfo), &args);
+    DECLARE_GVL_CALL(call, ScaleKernelInfo, get_writable_kernel_info(self), NUM2DBL(scale), geoflags);
+    call.update(self).run<void>();
     return Qnil;
 }
 
@@ -227,10 +237,14 @@ KernelInfo_scale(VALUE self, VALUE scale, VALUE flags)
 VALUE
 KernelInfo_scale_geometry(VALUE self, VALUE geometry)
 {
-    char *geom = StringValueCStr(geometry);
+    KernelInfo *kernel = get_writable_kernel_info(self);
+    char *geom;
+
+    geometry = rb_str_new_frozen(StringValue(geometry));
+    geom = StringValueCStr(geometry);
 
-    GVL_STRUCT_TYPE(ScaleGeometryKernelInfo) args = { get_unfrozen_kernel_info(self), geom };
-    CALL_FUNC_WITHOUT_GVL(GVL_FUNC(ScaleGeometryKernelInfo), &args);
+    DECLARE_GVL_CALL(call, ScaleGeometryKernelInfo, kernel, geom);
+    call.update(self).run<void>();
 
     RB_GC_GUARD(geometry);
 
@@ -257,6 +271,11 @@ KernelInfo_init_copy(VALUE self, VALUE orig)
     }
 
     old_kernel = (KernelInfo *)DATA_PTR(self);
+    if (old_kernel && rm_gvl_in_use(old_kernel))
+    {
+        DestroyKernelInfo(kernel);
+        rm_gvl_check_writable(old_kernel);
+    }
     DATA_PTR(self) = kernel;
     if (old_kernel)
     {

data/ext/RMagick/rmmain.cpp

@@ -232,6 +232,8 @@ Init_RMagick2(void)
     rb_ext_ractor_safe(true);
 #endif
 
+    rm_gvl_init();
+
     Module_Magick = rb_define_module("Magick");
 
     set_managed_memory();

data/ext/RMagick/rmmontage.cpp

@@ -107,6 +107,26 @@ Montage_alloc(VALUE klass)
 }
 
 
+/**
+ * Return the Montage struct of an object that is about to be changed.
+ *
+ * No Ruby usage (internal function)
+ *
+ * @param self the Montage object
+ * @return the Montage struct
+ * @throw RuntimeError if an offloaded call is using the Montage
+ */
+static Montage *
+get_writable_montage(VALUE self)
+{
+    Montage *montage;
+
+    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    rm_gvl_check_writable(montage);
+    return montage;
+}
+
+
 /**
  * Set background_color value.
  *
@@ -118,7 +138,7 @@ Montage_background_color_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     Color_to_PixelColor(&montage->info->background_color, color);
     return color;
 }
@@ -135,7 +155,7 @@ Montage_border_color_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     Color_to_PixelColor(&montage->info->border_color, color);
     return color;
 }
@@ -152,7 +172,7 @@ Montage_border_width_eq(VALUE self, VALUE width)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     montage->info->border_width = NUM2ULONG(width);
     return width;
 }
@@ -169,7 +189,7 @@ Montage_compose_eq(VALUE self, VALUE compose)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     VALUE_TO_ENUM(compose, montage->compose, CompositeOperator);
     return compose;
 }
@@ -186,7 +206,7 @@ Montage_filename_eq(VALUE self, VALUE filename)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     strlcpy(montage->info->filename, StringValueCStr(filename), sizeof(montage->info->filename));
     return filename;
 }
@@ -203,7 +223,7 @@ Montage_fill_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     Color_to_PixelColor(&montage->info->fill, color);
     return color;
 }
@@ -220,7 +240,7 @@ Montage_font_eq(VALUE self, VALUE font)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     magick_clone_string(&montage->info->font, StringValueCStr(font));
 
     return font;
@@ -243,7 +263,7 @@ Montage_frame_eq(VALUE self, VALUE frame_arg)
     Montage *montage;
     VALUE frame;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     frame = rb_String(frame_arg);
     magick_clone_string(&montage->info->frame, StringValueCStr(frame));
 
@@ -270,7 +290,7 @@ Montage_geometry_eq(VALUE self, VALUE geometry_arg)
     Montage *montage;
     VALUE geometry;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     geometry = rb_String(geometry_arg);
     magick_clone_string(&montage->info->geometry, StringValueCStr(geometry));
 
@@ -291,7 +311,7 @@ Montage_gravity_eq(VALUE self, VALUE gravity)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     VALUE_TO_ENUM(gravity, montage->info->gravity, GravityType);
     return gravity;
 }
@@ -321,7 +341,7 @@ Montage_matte_color_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     Color_to_PixelColor(&montage->info->matte_color, color);
     return color;
 }
@@ -338,7 +358,7 @@ Montage_pointsize_eq(VALUE self, VALUE size)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     montage->info->pointsize = NUM2DBL(size);
     return size;
 }
@@ -355,7 +375,7 @@ Montage_shadow_eq(VALUE self, VALUE shadow)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     montage->info->shadow = (MagickBooleanType) RTEST(shadow);
     return shadow;
 }
@@ -372,7 +392,7 @@ Montage_stroke_eq(VALUE self, VALUE color)
 {
     Montage *montage;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     Color_to_PixelColor(&montage->info->stroke, color);
     return color;
 }
@@ -392,7 +412,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
     Image *texture_image;
     char temp_name[MaxTextExtent];
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
 
     // If we had a previously defined temp texture image,
     // remove it now in preparation for this new one.
@@ -404,7 +424,7 @@ Montage_texture_eq(VALUE self, VALUE texture)
     }
 
     texture = rm_cur_image(texture);
-    texture_image = rm_check_destroyed(texture);
+    texture_image = rm_check_readable(texture);
 
     // Write a temp copy of the image & save its name.
     rm_write_temp_image(texture_image, temp_name, sizeof(temp_name));
@@ -431,7 +451,7 @@ Montage_tile_eq(VALUE self, VALUE tile_arg)
     Montage *montage;
     VALUE tile;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     tile = rb_String(tile_arg);
     magick_clone_string(&montage->info->tile, StringValueCStr(tile));
 
@@ -456,7 +476,7 @@ Montage_title_eq(VALUE self, VALUE title)
     Montage *montage;
     const char *title_cstr;
 
-    TypedData_Get_Struct(self, Montage, &rm_montage_data_type, montage);
+    montage = get_writable_montage(self);
     title_cstr = StringValueCStr(title);
 
     if (rm_has_file_reference(title_cstr))

data/ext/RMagick/rmpixel.cpp

@@ -890,7 +890,7 @@ Pixel_init_copy(VALUE self, VALUE orig)
  *   @param red [Numeric] The red value
  *   @param green [Numeric] The green value
  *   @param blue [Numeric] The blue value
- *   @param opacity [Numeric] The opacity value
+ *   @param opacity [Numeric] The opacity value. The alpha is set to QuantumRange minus this value.
  *   @return [Magick::Pixel] self
  */
 VALUE
@@ -910,7 +910,7 @@ Pixel_initialize(int argc, VALUE *argv, VALUE self)
 #if defined(IMAGEMAGICK_7)
             if (argv[3] != Qnil)
             {
-                pixel->alpha = APP2QUANTUM(argv[3]);
+                pixel->alpha = QuantumRange - APP2QUANTUM(argv[3]);
             }
 #else
             if (argv[3] != Qnil)
@@ -1184,11 +1184,14 @@ Pixel_to_color(int argc, VALUE *argv, VALUE self)
             switch (depth)
             {
                 case 8:
-#if MAGICKCORE_QUANTUM_DEPTH == 16 || MAGICKCORE_QUANTUM_DEPTH == 32
+#if MAGICKCORE_QUANTUM_DEPTH == 16 || MAGICKCORE_QUANTUM_DEPTH == 32 || MAGICKCORE_QUANTUM_DEPTH == 64
                 case 16:
 #endif
-#if MAGICKCORE_QUANTUM_DEPTH == 32
+#if MAGICKCORE_QUANTUM_DEPTH == 32 || MAGICKCORE_QUANTUM_DEPTH == 64
                 case 32:
+#endif
+#if MAGICKCORE_QUANTUM_DEPTH == 64
+                case 64:
 #endif
                     break;
                 default: