rmagick 5.3.0 → 5.4.4

data/ext/RMagick/{rmenum.c → rmenum.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmenum.c
- * @version  $Id: rmenum.c,v 1.9 2009/12/20 02:33:33 baror Exp $
+ * @file     rmenum.cpp
+ * @version  $Id: rmenum.cpp,v 1.9 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -40,14 +40,14 @@ const rb_data_type_t rm_enum_data_type = {
 VALUE
 rm_define_enum_type(const char *tag)
 {
-    VALUE class;
+    VALUE klass;
 
-    class = rb_define_class_under(Module_Magick, tag, Class_Enum);\
+    klass = rb_define_class_under(Module_Magick, tag, Class_Enum);\
 
-    rb_define_singleton_method(class, "values", Enum_type_values, 0);
-    rb_define_method(class, "initialize", Enum_type_initialize, 2);
-    rb_define_method(class, "inspect", Enum_type_inspect, 0);
-    return class;
+    rb_define_singleton_method(klass, "values", RUBY_METHOD_FUNC(Enum_type_values), 0);
+    rb_define_method(klass, "initialize", RUBY_METHOD_FUNC(Enum_type_initialize), 2);
+    rb_define_method(klass, "inspect", RUBY_METHOD_FUNC(Enum_type_inspect), 0);
+    return klass;
 }
 
 
@@ -56,19 +56,19 @@ rm_define_enum_type(const char *tag)
  *
  * No Ruby usage (internal function)
  *
- * @param class the subclass
+ * @param klass the subclass
  * @param sym the symbol
  * @param val the value for the symbol
  * @return a new instance of class
  */
 VALUE
-rm_enum_new(VALUE class, VALUE sym, VALUE val)
+rm_enum_new(VALUE klass, VALUE sym, VALUE val)
 {
     VALUE argv[2];
 
     argv[0] = sym;
     argv[1] = val;
-    return rb_obj_freeze(rb_class_new_instance(2, argv, class));
+    return rb_obj_freeze(rb_class_new_instance(2, argv, klass));
 }
 
 /**
@@ -118,12 +118,12 @@ static void rm_enum_free(void *magick_enum)
  * @return [Magick::Enum] a new enumerator
  */
 VALUE
-Enum_alloc(VALUE class)
+Enum_alloc(VALUE klass)
 {
     MagickEnum *magick_enum;
     VALUE enumr;
 
-    enumr = TypedData_Make_Struct(class, MagickEnum, &rm_enum_data_type, magick_enum);
+    enumr = TypedData_Make_Struct(klass, MagickEnum, &rm_enum_data_type, magick_enum);
     rb_obj_freeze(enumr);
 
     return enumr;
@@ -141,11 +141,11 @@ Enum_case_eq(VALUE self, VALUE other)
 {
     if (CLASS_OF(self) == CLASS_OF(other))
     {
-        MagickEnum *this, *that;
+        MagickEnum *self_enum, *other_enum;
 
-        TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, this);
-        TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, that);
-        return this->val == that->val ? Qtrue : Qfalse;
+        TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, self_enum);
+        TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, other_enum);
+        return self_enum->val == other_enum->val ? Qtrue : Qfalse;
     }
 
     return Qfalse;
@@ -196,20 +196,20 @@ Enum_to_i(VALUE self)
 VALUE
 Enum_spaceship(VALUE self, VALUE other)
 {
-    MagickEnum *this, *that;
+    MagickEnum *self_enum, *other_enum;
 
     if(CLASS_OF(self) != CLASS_OF(other)) {
         return Qnil;
     }
 
-    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, this);
-    TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, that);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, self_enum);
+    TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, other_enum);
 
-    if (this->val > that->val)
+    if (self_enum->val > other_enum->val)
     {
         return INT2FIX(1);
     }
-    else if (this->val < that->val)
+    else if (self_enum->val < other_enum->val)
     {
         return INT2FIX(-1);
     }
