rmagick 4.1.0.rc2 → 4.1.0

data/ext/RMagick/rmenum.c

@@ -76,10 +76,10 @@ rm_enum_new(VALUE class, VALUE sym, VALUE val)
 static const char *
 rm_enum_to_cstr(VALUE enum_type)
 {
-   MagickEnum *magick_enum;
+    MagickEnum *magick_enum;
 
-   Data_Get_Struct(enum_type, MagickEnum, magick_enum);
-   return rb_id2name(magick_enum->id);
+    Data_Get_Struct(enum_type, MagickEnum, magick_enum);
+    return rb_id2name(magick_enum->id);
 }
 
 /**
@@ -96,44 +96,34 @@ static void rm_enum_free(void *magick_enum)
 /**
  * Enum class alloc function.
  *
- * No Ruby usage (internal function)
- *
- * @param class the Ruby class to use
- * @return a new enumerator
+ * @return [Magick::Enum] a new enumerator
  */
 VALUE
 Enum_alloc(VALUE class)
 {
-   MagickEnum *magick_enum;
-   VALUE enumr;
+    MagickEnum *magick_enum;
+    VALUE enumr;
 
-   enumr = Data_Make_Struct(class, MagickEnum, NULL, rm_enum_free, magick_enum);
-   rb_obj_freeze(enumr);
+    enumr = Data_Make_Struct(class, MagickEnum, NULL, rm_enum_free, magick_enum);
+    rb_obj_freeze(enumr);
 
-   return enumr;
+    return enumr;
 }
 
 
 /**
  * "Case equal" operator for Enum.
  *
- * Ruby usage:
- *   - @verbatim Enum#=== @endverbatim
- *
- * Notes:
- *   - Yes, I know "case equal" is a misnomer.
- *
- * @param self this object
- * @param other the other object
- * @return true or false
+ * @param other [Object] the other object
+ * @return [Boolean] true or false
  */
 VALUE
 Enum_case_eq(VALUE self, VALUE other)
 {
-    MagickEnum *this, *that;
-
     if (CLASS_OF(self) == CLASS_OF(other))
     {
+        MagickEnum *this, *that;
+
         Data_Get_Struct(self, MagickEnum, this);
         Data_Get_Struct(other, MagickEnum, that);
         return this->val == that->val ? Qtrue : Qfalse;
@@ -146,58 +136,43 @@ Enum_case_eq(VALUE self, VALUE other)
 /**
  * Initialize a new Enum instance.
  *
- * Ruby usage:
- *   - @verbatim Enum#initialize(sym,val) @endverbatim
- *
- * @param self this object
- * @param sym the symbol
- * @param val the value for the symbol
- * @return self
+ * @param sym [Symbol] the symbol as enum name
+ * @param val [Numeric] the value for enum
+ * @return [Magick::Enum] self
  */
 VALUE
 Enum_initialize(VALUE self, VALUE sym, VALUE val)
 {
-   MagickEnum *magick_enum;
+    MagickEnum *magick_enum;
 
-   Data_Get_Struct(self, MagickEnum, magick_enum);
-   magick_enum->id = rb_to_id(sym); /* convert symbol to ID */
-   magick_enum->val = NUM2INT(val);
+    Data_Get_Struct(self, MagickEnum, magick_enum);
+    magick_enum->id = rb_to_id(sym); /* convert symbol to ID */
+    magick_enum->val = NUM2INT(val);
 
-   return self;
+    return self;
 }
 
 
 /**
  * Return the value of an enum.
  *
- * Ruby usage:
- *   - @verbatim Enum#to_i @endverbatim
- *
- * @param self this object
- * @return this object's value
+ * @return [Numeric] this object's value
  */
 VALUE
 Enum_to_i(VALUE self)
 {
-   MagickEnum *magick_enum;
+    MagickEnum *magick_enum;
 
-   Data_Get_Struct(self, MagickEnum, magick_enum);
-   return INT2NUM(magick_enum->val);
+    Data_Get_Struct(self, MagickEnum, magick_enum);
+    return INT2NUM(magick_enum->val);
 }
 
 
 /**
  * Support Comparable module in Enum.
  *
- * Ruby usage:
- *   - @verbatim Enum#<=> @endverbatim
- *
- * Notes:
- *   - Enums must be instances of the same class to be equal.
- *
- * @param self this object
- * @param other the other object
- * @return -1, 0, 1, or nil
+ * @param other [Object] the other object
+ * @return [-1, 0, 1, nil] the result of compare
  */
 VALUE
 Enum_spaceship(VALUE self, VALUE other)
@@ -225,67 +200,52 @@ Enum_spaceship(VALUE self, VALUE other)
 
 /**
  * Bitwise OR for enums
- * 
- * Ruby usage:
- *   - @verbatim Enum1 | Enum2 @endverbatim
- * 
- * Notes:
- *   - Enums must be instances of the same class.
  *
- * @param Enum1 this object
- * @param Enum2 another enum
- * @return new Enum instance
+ * @param another [Magick::Enum] the another enum
+ * @return [Magick::Enum] new Enum instance
  */
 VALUE
 Enum_bitwise_or(VALUE self, VALUE another)
 {
-  VALUE new_enum, cls;
-  MagickEnum *this, *that, *new_enum_data;
+    VALUE new_enum, cls;
+    MagickEnum *this, *that, *new_enum_data;
 
-  cls = CLASS_OF(self);
-  if (CLASS_OF(another) != cls)
-  {
-    rb_raise(rb_eArgError, "Expected class %s but got %s", rb_class2name(cls), rb_class2name(CLASS_OF(another)));
-  }
+    cls = CLASS_OF(self);
+    if (CLASS_OF(another) != cls)
+    {
+        rb_raise(rb_eArgError, "Expected class %s but got %s", rb_class2name(cls), rb_class2name(CLASS_OF(another)));
+    }
 
-  new_enum = Enum_alloc(cls);
+    new_enum = Enum_alloc(cls);
 
-  Data_Get_Struct(self, MagickEnum, this);
-  Data_Get_Struct(another, MagickEnum, that);
-  Data_Get_Struct(new_enum, MagickEnum, new_enum_data);
+    Data_Get_Struct(self, MagickEnum, this);
+    Data_Get_Struct(another, MagickEnum, that);
+    Data_Get_Struct(new_enum, MagickEnum, 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(this->id), rb_id2name(that->id)));
+    new_enum_data->val = this->val | that->val;
 
-  return new_enum;
+    return new_enum;
 }
 
 /**
  * Return the name of an enum.
  *
- * Ruby usage:
- *   - @verbatim Enum#to_s @endverbatim
- *
- * @param self this object
- * @return the name
+ * @return [String] the name of an enum
  */
 VALUE
 Enum_to_s(VALUE self)
 {
-   return rb_str_new2(rm_enum_to_cstr(self));
+    return rb_str_new2(rm_enum_to_cstr(self));
 }
 
 
 /**
  * Initialize method for all Enum subclasses.
  *
- * Ruby usage:
- *   - @verbatim xxx#initialize(sym,val) @endverbatim
- *
- * @param self this object
- * @param sym the symbol
- * @param val the value of the symbol
- * @return self
+ * @param sym [Symbol] the symbol as enum name
+ * @param val [Numeric] the value for enum
+ * @return [Magick::Enum] self
  */
 VALUE
 Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
@@ -295,7 +255,7 @@ Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
 
     super_argv[0] = sym;
     super_argv[1] = val;
-    (void) rb_call_super(2, (const VALUE *)super_argv);
+    rb_call_super(2, (const VALUE *)super_argv);
 
     if (rb_cvar_defined(CLASS_OF(self), rb_intern(ENUMERATORS_CLASS_VAR)) != Qtrue)
     {
@@ -303,7 +263,7 @@ Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
     }
 
     enumerators = rb_cv_get(CLASS_OF(self), ENUMERATORS_CLASS_VAR);
-    (void) rb_ary_push(enumerators, self);
+    rb_ary_push(enumerators, self);
 
     RB_GC_GUARD(enumerators);
 
@@ -314,11 +274,7 @@ Enum_type_initialize(VALUE self, VALUE sym, VALUE val)
 /**
  * Enum subclass #inspect.
  *
- * Ruby usage:
- *   - @verbatim xxx#inspect @endverbatim
- *
- * @param self this object
- * @return string representation of self
+ * @return [String] representation of self
  */
 static VALUE
 Enum_type_inspect(VALUE self)
@@ -327,7 +283,7 @@ Enum_type_inspect(VALUE self)
     MagickEnum *magick_enum;
 
     Data_Get_Struct(self, MagickEnum, magick_enum);
-    sprintf(str, "%.48s=%d", rb_id2name(magick_enum->id), magick_enum->val);
+    snprintf(str, sizeof(str), "%.48s=%d", rb_id2name(magick_enum->id), magick_enum->val);
 
     return rb_str_new2(str);
 }
