gdk_pixbuf2 0.90.7-x86-mingw32 → 0.90.8-x86-mingw32

data/ChangeLog

@@ -1,3 +1,7 @@
+2011-02-05  Masaaki Aoyagi
+
+	* ext/gdk_pixbuf2/*.c: change to ANSI C style.
+
 2011-01-30  Kouhei Sutou  <kou@cozmixng.org>
 
 	* Rakefile, ext/gdk_pixbuf2/extconf.rb: share depended packages

data/ext/gdk_pixbuf2/rbgdk-pixbuf-format.c

@@ -51,22 +51,19 @@ GSList*     gdk_pixbuf_get_formats          (void);
 */
 
 static VALUE
-get_name(self)
-    VALUE self;
+get_name(VALUE self)
 {
     return CSTR2RVAL_FREE(gdk_pixbuf_format_get_name(_SELF(self)));
 }
 
 static VALUE
-get_description(self)
-    VALUE self;
+get_description(VALUE self)
 {
     return CSTR2RVAL_FREE(gdk_pixbuf_format_get_description(_SELF(self)));
 }
     
 static VALUE
-get_mime_types(self)
-    VALUE self;
+get_mime_types(VALUE self)
 {
     gint i = 0;
     gchar** mime_types = gdk_pixbuf_format_get_mime_types(_SELF(self));
@@ -80,8 +77,7 @@ get_mime_types(self)
 }
 
 static VALUE
-get_extensions(self)
-    VALUE self;
+get_extensions(VALUE self)
 {
     gint i = 0;
     gchar** extensions = gdk_pixbuf_format_get_extensions(_SELF(self));
@@ -96,23 +92,20 @@ get_extensions(self)
 }
 
 static VALUE
-is_writable(self)
-    VALUE self;
+is_writable(VALUE self)
 {
     return CBOOL2RVAL(gdk_pixbuf_format_is_writable(_SELF(self)));
 }
 
 /* Structure */
 static VALUE
-get_domain(self)
-    VALUE self;
+get_domain(VALUE self)
 {
     return CSTR2RVAL(_SELF(self)->domain);
 }
 
 static VALUE
