pango 0.90.7-x86-mingw32 → 0.90.8-x86-mingw32

data/ext/pango/rbpangolayoutiter.c

@@ -16,8 +16,7 @@
 /**********************************/
 #ifndef HAVE_PANGO_LAYOUT_ITER_GET_TYPE
 static PangoLayoutIter*
-layout_iter_copy(ref)
-    const PangoLayoutIter* ref;
+layout_iter_copy(const PangoLayoutIter *ref)
 {
 #if PANGO_CHECK_VERSION(1,6,0)
   PangoLayoutIter* new_ref;
@@ -47,72 +46,62 @@ pango_layout_iter_get_type(void)
 /**********************************/
 
 static VALUE
-layout_iter_next_run(self)
-    VALUE self;
+layout_iter_next_run(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_next_run(_SELF(self)));
 }
 
 static VALUE
-layout_iter_next_char(self)
-    VALUE self;
+layout_iter_next_char(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_next_char(_SELF(self)));
 }
 
 static VALUE
-layout_iter_next_cluster(self)
-    VALUE self;
+layout_iter_next_cluster(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_next_cluster(_SELF(self)));
 }
 
 static VALUE
-layout_iter_next_line(self)
-    VALUE self;
+layout_iter_next_line(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_next_line(_SELF(self)));
 }
 
 static VALUE
-layout_iter_at_last_line(self)
-    VALUE self;
+layout_iter_at_last_line(VALUE self)
 {
     return CBOOL2RVAL(pango_layout_iter_at_last_line(_SELF(self)));
 }
 
 static VALUE
-layout_iter_get_index(self)
-    VALUE self;
+layout_iter_get_index(VALUE self)
 {
     return INT2NUM(pango_layout_iter_get_index(_SELF(self)));
 }
 
 static VALUE
-layout_iter_get_baseline(self)
-    VALUE self;
+layout_iter_get_baseline(VALUE self)
 {
     return INT2NUM(pango_layout_iter_get_baseline(_SELF(self)));
 }
 
 static VALUE
-layout_iter_get_run(self)
-    VALUE self;
+layout_iter_get_run(VALUE self)
 {
     PangoLayoutRun* run = pango_layout_iter_get_run(_SELF(self));
     return BOXED2RVAL(run, PANGO_TYPE_GLYPH_ITEM);
 }
 
 static VALUE
-layout_iter_get_line(self)
-    VALUE self;
+layout_iter_get_line(VALUE self)
 {
     return BOXED2RVAL(pango_layout_iter_get_line(_SELF(self)), PANGO_TYPE_LAYOUT_LINE);
 }
 
 static VALUE
-layout_iter_get_char_extents(self)
-    VALUE self;
+layout_iter_get_char_extents(VALUE self)
 {
     PangoRectangle logical_rect;
     
@@ -121,8 +110,7 @@ layout_iter_get_char_extents(self)
 }
 
 static VALUE
-layout_iter_get_cluster_extents(self)
-    VALUE self;
+layout_iter_get_cluster_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
@@ -133,8 +121,7 @@ layout_iter_get_cluster_extents(self)
 }
 
 static VALUE
-layout_iter_get_run_extents(self)
-    VALUE self;
+layout_iter_get_run_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
@@ -145,8 +132,7 @@ layout_iter_get_run_extents(self)
 }
 
 static VALUE
-layout_iter_get_line_yrange(self)
-    VALUE self;
+layout_iter_get_line_yrange(VALUE self)
 {
     int y0, y1;
     pango_layout_iter_get_line_yrange(_SELF(self), &y0, &y1);
@@ -154,8 +140,7 @@ layout_iter_get_line_yrange(self)
 }
 
 static VALUE
-layout_iter_get_line_extents(self)
-    VALUE self;
+layout_iter_get_line_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
@@ -165,8 +150,7 @@ layout_iter_get_line_extents(self)
                         BOXED2RVAL(&logical_rect, PANGO_TYPE_RECTANGLE));
 }
 static VALUE
-layout_iter_get_layout_extents(self)
-    VALUE self;
+layout_iter_get_layout_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 