@@ -336,15 +292,14 @@ Enum_type_inspect(VALUE self)
 /**
  * Behaves like #each if a block is present, otherwise like #to_a.
  *
- * Ruby usage:
- *   - @verbatim xxx.values @endverbatim
- *   - @verbatim xxx.values {|v| } @endverbatim
+ * @overload values
+ *   @return [Array<Magick::Enum>] the enum values
  *
- * Notes:
- *   - Defined for each Enum subclass
- *
- * @param class the subclass
- * @return iterator over values if given block, a copy of the values otherwise
+ * @overload values
+ *   iterator over values if given block
+ *   @yield [val]
+ *   @yieldparam val [Magick::Enum] an enum
+ *   @return [Magick::Enum] self
  */
 static VALUE
 Enum_type_values(VALUE class)
@@ -359,7 +314,7 @@ Enum_type_values(VALUE class)
     {
         for (x = 0; x < RARRAY_LEN(enumerators); x++)
         {
-            (void) rb_yield(rb_ary_entry(enumerators, x));
+            rb_yield(rb_ary_entry(enumerators, x));
         }
         rv = class;
     }
@@ -368,7 +323,7 @@ Enum_type_values(VALUE class)
         copy = rb_ary_new2(RARRAY_LEN(enumerators));
         for (x = 0; x < RARRAY_LEN(enumerators); x++)
         {
-            (void) rb_ary_push(copy, rb_ary_entry(enumerators, x));
+            rb_ary_push(copy, rb_ary_entry(enumerators, x));
         }
         rb_obj_freeze(copy);
         rv = copy;