@@ -224,25 +224,25 @@ Enum_spaceship(VALUE self, VALUE other)
  * @return [Magick::Enum] new Enum instance
  */
 VALUE
-Enum_bitwise_or(VALUE self, VALUE another)
+Enum_bitwise_or(VALUE self, VALUE other)
 {
-    VALUE new_enum, cls;
-    MagickEnum *this, *that, *new_enum_data;
+    VALUE new_enum, klass;
+    MagickEnum *self_enum, *other_enum, *new_enum_data;
 
-    cls = CLASS_OF(self);
-    if (CLASS_OF(another) != cls)
+    klass = CLASS_OF(self);
+    if (CLASS_OF(other) != klass)
     {
-        rb_raise(rb_eArgError, "Expected class %s but got %s", rb_class2name(cls), rb_class2name(CLASS_OF(another)));
+        rb_raise(rb_eArgError, "Expected class %s but got %s", rb_class2name(klass), rb_class2name(CLASS_OF(other)));
     }
 
-    new_enum = Enum_alloc(cls);
+    new_enum = Enum_alloc(klass);
 
-    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, this);
-    TypedData_Get_Struct(another, MagickEnum, &rm_enum_data_type, that);
+    TypedData_Get_Struct(self, MagickEnum, &rm_enum_data_type, self_enum);
+    TypedData_Get_Struct(other, MagickEnum, &rm_enum_data_type, other_enum);
     TypedData_Get_Struct(new_enum, MagickEnum, &rm_enum_data_type, new_enum_data);
 
-    new_enum_data->id = rb_to_id(rb_sprintf("%s|%s", rb_id2name(this->id), rb_id2name(that->id)));
-    new_enum_data->val = this->val | that->val;
+    new_enum_data->id = rb_to_id(rb_sprintf("%s|%s", rb_id2name(self_enum->id), rb_id2name(other_enum->id)));
+    new_enum_data->val = self_enum->val | other_enum->val;
 
     return new_enum;
 }
@@ -321,13 +321,13 @@ Enum_type_inspect(VALUE self)
  *   @return [Magick::Enum] self
  */
 static VALUE