data/ext/pango/rbpangolayoutline.c

@@ -17,8 +17,7 @@
 /**********************************/
 #if !PANGO_CHECK_VERSION(1,9,0)
 static PangoLayoutLine*
-layout_line_copy(ref)
-    PangoLayoutLine* ref;
+layout_line_copy(PangoLayoutLine *ref)
 {
   g_return_val_if_fail (ref != NULL, NULL);
   pango_layout_line_ref(ref);
@@ -40,8 +39,7 @@ pango_layout_line_get_type(void)
 /**********************************/
 
 static VALUE
-layout_line_get_extents(self)
-    VALUE self;
+layout_line_get_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
@@ -52,8 +50,7 @@ layout_line_get_extents(self)
 }
 
 static VALUE
-layout_line_get_pixel_extents(self)
-    VALUE self;
+layout_line_get_pixel_extents(VALUE self)
 {
     PangoRectangle ink_rect, logical_rect;
 
@@ -64,8 +61,7 @@ layout_line_get_pixel_extents(self)
 }
 
 static VALUE
-layout_line_index_to_x(self, index, trailing)
-    VALUE self, index, trailing;
+layout_line_index_to_x(VALUE self, VALUE index, VALUE trailing)
 {
     int x_pos;
     pango_layout_line_index_to_x(_SELF(self), NUM2INT(index), 
@@ -74,8 +70,7 @@ layout_line_index_to_x(self, index, trailing)
 }
 
 static VALUE
-layout_line_x_to_index(self, x_pos)
-    VALUE self, x_pos;
+layout_line_x_to_index(VALUE self, VALUE x_pos)
 {
     int index, trailing;
     
@@ -85,8 +80,7 @@ layout_line_x_to_index(self, x_pos)
 }
 
 static VALUE
-layout_line_get_x_ranges(self, start_index, end_index)
-    VALUE self, start_index, end_index;
+layout_line_get_x_ranges(VALUE self, VALUE start_index, VALUE end_index)
 {
     int* ranges;
     int i, n_ranges;
@@ -106,45 +100,39 @@ layout_line_get_x_ranges(self, start_index, end_index)
 
 /* Structure members */
 static VALUE
-layout_line_get_layout(self)
-    VALUE self;
+layout_line_get_layout(VALUE self)
 {
     return GOBJ2RVAL(_SELF(self)->layout);
 }
 
 static VALUE
-layout_line_set_layout(self, val)
-    VALUE self, val;
+layout_line_set_layout(VALUE self, VALUE val)
 {
     _SELF(self)->layout = PANGO_LAYOUT(RVAL2GOBJ(val));
     return self;
 }
 
 static VALUE
-layout_line_get_start_index(self)
-    VALUE self;
+layout_line_get_start_index(VALUE self)
 {
     return INT2NUM(_SELF(self)->start_index);
 }
 
 static VALUE
-layout_line_set_start_index(self, val)
-    VALUE self, val;
+layout_line_set_start_index(VALUE self, VALUE val)
 {
     _SELF(self)->start_index = NUM2INT(val);
     return self;
 }
 
 static VALUE
-layout_line_get_length(self)
-    VALUE self;
+layout_line_get_length(VALUE self)
 {
     return INT2NUM(_SELF(self)->length);
 }
 
 static VALUE
-layout_line_set_length(self, val)
-    VALUE self, val;
+layout_line_set_length(VALUE self, VALUE val)
 {
     _SELF(self)->length = NUM2INT(val);
     return self;
@@ -152,8 +140,7 @@ layout_line_set_length(self, val)
 
 #if PANGO_CHECK_VERSION(1,2,0)
 static VALUE
-layout_line_get_runs(self)
-    VALUE self;
+layout_line_get_runs(VALUE self)
 {
     GSList* list = _SELF(self)->runs;
     VALUE ary = rb_ary_new();
@@ -172,8 +159,7 @@ layout_line_get_runs(self)
 #endif
 
 static VALUE
-layout_line_set_runs(self, ary)
-    VALUE self, ary;
+layout_line_set_runs(VALUE self, VALUE ary)
 {
     int i, len;
     GSList* list = NULL;
@@ -195,30 +181,26 @@ layout_line_set_runs(self, ary)
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
-layout_line_is_paragraph_start(self)
-    VALUE self;
+layout_line_is_paragraph_start(VALUE self)
 {
     return CBOOL2RVAL(_SELF(self)->is_paragraph_start);
 }
 
 static VALUE
-layout_line_set_paragraph_start(self, val)
-    VALUE self, val;
+layout_line_set_paragraph_start(VALUE self, VALUE val)
 {
     _SELF(self)->is_paragraph_start = RVAL2CBOOL(val);
     return self;
 }
 
 static VALUE
-layout_line_get_resolved_dir(self)
-    VALUE self;
+layout_line_get_resolved_dir(VALUE self)
 {
     return UINT2NUM(_SELF(self)->resolved_dir);
 }
 
 static VALUE
-layout_line_set_resolved_dir(self, val)
-    VALUE self, val;
+layout_line_set_resolved_dir(VALUE self, VALUE val)
 {
     _SELF(self)->resolved_dir = NUM2UINT(val);
     return self;

data/ext/pango/rbpangologattr.c

@@ -39,22 +39,19 @@ pango_log_attr_get_type(void)
 
 #define ATTR_BOOL(name)\
 static VALUE \
-log_get_ ## name (self)\
-    VALUE self;\
+log_get_ ## name (VALUE self)\
 {\
     return CBOOL2RVAL(_SELF(self)->name);\
 }\
 static VALUE \
-log_set_ ## name (self, val)\
-    VALUE self, val;\
+log_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = RVAL2CBOOL(val);\
     return self;\
 }
 
 static VALUE
-log_initialize(self)
-    VALUE self;
+log_initialize(VALUE self)
 {
     PangoLogAttr log;
     G_INITIALIZE(self, &log);

data/ext/pango/rbpangomain.c

@@ -16,8 +16,7 @@
  */
 
 static VALUE
-rpango_reorder_items(self, logical_items)
-    VALUE self, logical_items;
+rpango_reorder_items(VALUE self, VALUE logical_items)
 {
     int i;
     GList *glist = NULL;
@@ -37,15 +36,13 @@ rpango_reorder_items(self, logical_items)
 
 #if PANGO_CHECK_VERSION(1,4,0)
 static VALUE
-rpango_unichar_direction(self, ch)
-    VALUE self, ch;
+rpango_unichar_direction(VALUE self, VALUE ch)
 {
     return GENUM2RVAL(pango_unichar_direction(NUM2UINT(ch)), PANGO_TYPE_DIRECTION);
 }
 
 static VALUE
-rpango_find_base_dir(self, text)
-    VALUE self, text;
+rpango_find_base_dir(VALUE self, VALUE text)
 {
     StringValue(text);
     return GENUM2RVAL(pango_find_base_dir(RVAL2CSTR(text), RSTRING_LEN(text)), 
@@ -54,8 +51,7 @@ rpango_find_base_dir(self, text)
 #endif
 
 static VALUE
-rpango_break(self, text, analysis)
-    VALUE self, text, analysis;
+rpango_break(VALUE self, VALUE text, VALUE analysis)
 {
     gint i, len;
     glong attrs_len;
@@ -82,8 +78,7 @@ rpango_break(self, text, analysis)
 }
 
 static VALUE
-rpango_get_log_attrs(self, text, level, language)
-    VALUE self, text, level, language;
+rpango_get_log_attrs(VALUE self, VALUE text, VALUE level, VALUE language)
 {
     gint i, len;
     glong attrs_len;
@@ -110,8 +105,7 @@ rpango_get_log_attrs(self, text, level, language)
 }
 
 static VALUE
-rpango_find_paragraph_boundary(self, text)
-     VALUE self, text;
+rpango_find_paragraph_boundary(VALUE self, VALUE text)
 {
     gint paragraph_delimiter_index, next_paragraph_start;
     
@@ -132,8 +126,7 @@ void        pango_default_break             (const gchar *text,
 */
 
 static VALUE
-rpango_shape(self, text, analysis)
-    VALUE self, text, analysis;
+rpango_shape(VALUE self, VALUE text, VALUE analysis)
 {
     VALUE ret;
     PangoGlyphString* glyphs = pango_glyph_string_new();
@@ -146,10 +139,7 @@ rpango_shape(self, text, analysis)
 
 /* This method is from rbpangoattribute.c */
 static VALUE
-rpango_parse_markup(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+rpango_parse_markup(int argc, VALUE *argv, VALUE self)
 {
     VALUE markup_text, accel_marker;
     PangoAttrList *pattr_list;
@@ -187,8 +177,7 @@ rpango_parse_markup(argc, argv, self)
 }
 
 static VALUE
-rpango_pixels(self, pixels)
-    VALUE self, pixels;
+rpango_pixels(VALUE self, VALUE pixels)
 {
     return rb_float_new(PANGO_PIXELS(NUM2DBL(pixels)));
 }

data/ext/pango/rbpangomatrix.c

@@ -16,14 +16,12 @@
 
 #define ATTR_FLOAT(name)\
 static VALUE \
-matrix_get_ ## name (self)\
-    VALUE self;\
+matrix_get_ ## name (VALUE self)\
 {\
     return rb_float_new(_SELF(self)->name);\
 }\
 static VALUE \
-matrix_set_ ## name (self, val)\
-    VALUE self, val;\
+matrix_set_ ## name (VALUE self, VALUE val)\
 {\
     _SELF(self)->name = NUM2DBL(val);\
     return self;\
@@ -34,10 +32,7 @@ matrix_set_ ## name (self, val)\
     rb_define_method(matrix, G_STRINGIFY(set_ ## name), matrix_set_## name, 1);
 
 static VALUE
-matrix_initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+matrix_initialize(int argc, VALUE *argv, VALUE self)
 {
     PangoMatrix matrix = PANGO_MATRIX_INIT;
     VALUE xx, xy, yx, yy, x0, y0;
@@ -57,24 +52,21 @@ matrix_initialize(argc, argv, self)
 }
 
 static VALUE
-matrix_translate(self, tx, ty)
-    VALUE self, tx, ty;
+matrix_translate(VALUE self, VALUE tx, VALUE ty)
 {
     pango_matrix_translate(_SELF(self), NUM2DBL(tx), NUM2DBL(ty));
     return self;
 }
 
 static VALUE
-matrix_scale(self, scale_x, scale_y)
-    VALUE self, scale_x, scale_y;
+matrix_scale(VALUE self, VALUE scale_x, VALUE scale_y)
 {
     pango_matrix_scale(_SELF(self), NUM2DBL(scale_x), NUM2DBL(scale_y));
     return self;
 }
 
 static VALUE
-matrix_rotate(self, degrees)
-    VALUE self, degrees;
+matrix_rotate(VALUE self, VALUE degrees)
 {
     pango_matrix_rotate(_SELF(self), NUM2DBL(degrees));
     return self;
@@ -89,8 +81,7 @@ matrix_get_gravity(VALUE self)
 #endif
 
 static VALUE
-matrix_concat(self, new_matrix)
-    VALUE self, new_matrix;
+matrix_concat(VALUE self, VALUE new_matrix)
 {
     pango_matrix_concat(_SELF(self), _SELF(new_matrix));
     return self;
@@ -98,8 +89,7 @@ matrix_concat(self, new_matrix)
 
 #if PANGO_CHECK_VERSION(1,12,0)
 static VALUE
-matrix_get_font_scale_factor(self)
-    VALUE self;
+matrix_get_font_scale_factor(VALUE self)
 {
     return rb_float_new(pango_matrix_get_font_scale_factor(_SELF(self)));
 }
@@ -113,8 +103,7 @@ ATTR_FLOAT(x0);
 ATTR_FLOAT(y0);
 
 static VALUE
-matrix_to_a(self)
-    VALUE self;
+matrix_to_a(VALUE self)
 {
     PangoMatrix* matrix = _SELF(self);
     return rb_ary_new3(6, INT2NUM(matrix->xx), INT2NUM(matrix->xy), INT2NUM(matrix->yx),