-get_signature(self)
-    VALUE self;
+get_signature(VALUE self)
 {
     GdkPixbufModulePattern* signature = _SELF(self)->signature;
 
@@ -130,27 +123,23 @@ get_signature(self)
 
 #if RBGDK_PIXBUF_CHECK_VERSION(2,6,0)
 static VALUE
-is_scalable(self)
-    VALUE self;
+is_scalable(VALUE self)
 {
     return CBOOL2RVAL(gdk_pixbuf_format_is_scalable(_SELF(self)));
 }
 static VALUE
-is_disabled(self)
-    VALUE self;
+is_disabled(VALUE self)
 {
     return CBOOL2RVAL(gdk_pixbuf_format_is_disabled(_SELF(self)));
 }
 static VALUE
-set_disabled(self, disabled)
-    VALUE self, disabled;
+set_disabled(VALUE self, VALUE disabled)
 {
     gdk_pixbuf_format_set_disabled(_SELF(self), RVAL2CBOOL(disabled));
     return self;
 }
 static VALUE
-get_license(self)
-    VALUE self;
+get_license(VALUE self)
 {
     return CSTR2RVAL(gdk_pixbuf_format_get_license(_SELF(self)));
 }

data/ext/gdk_pixbuf2/rbgdk-pixbuf-loader.c

@@ -18,10 +18,7 @@
 /* File opening */
 /* Image Data in Memory */
 static VALUE
-initialize_loader(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+initialize_loader(int argc, VALUE *argv, VALUE self)
 {
     GdkPixbufLoader* loader;
     GError* error = NULL;
@@ -52,8 +49,7 @@ initialize_loader(argc, argv, self)
 
 #if RBGDK_PIXBUF_CHECK_VERSION(2,2,0)
 static VALUE
-loader_get_format(self)
-    VALUE self;
+loader_get_format(VALUE self)
 {
     GdkPixbufFormat* format = gdk_pixbuf_loader_get_format(_SELF(self));
     return BOXED2RVAL(format, GDK_TYPE_PIXBUF_FORMAT);
@@ -61,9 +57,7 @@ loader_get_format(self)
 #endif
 
 static VALUE
-loader_write(self, data)
-    VALUE self;
-    VALUE data;
+loader_write(VALUE self, VALUE data)
 {
     GError *error = NULL;
     gboolean res;
@@ -76,9 +70,7 @@ loader_write(self, data)
 }
 
 static VALUE
-last_write(self, data)
-    VALUE self;
-    VALUE data;
+last_write(VALUE self, VALUE data)
 {
     GError *error = NULL;
     gboolean res;
@@ -97,8 +89,7 @@ last_write(self, data)
 
 #if RBGDK_PIXBUF_CHECK_VERSION(2,2,0)
 static VALUE
-loader_set_size(self, width, height)
-    VALUE self, width, height;
+loader_set_size(VALUE self, VALUE width, VALUE height)
 {
     gdk_pixbuf_loader_set_size(_SELF(self), NUM2INT(width), NUM2INT(height));
     return self;
@@ -106,8 +97,7 @@ loader_set_size(self, width, height)
 #endif
 
 static VALUE
-loader_close(self)
-    VALUE self;
+loader_close(VALUE self)
 {
     GError *error = NULL;
     gboolean res;
@@ -122,16 +112,14 @@ loader_close(self)
 /****************************************************/
 /* Creating image */
 static VALUE
-get_pixbuf(self)
-    VALUE self;
+get_pixbuf(VALUE self)
 {
     return GOBJ2RVAL(gdk_pixbuf_loader_get_pixbuf(_SELF(self)));
 }
 
 /* Creating animation */
 static VALUE
-get_animation(self)
-    VALUE self;
+get_animation(VALUE self)
 {
     return GOBJ2RVAL(gdk_pixbuf_loader_get_animation(_SELF(self)));
 }

data/ext/gdk_pixbuf2/rbgdk-pixbuf.c

@@ -30,29 +30,25 @@ static ID id_pixdata;
 /****************************************************/
 /* The GdkPixbuf Structure */
 static VALUE
-get_colorspace(self)
-    VALUE self;
+get_colorspace(VALUE self)
 {
     return GENUM2RVAL(gdk_pixbuf_get_colorspace(_SELF(self)), GDK_TYPE_COLORSPACE);
 }
 
 static VALUE
-get_n_channels(self)
-    VALUE self;
+get_n_channels(VALUE self)
 {
     return INT2FIX(gdk_pixbuf_get_n_channels(_SELF(self)));
 }
 
 static VALUE
-get_has_alpha(self)
-    VALUE self;
+get_has_alpha(VALUE self)
 {
     return CBOOL2RVAL(gdk_pixbuf_get_has_alpha(_SELF(self)));
 }
 
 static VALUE
-get_bits_per_sample(self)
-    VALUE self;
+get_bits_per_sample(VALUE self)
 {
     return INT2FIX(gdk_pixbuf_get_bits_per_sample(_SELF(self)));
 }
@@ -107,29 +103,25 @@ set_pixels(VALUE self, VALUE pixels)
 }
 
 static VALUE
-get_width(self)
-    VALUE self;
+get_width(VALUE self)
 {
     return INT2FIX(gdk_pixbuf_get_width(_SELF(self)));
 }
 
 static VALUE
-get_height(self)
-    VALUE self;
+get_height(VALUE self)
 {
     return INT2FIX(gdk_pixbuf_get_height(_SELF(self)));
 }
 
 static VALUE
-get_rowstride(self)
-    VALUE self;
+get_rowstride(VALUE self)
 {
     return INT2FIX(gdk_pixbuf_get_rowstride(_SELF(self)));
 }
 
 static VALUE
-get_option(self, key)
-    VALUE self, key;
+get_option(VALUE self, VALUE key)
 {
     const gchar* ret = gdk_pixbuf_get_option(_SELF(self), RVAL2CSTR(key));
     return ret ? CSTR2RVAL(ret) : Qnil;
@@ -139,10 +131,7 @@ get_option(self, key)
 /* File opening */
 /* Image Data in Memory */
 static VALUE
-initialize(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+initialize(int argc, VALUE *argv, VALUE self)
 {
     GdkPixbuf* buf;
     GError* error = NULL;
@@ -288,8 +277,7 @@ initialize(argc, argv, self)
 }
 
 static VALUE
-copy(self)
-    VALUE self;
+copy(VALUE self)
 {
     VALUE ret;
     GdkPixbuf* dest = gdk_pixbuf_copy(_SELF(self));
@@ -302,8 +290,7 @@ copy(self)
 
 #if RBGDK_PIXBUF_CHECK_VERSION(2,4,0)
 static VALUE
-get_file_info(self, filename)
-    VALUE self, filename;
+get_file_info(VALUE self, VALUE filename)
 {
     gint width, height;
 
@@ -406,10 +393,7 @@ save_to_buffer(int argc, VALUE *argv, VALUE self)
 /****************************************************/
 /* Scaling */
 static VALUE
-scale_simple(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+scale_simple(int argc, VALUE *argv, VALUE self)
 {
     GdkPixbuf* dest;
     VALUE dest_width, dest_height, interp_type, ret;
@@ -434,10 +418,7 @@ scale_simple(argc, argv, self)
 }
 
 static VALUE
-scale(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+scale(int argc, VALUE *argv, VALUE self)
 {
     GdkInterpType type = GDK_INTERP_BILINEAR;
 
@@ -460,10 +441,7 @@ scale(argc, argv, self)
 }
 
 static VALUE
-composite_simple(self, dest_width, dest_height, interp_type, overall_alpha,
-                 check_size, color1, color2)
-    VALUE self, dest_width, dest_height, interp_type, overall_alpha,
-    check_size, color1, color2;
+composite_simple(VALUE self, VALUE dest_width, VALUE dest_height, VALUE interp_type, VALUE overall_alpha, VALUE check_size, VALUE color1, VALUE color2)
 {
     GdkPixbuf* dest;
     VALUE ret;
@@ -486,10 +464,7 @@ composite_simple(self, dest_width, dest_height, interp_type, overall_alpha,
 }
 
 static VALUE
-composite(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+composite(int argc, VALUE *argv, VALUE self)
 {
     VALUE ret;
     VALUE args[16];
@@ -538,8 +513,7 @@ composite(argc, argv, self)
 
 #if RBGDK_PIXBUF_CHECK_VERSION(2,6,0)
 static VALUE
-rotate_simple(self, angle)
-    VALUE self, angle;
+rotate_simple(VALUE self, VALUE angle)
 {
     VALUE ret;
     GdkPixbuf* dest = gdk_pixbuf_rotate_simple(_SELF(self), RVAL2GENUM(angle, GDK_TYPE_PIXBUF_ROTATION));
@@ -551,8 +525,7 @@ rotate_simple(self, angle)
 }
 
 static VALUE
-flip(self, horizontal)
-    VALUE self, horizontal;
+flip(VALUE self, VALUE horizontal)
 {
     VALUE ret;
     GdkPixbuf* dest = gdk_pixbuf_flip(_SELF(self), RVAL2CBOOL(horizontal));
@@ -565,8 +538,7 @@ flip(self, horizontal)
 #endif
 
 static VALUE
-add_alpha(self, substitute_color, r, g, b)
-    VALUE self, substitute_color, r, g, b;
+add_alpha(VALUE self, VALUE substitute_color, VALUE r, VALUE g, VALUE b)
 {
     VALUE ret;
     GdkPixbuf* dest = gdk_pixbuf_add_alpha(_SELF(self),
@@ -580,8 +552,7 @@ add_alpha(self, substitute_color, r, g, b)
 }
 
 static VALUE
-copy_area(self, src_x, src_y, width, height, dest, dest_x, dest_y)
-    VALUE self, src_x, src_y, width, height, dest, dest_x, dest_y;
+copy_area(VALUE self, VALUE src_x, VALUE src_y, VALUE width, VALUE height, VALUE dest, VALUE dest_x, VALUE dest_y)
 {
     gdk_pixbuf_copy_area(_SELF(self), NUM2INT(src_x), NUM2INT(src_y),
                          NUM2INT(width), NUM2INT(height),
@@ -590,8 +561,7 @@ copy_area(self, src_x, src_y, width, height, dest, dest_x, dest_y)
 }
 
 static VALUE
-saturate_and_pixelate(self, staturation, pixelate)
-    VALUE self, staturation, pixelate;
+saturate_and_pixelate(VALUE self, VALUE staturation, VALUE pixelate)
 {
     GdkPixbuf* dest = gdk_pixbuf_copy(_SELF(self));
     gdk_pixbuf_saturate_and_pixelate(_SELF(self), dest, 
@@ -600,8 +570,7 @@ saturate_and_pixelate(self, staturation, pixelate)
 }
 
 static VALUE
-fill(self, pixel)
-    VALUE self, pixel;
+fill(VALUE self, VALUE pixel)
 {
     gdk_pixbuf_fill(_SELF(self), NUM2UINT(pixel));
     return self;
@@ -610,15 +579,13 @@ fill(self, pixel)
 /* From Module Interface */
 #if RBGDK_PIXBUF_CHECK_VERSION(2,2,0)
 static VALUE
-get_formats(self)
-    VALUE self;
+get_formats(VALUE self)
 {
     return GSLIST2ARY2(gdk_pixbuf_get_formats(), GDK_TYPE_PIXBUF_FORMAT);
 }
 
 static VALUE
-set_option(self, key, value)
-    VALUE self, key, value;
+set_option(VALUE self, VALUE key, VALUE value)
 {
 #if HAVE_GDK_PIXBUF_SET_OPTION
     return CBOOL2RVAL(gdk_pixbuf_set_option(_SELF(self), 

data/ext/gdk_pixbuf2/rbgdk-pixbufanimation.c

@@ -14,8 +14,7 @@
 #define RVAL2ITR(i) (GDK_PIXBUF_ANIMATION_ITER(RVAL2GOBJ(i)))
 
 static VALUE
-animation_initialize(self, filename)
-    VALUE self, filename;
+animation_initialize(VALUE self, VALUE filename)
 {
     GdkPixbufAnimation* ret;
     GError* error = NULL;
@@ -29,24 +28,19 @@ animation_initialize(self, filename)
 }
 
 static VALUE
-animation_get_width(self)
-    VALUE self;
+animation_get_width(VALUE self)
 {
     return INT2NUM(gdk_pixbuf_animation_get_width(_SELF(self)));
 }
 
 static VALUE
-animation_get_height(self)
-    VALUE self;
+animation_get_height(VALUE self)
 {
     return INT2NUM(gdk_pixbuf_animation_get_height(_SELF(self)));
 }
 
 static VALUE
-animation_get_iter(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+animation_get_iter(int argc, VALUE *argv, VALUE self)
 {
     VALUE start_time_sec, start_time_usec;
     GTimeVal* time = NULL;
@@ -66,24 +60,19 @@ animation_get_iter(argc, argv, self)
 }
 
 static VALUE
-animation_is_static_image(self)
-    VALUE self;
+animation_is_static_image(VALUE self)
 {
     return CBOOL2RVAL(gdk_pixbuf_animation_is_static_image(_SELF(self)));
 }
 
 static VALUE
-animation_get_static_image(self)
-    VALUE self;
+animation_get_static_image(VALUE self)
 {
     return GOBJ2RVAL(gdk_pixbuf_animation_get_static_image(_SELF(self)));
 }
 
 static VALUE
-animation_iter_advance(argc, argv, self)
-    int argc;
-    VALUE *argv;
-    VALUE self;
+animation_iter_advance(int argc, VALUE *argv, VALUE self)
 {
     VALUE current_time_sec, current_time_usec;
     GTimeVal* time = NULL;
@@ -104,22 +93,19 @@ animation_iter_advance(argc, argv, self)
 }
 
 static VALUE
-animation_iter_get_delay_time(self)
-    VALUE self;
+animation_iter_get_delay_time(VALUE self)
 {
     return INT2NUM(gdk_pixbuf_animation_iter_get_delay_time(RVAL2ITR(self)));
 }
 
 static VALUE
-animation_iter_on_currently_loading_frame(self)
-    VALUE self;
+animation_iter_on_currently_loading_frame(VALUE self)
 {
     return CBOOL2RVAL(gdk_pixbuf_animation_iter_on_currently_loading_frame(RVAL2ITR(self)));
 }
 
 static VALUE
-animation_iter_get_pixbuf(self)
-    VALUE self;
+animation_iter_get_pixbuf(VALUE self)
 {
     return GOBJ2RVAL(gdk_pixbuf_animation_iter_get_pixbuf(RVAL2ITR(self)));
 }

data/ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.c

@@ -14,8 +14,7 @@
 #define _SELF(s) (GDK_PIXBUF_SIMPLE_ANIM(RVAL2GOBJ(s)))
 
 static VALUE
-simpleanim_initialize(self, width, height, rate)
-    VALUE self, width, height, rate;
+simpleanim_initialize(VALUE self, VALUE width, VALUE height, VALUE rate)
 {
     GdkPixbufSimpleAnim* ret = gdk_pixbuf_simple_anim_new(NUM2INT(width), NUM2INT(height), NUM2DBL(rate));
     G_INITIALIZE(self, ret);
@@ -23,8 +22,7 @@ simpleanim_initialize(self, width, height, rate)
 }
 
 static VALUE
-simpleanim_add_frame(self, pixbuf)
-    VALUE self, pixbuf;
+simpleanim_add_frame(VALUE self, VALUE pixbuf)
 {
     gdk_pixbuf_simple_anim_add_frame(_SELF(self), RVAL2GOBJ(pixbuf));
     return self;

data/ext/gdk_pixbuf2/rbgdk-pixdata.c

@@ -39,8 +39,7 @@ gdk_pixdata_get_type (void)
 }
 /*****************************************/
 static VALUE
-pixdata_s_from_pixbuf(self, pixbuf, use_rle)
-    VALUE self, pixbuf, use_rle;
+pixdata_s_from_pixbuf(VALUE self, VALUE pixbuf, VALUE use_rle)
 {
     GdkPixdata pixdata;
     gpointer rle_data = gdk_pixdata_from_pixbuf(&pixdata, RVAL2GOBJ(pixbuf), RVAL2CBOOL(use_rle));
@@ -53,8 +52,7 @@ pixdata_s_from_pixbuf(self, pixbuf, use_rle)
 }
 
 static VALUE
-pixdata_to_pixbuf(self, copy_pixels)
-    VALUE self, copy_pixels;
+pixdata_to_pixbuf(VALUE self, VALUE copy_pixels)
 {
     GError* error = NULL;
     GdkPixbuf* ret = gdk_pixbuf_from_pixdata(_SELF(self), RVAL2CBOOL(copy_pixels), &error);
@@ -64,8 +62,7 @@ pixdata_to_pixbuf(self, copy_pixels)
 }
 
 static VALUE
-pixdata_serialize(self)
-    VALUE self;
+pixdata_serialize(VALUE self)
 {
     guint stream_length;
     gint i;
@@ -78,8 +75,7 @@ pixdata_serialize(self)
 }
 
 static VALUE
-pixdata_s_deserialize(self, stream)
-    VALUE self, stream;
+pixdata_s_deserialize(VALUE self, VALUE stream)
 {
     GdkPixdata pixdata;
     gboolean ret;
@@ -104,8 +100,7 @@ pixdata_s_deserialize(self, stream)
 }
 
 static VALUE
-pixdata_to_csource(self, name, dump_type)
-    VALUE self, name, dump_type;
+pixdata_to_csource(VALUE self, VALUE name, VALUE dump_type)
 {
     GString* str = gdk_pixdata_to_csource(_SELF(self), RVAL2CSTR(name), FIX2INT(dump_type));
     VALUE ret = CSTR2RVAL(str->str);
@@ -115,15 +110,13 @@ pixdata_to_csource(self, name, dump_type)
 
 /* GdkPixdata */
 static VALUE
-pixdata_magic(self)
-    VALUE self;
+pixdata_magic(VALUE self)
 {
     return UINT2NUM(_SELF(self)->magic);
 }
 
 static VALUE
-pixdata_length(self)
-    VALUE self;
+pixdata_length(VALUE self)
 {
     gint32 length = _SELF(self)->length;
 
@@ -133,36 +126,31 @@ pixdata_length(self)
 }
 
 static VALUE
-pixdata_pixdata_type(self)
-    VALUE self;
+pixdata_pixdata_type(VALUE self)
 {
     return UINT2NUM(_SELF(self)->pixdata_type);
 }
 
 static VALUE
-pixdata_rowstride(self)
-    VALUE self;
+pixdata_rowstride(VALUE self)
 {
     return INT2NUM(_SELF(self)->rowstride);
 }
 
 static VALUE
-pixdata_width(self)
-    VALUE self;
+pixdata_width(VALUE self)
 {
     return INT2NUM(_SELF(self)->width);
 }
 
 static VALUE
-pixdata_height(self)
-    VALUE self;
+pixdata_height(VALUE self)
 {
     return INT2NUM(_SELF(self)->height);
 }
 
 static VALUE
-pixdata_pixel_data(self)
-    VALUE self;
+pixdata_pixel_data(VALUE self)
 {
     gint i;
     guint8* ret = _SELF(self)->pixel_data;

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gdk_pixbuf2
 version: !ruby/object:Gem::Version 
-  hash: 377
+  hash: 359
   prerelease: false
   segments: 
   - 0
   - 90
-  - 7
-  version: 0.90.7
+  - 8
+  version: 0.90.8
 platform: x86-mingw32
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-02 00:00:00 +09:00
+date: 2011-03-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 377
+        hash: 359
         segments: 
         - 0
         - 90
-        - 7
-        version: 0.90.7
+        - 8
+        version: 0.90.8
   type: :runtime
   version_requirements: *id001
 description: Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.