-Enum_type_values(VALUE class)
+Enum_type_values(VALUE klass)
 {
     VALUE enumerators, copy;
     VALUE rv;
     int x;
 
-    enumerators = rb_cv_get(class, ENUMERATORS_CLASS_VAR);
+    enumerators = rb_cv_get(klass, ENUMERATORS_CLASS_VAR);
 
     if (rb_block_given_p())
     {
@@ -335,7 +335,7 @@ Enum_type_values(VALUE class)
         {
             rb_yield(rb_ary_entry(enumerators, x));
         }
-        rv = class;
+        rv = klass;
     }
     else
     {
@@ -360,19 +360,19 @@ Enum_type_values(VALUE class)
  *
  * No Ruby usage (internal function)
  *
- * @param class the class type
+ * @param klass the class type
  * @param value the value for enum
  * @return a enumerator
  */
 
 VALUE
-Enum_find(VALUE class, int val)
+Enum_find(VALUE klass, int val)
 {
     VALUE enumerators;
     MagickEnum *magick_enum;
     int x;
 
-    enumerators = rb_cv_get(class, ENUMERATORS_CLASS_VAR);
+    enumerators = rb_cv_get(klass, ENUMERATORS_CLASS_VAR);
     enumerators = rm_check_ary_type(enumerators);
 
     for (x = 0; x < RARRAY_LEN(enumerators); x++)
@@ -398,9 +398,9 @@ Enum_find(VALUE class, int val)
  * @return a new enumerator
  */
 VALUE
-ClassType_find(ClassType cls)
+ClassType_find(ClassType klass)
 {
-    return Enum_find(Class_ClassType, cls);
+    return Enum_find(Class_ClassType, klass);
 }
 
 
@@ -485,7 +485,7 @@ ComplianceType_find(ComplianceType compliance)
     if ((compliance & (SVGCompliance|X11Compliance|XPMCompliance))
         == (SVGCompliance|X11Compliance|XPMCompliance))
     {
-        c = SVGCompliance|X11Compliance|XPMCompliance;
+        c = (ComplianceType)(SVGCompliance|X11Compliance|XPMCompliance);
     }
     else if (compliance & SVGCompliance)
     {

data/ext/RMagick/{rmfill.c → rmfill.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmfill.c
- * @version  $Id: rmfill.c,v 1.33 2009/12/20 02:33:33 baror Exp $
+ * @file     rmfill.cpp
+ * @version  $Id: rmfill.cpp,v 1.33 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -86,11 +86,11 @@ GradientFill_memsize(const void *ptr)
  * @return [Magick::GradientFill] a new GradientFill object
  */
 VALUE
-GradientFill_alloc(VALUE class)
+GradientFill_alloc(VALUE klass)
 {
     rm_GradientFill *fill;
 
-    return TypedData_Make_Struct(class, rm_GradientFill, &rm_gradient_fill_data_type, fill);
+    return TypedData_Make_Struct(klass, rm_GradientFill, &rm_gradient_fill_data_type, fill);
 }
 
 
@@ -741,10 +741,10 @@ TextureFill_memsize(const void *ptr)
  * @return [Magick::TextureFill] a new TextureFill object
  */
 VALUE
-TextureFill_alloc(VALUE class)
+TextureFill_alloc(VALUE klass)
 {
     rm_TextureFill *fill;
-    return TypedData_Make_Struct(class, rm_TextureFill, &rm_texture_fill_data_type, fill);
+    return TypedData_Make_Struct(klass, rm_TextureFill, &rm_texture_fill_data_type, fill);
 }
 
 /**

data/ext/RMagick/{rmilist.c → rmilist.cpp}

@@ -5,8 +5,8 @@
  *
  * Changes since Nov. 2009 copyright © by Benjamin Thomas and Omer Bar-or
  *
- * @file     rmilist.c
- * @version  $Id: rmilist.c,v 1.94 2009/12/20 02:33:33 baror Exp $
+ * @file     rmilist.cpp
+ * @version  $Id: rmilist.cpp,v 1.94 2009/12/20 02:33:33 baror Exp $
  * @author   Tim Hunter
  ******************************************************************************/
 
@@ -135,7 +135,7 @@ VALUE
 ImageList_append(VALUE self, VALUE stack_arg)
 {
     Image *images, *new_image;
-    unsigned int stack;
+    MagickBooleanType stack;
     ExceptionInfo *exception;
 
     // Convert the image array to an image sequence.
@@ -143,7 +143,7 @@ ImageList_append(VALUE self, VALUE stack_arg)
 
     // If stack == true, stack rectangular images top-to-bottom,
     // otherwise left-to-right.
-    stack = RTEST(stack_arg);
+    stack = (MagickBooleanType)RTEST(stack_arg);
 
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(AppendImages) args = { images, stack, exception };
@@ -260,20 +260,20 @@ VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
     {
         case 5:
             if (colorspace == CMYKColorspace)
-                channel |= AlphaChannel;
+                channel = (ChannelType)(channel | AlphaChannel);
             else
                 rb_raise(rb_eArgError, "invalid number of images in this image list");
         case 4:
             if (colorspace == CMYKColorspace)
-                channel |= IndexChannel;
+                channel = (ChannelType)(channel | IndexChannel);
             else
-                channel |= AlphaChannel;
+                channel = (ChannelType)(channel | AlphaChannel);
         case 3:
-            channel |= GreenChannel;
-            channel |= BlueChannel;
+            channel = (ChannelType)(channel | GreenChannel);
+            channel = (ChannelType)(channel | BlueChannel);
             break;
         case 2:
-            channel |= AlphaChannel;
+            channel = (ChannelType)(channel | AlphaChannel);
             break;
         case 1:
             break;
@@ -311,10 +311,10 @@ VALUE ImageList_combine(int argc, VALUE *argv, VALUE self)
  * @overload composite_layers(images)
  *   @param images [Magick::ImageList] the source images
  *
- * @overload composite_layers(images, operator)
+ * @overload composite_layers(images, composite_op)
  *   - Default operator is {Magick::OverCompositeOp}
  *   @param images [Magick::ImageList] the source images
- *   @param operator [Magick::CompositeOperator] the operator
+ *   @param composite_op [Magick::CompositeOperator] the operator
  *
  * @return [Magick::ImageList] a new imagelist
  */
@@ -324,13 +324,13 @@ ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
     VALUE source_images;
     Image *dest, *source, *new_images;
     RectangleInfo geometry;
-    CompositeOperator operator = OverCompositeOp;
+    CompositeOperator composite_op = OverCompositeOp;
     ExceptionInfo *exception;
 
     switch (argc)
     {
         case 2:
-            VALUE_TO_ENUM(argv[1], operator, CompositeOperator);
+            VALUE_TO_ENUM(argv[1], composite_op, CompositeOperator);
         case 1:
             source_images = argv[0];
             break;
@@ -356,7 +356,7 @@ ImageList_composite_layers(int argc, VALUE *argv, VALUE self)
                           new_images->gravity, &geometry);
 
     exception = AcquireExceptionInfo();
-    GVL_STRUCT_TYPE(CompositeLayers) args = { new_images, operator, source, geometry.x, geometry.y, exception };
+    GVL_STRUCT_TYPE(CompositeLayers) args = { new_images, composite_op, source, geometry.x, geometry.y, exception };
     CALL_FUNC_WITHOUT_GVL(GVL_FUNC(CompositeLayers), &args);
     rm_split(source);
     rm_check_exception(exception, new_images, DestroyOnError);
@@ -532,16 +532,16 @@ ImageList_morph(VALUE self, VALUE nimages)
 {
     Image *images, *new_images;
     ExceptionInfo *exception;
-    long number_images;
+    size_t number_images;
 
 
     // Use a signed long so we can test for a negative argument.
-    number_images = NUM2LONG(nimages);
-    if (number_images <= 0)
+    if (NUM2LONG(nimages) <= 0)
     {
         rb_raise(rb_eArgError, "number of intervening images must be > 0");
     }
 
+    number_images = NUM2LONG(nimages);
     images = images_from_imagelist(self);
     exception = AcquireExceptionInfo();
     GVL_STRUCT_TYPE(MorphImages) args = { images, number_images, exception };
@@ -970,7 +970,7 @@ ImageList_quantize(int argc, VALUE *argv, VALUE self)
             if (rb_obj_is_kind_of(argv[2], Class_DitherMethod))
             {
                 VALUE_TO_ENUM(argv[2], quantize_info.dither_method, DitherMethod);
-                quantize_info.dither = quantize_info.dither_method != NoDitherMethod;
+                quantize_info.dither = (MagickBooleanType)(quantize_info.dither_method != NoDitherMethod);
             }
             else
             {
@@ -1155,7 +1155,7 @@ ImageList_to_blob(VALUE self)
         return Qnil;
     }
 
-    blob_str = rb_str_new(blob, (long)length);
+    blob_str = rb_str_new((const char *)blob, (long)length);
     magick_free((void*)blob);
 
     RB_GC_GUARD(info_obj);
@@ -1193,7 +1193,9 @@ ImageList_write(VALUE self, VALUE file)
 
         // Ensure file is open - raise error if not
         GetOpenFile(file, fptr);
-        add_format_prefix(info, fptr->pathv);
+        rb_io_check_writable(fptr);
+
+        add_format_prefix(info, rm_io_path(file));
 #if defined(_WIN32)
         SetImageInfoFile(info, NULL);
 #else