@@ -403,12 +358,12 @@ Enum_find(VALUE class, int val)
 
     for (x = 0; x < RARRAY_LEN(enumerators); x++)
     {
-       VALUE enumerator = rb_ary_entry(enumerators, x);
-       Data_Get_Struct(enumerator, MagickEnum, magick_enum);
-       if (magick_enum->val == val)
-       {
-           return enumerator;
-       }
+        VALUE enumerator = rb_ary_entry(enumerators, x);
+        Data_Get_Struct(enumerator, MagickEnum, magick_enum);
+        if (magick_enum->val == val)
+        {
+            return enumerator;
+        }
     }
 
     return Qnil;
@@ -505,7 +460,35 @@ ComplianceType_name(ComplianceType *c)
 VALUE
 ComplianceType_find(ComplianceType compliance)
 {
-    return Enum_find(Class_ComplianceType, compliance);
+    ComplianceType c;
+
+    // Turn off undefined bits
+    if ((compliance & (SVGCompliance|X11Compliance|XPMCompliance))
+        == (SVGCompliance|X11Compliance|XPMCompliance))
+    {
+        c = SVGCompliance|X11Compliance|XPMCompliance;
+    }
+    else if (compliance & SVGCompliance)
+    {
+        c = SVGCompliance;
+    }
+    else if (compliance & X11Compliance)
+    {
+        c = X11Compliance;
+    }
+    else if (compliance & XPMCompliance)
+    {
+        c = XPMCompliance;
+    }
+    else if (compliance == NoCompliance)
+    {
+        c = NoCompliance;
+    }
+    else
+    {
+        c = UndefinedCompliance;
+    }
+    return Enum_find(Class_ComplianceType, c);
 }
 
 

data/ext/RMagick/rmfill.c

@@ -44,10 +44,7 @@ static void free_Fill(void *fill)
 /**
  * Create new GradientFill object.
  *
- * No Ruby usage (internal function)
- *
- * @param class the Ruby class to use
- * @return a new GradientFill object
+ * @return [Magick::GradientFill] a new GradientFill object
  */
 VALUE
 GradientFill_alloc(VALUE class)
@@ -59,19 +56,15 @@ GradientFill_alloc(VALUE class)
 
 
 /**
- * Store the vector points and the start and stop colors.
- *
- * Ruby usage:
- *   - @verbatim GradientFill#initialize(x1,y1,x2,y2,start_color,stop_color) @endverbatim
- *
- * @param self this object
- * @param x1 x position of first point
- * @param y1 y position of first point
- * @param x2 x position of second point
- * @param y2 y position of second point
- * @param start_color the start color
- * @param stop_color the stop color
- * @return self
+ * Initialize GradientFill object.
+ *
+ * @param x1 [Float] x position of first point
+ * @param y1 [Float] y position of first point
+ * @param x2 [Float] x position of second point
+ * @param y2 [Float] y position of second point
+ * @param start_color [Magick::Pixel, String] the start color
+ * @param stop_color [Magick::Pixel, String] the stop color
+ * @return [Magick::GradientFill] self
  */
 VALUE
 GradientFill_initialize(
@@ -139,7 +132,7 @@ point_fill(
 #endif
 
         row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
 
         for (x = 0; x < (ssize_t) image->columns; x++)
         {
@@ -161,10 +154,10 @@ point_fill(
         }
 
         SyncAuthenticPixels(image, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
     }
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 }
 
 /**
@@ -216,7 +209,7 @@ vertical_fill(
         Quantum *row_pixels;
 
         row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
 
         for (x = 0; x < (ssize_t) image->columns; x++)
         {
@@ -230,10 +223,10 @@ vertical_fill(
         }
 
         SyncAuthenticPixels(image, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
     }
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 #else
     // All the rows are the same. Make a "master row" and simply copy
     // it to each actual row.
@@ -270,7 +263,7 @@ vertical_fill(
         }
     }
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 
     xfree((void *) master);
 #endif
@@ -322,7 +315,7 @@ horizontal_fill(
         Quantum *row_pixels;
 
         row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
 
         double distance = fabs(y1 - y);
         for (x = 0; x < (ssize_t) image->columns; x++)
@@ -336,10 +329,10 @@ horizontal_fill(
         }
 
         SyncAuthenticPixels(image, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
     }
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 #else
     // All the columns are the same, so make a master column and copy it to
     // each of the "real" columns.
@@ -375,7 +368,7 @@ horizontal_fill(
         }
     }
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 
     xfree((void *) master);
 #endif
@@ -425,7 +418,7 @@ v_diagonal_fill(
 
     if (d1 < 0 && d2 < 0)
     {
-        steps += FMAX(fabs(d1),fabs(d2));
+        steps += FMAX(fabs(d1), fabs(d2));
     }
     else if (d1 > (double)image->rows && d2 > (double)image->rows)
     {
@@ -458,7 +451,7 @@ v_diagonal_fill(
 #endif
 
         row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
 
         for (x = 0; x < (ssize_t) image->columns; x++)
         {
@@ -479,10 +472,10 @@ v_diagonal_fill(
         }
 
         SyncAuthenticPixels(image, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
     }
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 }
 
 /**
@@ -531,11 +524,11 @@ h_diagonal_fill(
     // the number of steps.
     if (d1 < 0 && d2 < 0)
     {
-        steps += FMAX(fabs(d1),fabs(d2));
+        steps += FMAX(fabs(d1), fabs(d2));
     }
     else if (d1 > (double)image->columns && d2 > (double)image->columns)
     {
-        steps += FMAX(abs((int)(image->columns-d1)),abs((int)(image->columns-d2)));
+        steps += FMAX(abs((int)(image->columns-d1)), abs((int)(image->columns-d2)));
     }
 
     d1 = FMAX(d1, image->columns-d1);
@@ -564,7 +557,7 @@ h_diagonal_fill(
 #endif
 
         row_pixels = QueueAuthenticPixels(image, 0, y, image->columns, 1, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
 
         for (x = 0; x < (ssize_t) image->columns; x++)
         {
@@ -585,22 +578,18 @@ h_diagonal_fill(
         }
 
         SyncAuthenticPixels(image, exception);
-        CHECK_EXCEPTION()
+        CHECK_EXCEPTION();
     }
 
-    (void) DestroyExceptionInfo(exception);
+    DestroyExceptionInfo(exception);
 }
 
 /**
  * Call GradientFill with the start and stop colors specified when this fill
  * object was created.
  *
- * Ruby usage:
- *   - @verbatim GradientFill#fill(image) @endverbatim
- *
- * @param self this object
- * @param image_obj the image
- * @return self
+ * @param image_obj [Magick::Image] the image to fill
+ * @return [Magick::GradientFill] self
  */
 VALUE
 GradientFill_fill(VALUE self, VALUE image_obj)
@@ -678,44 +667,28 @@ free_TextureFill(void *fill_obj)
     rm_TextureFill *fill = (rm_TextureFill *)fill_obj;
 
     // Do not trace destruction
-    (void) DestroyImage(fill->texture);
+    DestroyImage(fill->texture);
     xfree(fill);
 }
 
 /**
  * Create new TextureFill object.
  *
- * No Ruby usage (internal function)
- *
- * Notes:
- *   - The texture is an Image or Image *object
- *
- * @param class the Ruby class to use
- * @return a new TextureFill object
+ * @return [Magick::TextureFill] a new TextureFill object
  */
 VALUE
 TextureFill_alloc(VALUE class)
 {
     rm_TextureFill *fill;
-    return Data_Make_Struct(class
-                            , rm_TextureFill
-                            , NULL
-                            , free_TextureFill
-                            , fill);
+    return Data_Make_Struct(class, rm_TextureFill, NULL, free_TextureFill, fill);
 }
 
 /**
- * Store the texture image.
- *
- * Ruby usage:
- *   - @verbatim TextureFill#initialize(texture) @endverbatim
+ * Initialize TextureFill object.
  *
- * Notes:
- *   - The texture is an Image or Image *object
- *
- * @param self this object
- * @param texture_arg the texture
- * @return self
+ * @param texture_arg [Magick::Image, Magick::ImageList] Either an imagelist or an image. If an
+ *   imagelist, uses the current image.
+ * @return [Magick::TextureFill] self
  */
 VALUE
 TextureFill_initialize(VALUE self, VALUE texture_arg)
@@ -730,7 +703,7 @@ TextureFill_initialize(VALUE self, VALUE texture_arg)
 
     // Bump the reference count on the texture image.
     texture = rm_check_destroyed(texture_image);
-    (void) ReferenceImage(texture);
+    ReferenceImage(texture);
 
     fill->texture = texture;
 
@@ -743,12 +716,8 @@ TextureFill_initialize(VALUE self, VALUE texture_arg)
  * Call TextureFill with the texture specified when this fill object was
  * created.
  *
- * Ruby usage:
- *   - @verbatim TextureFill#fill(image) @endverbatim
- *
- * @param self this object
- * @param image_obj the image
- * @return self
+ * @param image_obj [Magick::Image] the image to fill
+ * @return [Magick::TextureFill] self
  */
 VALUE
 TextureFill_fill(VALUE self, VALUE image_obj)
@@ -764,11 +733,11 @@ TextureFill_fill(VALUE self, VALUE image_obj)
 
 #if defined(IMAGEMAGICK_7)
     exception = AcquireExceptionInfo();
-    (void) TextureImage(image, fill->texture, exception);
-    CHECK_EXCEPTION()
-    (void) DestroyExceptionInfo(exception);
+    TextureImage(image, fill->texture, exception);
+    CHECK_EXCEPTION();
+    DestroyExceptionInfo(exception);
 #else
-    (void) TextureImage(image, fill->texture);
+    TextureImage(image, fill->texture);
     rm_check_image_exception(image, RetainOnError);
 #endif