From: <nu...@co...> - 2011-12-30 11:31:31
|
Masaaki Aoyagi 2011-12-30 02:02:20 +0900 (Fri, 30 Dec 2011) New Revision: f05aad56de2df56670fe9d8aa3353be2059c867d Merged d59090b: Merge pull request #92 from masaakiaoyagi/master Log: Change to use conversion macros Modified files: gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf-format.c gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf-loader.c gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf.c gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufanimation.c gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufanimationiter.c gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.c gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixdata.c Modified: gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf-format.c (+1 -1) =================================================================== --- gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf-format.c 2011-12-30 01:52:15 +0900 (831509e) +++ gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf-format.c 2011-12-30 02:02:20 +0900 (0d433e2) @@ -27,7 +27,7 @@ #endif #define RG_TARGET_NAMESPACE cPixbufFormat -#define _SELF(r) ((GdkPixbufFormat*)RVAL2BOXED(r, GDK_TYPE_PIXBUF_FORMAT)) +#define _SELF(r) (RVAL2GDKPIXBUFFORMAT(r)) /**********************************/ static GdkPixbufFormat* Modified: gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf-loader.c (+2 -2) =================================================================== --- gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf-loader.c 2011-12-30 01:52:15 +0900 (3af197a) +++ gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf-loader.c 2011-12-30 02:02:20 +0900 (1d6098f) @@ -23,7 +23,7 @@ #include "rbgdk-pixbuf.h" #define RG_TARGET_NAMESPACE cPixbufLoader -#define _SELF(s) GDK_PIXBUF_LOADER(RVAL2GOBJ(s)) +#define _SELF(s) RVAL2GDKPIXBUFLOADER(s) /****************************************************/ /* File opening */ @@ -63,7 +63,7 @@ static VALUE rg_format(VALUE self) { GdkPixbufFormat* format = gdk_pixbuf_loader_get_format(_SELF(self)); - return BOXED2RVAL(format, GDK_TYPE_PIXBUF_FORMAT); + return GDKPIXBUFFORMAT2RVAL(format); } #endif Modified: gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf.c (+12 -12) =================================================================== --- gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf.c 2011-12-30 01:52:15 +0900 (b34a068) +++ gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbuf.c 2011-12-30 02:02:20 +0900 (8f6dd1a) @@ -29,7 +29,7 @@ #endif #define RG_TARGET_NAMESPACE cPixbuf -#define _SELF(s) GDK_PIXBUF(RVAL2GOBJ(s)) +#define _SELF(s) RVAL2GDKPIXBUF(s) #define NOMEM_ERROR(error) g_set_error(error,\ GDK_PIXBUF_ERROR,\ @@ -130,7 +130,7 @@ pixbuf_initialize_by_hash(VALUE self, VALUE arg, GError **error) if (!NIL_P(rb_data)) { buf = gdk_pixbuf_new_from_data((const guchar*)RVAL2CSTR(rb_data), - NIL_P(rb_colorspace) ? GDK_COLORSPACE_RGB : RVAL2GENUM(rb_colorspace, GDK_TYPE_COLORSPACE), + NIL_P(rb_colorspace) ? GDK_COLORSPACE_RGB : RVAL2GDKCOLORSPACE(rb_colorspace), RVAL2CBOOL(rb_has_alpha), NIL_P(rb_bits_per_sample) ? 8 : NUM2INT(rb_bits_per_sample), NUM2INT(rb_width), @@ -193,7 +193,7 @@ pixbuf_initialize_by_hash(VALUE self, VALUE arg, GError **error) buf = gdk_pixbuf_new_from_file(RVAL2CSTR(rb_file), error); } } else { - buf = gdk_pixbuf_new(NIL_P(rb_colorspace) ? GDK_COLORSPACE_RGB : RVAL2GENUM(rb_colorspace, GDK_TYPE_COLORSPACE), + buf = gdk_pixbuf_new(NIL_P(rb_colorspace) ? GDK_COLORSPACE_RGB : RVAL2GDKCOLORSPACE(rb_colorspace), RVAL2CBOOL(rb_has_alpha), NIL_P(rb_bits_per_sample) ? 8 : NUM2INT(rb_bits_per_sample), NUM2INT(rb_width), @@ -213,7 +213,7 @@ pixbuf_initialize(VALUE self, int argc, VALUE arg1, VALUE arg2, VALUE arg3, VALU if (argc == 7){ buf = gdk_pixbuf_new_from_data((const guchar*)RVAL2CSTR(arg1), - RVAL2GENUM(arg2, GDK_TYPE_COLORSPACE), + RVAL2GDKCOLORSPACE(arg2), RVAL2CBOOL(arg3), NUM2INT(arg4), NUM2INT(arg5), NUM2INT(arg6), NUM2INT(arg7), NULL, NULL); @@ -227,7 +227,7 @@ pixbuf_initialize(VALUE self, int argc, VALUE arg1, VALUE arg2, VALUE arg3, VALU NUM2INT(arg4), NUM2INT(arg5)); if (buf == NULL) NOMEM_ERROR(error); } else if (rb_obj_is_kind_of(arg1, GTYPE2CLASS(GDK_TYPE_COLORSPACE))){ - buf = gdk_pixbuf_new(RVAL2GENUM(arg1, GDK_TYPE_COLORSPACE), + buf = gdk_pixbuf_new(RVAL2GDKCOLORSPACE(arg1), RVAL2CBOOL(arg2), NUM2INT(arg3), NUM2INT(arg4), NUM2INT(arg5)); if (buf == NULL) NOMEM_ERROR(error); @@ -328,7 +328,7 @@ rg_s_get_file_info(G_GNUC_UNUSED VALUE self, VALUE filename) GdkPixbufFormat* format = gdk_pixbuf_get_file_info(RVAL2CSTR(filename), &width, &height); - return format ? rb_ary_new3(3, BOXED2RVAL(format, GDK_TYPE_PIXBUF_FORMAT), INT2NUM(width), INT2NUM(height)) : Qnil; + return format ? rb_ary_new3(3, GDKPIXBUFFORMAT2RVAL(format), INT2NUM(width), INT2NUM(height)) : Qnil; } #endif @@ -435,7 +435,7 @@ rg_scale(int argc, VALUE *argv, VALUE self) &interp_type); if (!NIL_P(interp_type)) - type = RVAL2GENUM(interp_type, GDK_TYPE_INTERP_TYPE); + type = RVAL2GDKINTERPTYPE(interp_type); dest = gdk_pixbuf_scale_simple(_SELF(self), NUM2INT(dest_width), @@ -462,7 +462,7 @@ rg_scale_bang(int argc, VALUE *argv, VALUE self) &scale_x, &scale_y, &interp_type); if (!NIL_P(interp_type)) - type = RVAL2GENUM(interp_type, GDK_TYPE_INTERP_TYPE); + type = RVAL2GDKINTERPTYPE(interp_type); gdk_pixbuf_scale(_SELF(src), _SELF(self), NUM2INT(src_x), NUM2INT(src_y), @@ -480,7 +480,7 @@ rg_composite(VALUE self, VALUE dest_width, VALUE dest_height, VALUE interp_type, GdkInterpType type = GDK_INTERP_BILINEAR; if (!NIL_P(interp_type)) - type = RVAL2GENUM(interp_type, GDK_TYPE_INTERP_TYPE); + type = RVAL2GDKINTERPTYPE(interp_type); dest = gdk_pixbuf_composite_color_simple( _SELF(self), NUM2INT(dest_width), NUM2INT(dest_height), @@ -511,7 +511,7 @@ rg_composite_bang(int argc, VALUE *argv, VALUE self) switch (argc) { case 11: if (!NIL_P(args[9])) - interp_type = RVAL2GENUM(args[9], GDK_TYPE_INTERP_TYPE); + interp_type = RVAL2GDKINTERPTYPE(args[9]); gdk_pixbuf_composite(_SELF(args[0]), _SELF(self), NUM2INT(args[1]), NUM2INT(args[2]), @@ -523,7 +523,7 @@ rg_composite_bang(int argc, VALUE *argv, VALUE self) break; case 16: if (!NIL_P(args[9])) - interp_type = RVAL2GENUM(args[9], GDK_TYPE_INTERP_TYPE); + interp_type = RVAL2GDKINTERPTYPE(args[9]); gdk_pixbuf_composite_color(_SELF(args[0]), _SELF(self), NUM2INT(args[1]), NUM2INT(args[2]), @@ -548,7 +548,7 @@ static VALUE rg_rotate(VALUE self, VALUE angle) { VALUE ret; - GdkPixbuf* dest = gdk_pixbuf_rotate_simple(_SELF(self), RVAL2GENUM(angle, GDK_TYPE_PIXBUF_ROTATION)); + GdkPixbuf* dest = gdk_pixbuf_rotate_simple(_SELF(self), RVAL2GDKPIXBUFROTATION(angle)); if (dest == NULL) return Qnil; ret = GOBJ2RVAL(dest); Modified: gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufanimation.c (+1 -1) =================================================================== --- gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufanimation.c 2011-12-30 01:52:15 +0900 (8945dd1) +++ gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufanimation.c 2011-12-30 02:02:20 +0900 (9d663f7) @@ -22,7 +22,7 @@ #include "rbgdk-pixbuf.h" #define RG_TARGET_NAMESPACE cPixbufAnimation -#define _SELF(s) (GDK_PIXBUF_ANIMATION(RVAL2GOBJ(s))) +#define _SELF(s) (RVAL2GDKPIXBUFANIMATION(s)) static VALUE rg_initialize(VALUE self, VALUE filename) Modified: gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufanimationiter.c (+1 -1) =================================================================== --- gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufanimationiter.c 2011-12-30 01:52:15 +0900 (fa03579) +++ gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufanimationiter.c 2011-12-30 02:02:20 +0900 (49b8985) @@ -22,7 +22,7 @@ #include "rbgdk-pixbuf.h" #define RG_TARGET_NAMESPACE cPixbufAnimationIter -#define RVAL2ITR(i) (GDK_PIXBUF_ANIMATION_ITER(RVAL2GOBJ(i))) +#define RVAL2ITR(i) (RVAL2GDKPIXBUFANIMATIONITER(i)) static VALUE rg_advance(int argc, VALUE *argv, VALUE self) Modified: gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.c (+1 -1) =================================================================== --- gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.c 2011-12-30 01:52:15 +0900 (1e63440) +++ gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.c 2011-12-30 02:02:20 +0900 (4e3191c) @@ -23,7 +23,7 @@ #if RBGDK_PIXBUF_CHECK_VERSION(2,8,0) #define RG_TARGET_NAMESPACE cPixbufSimpleAnim -#define _SELF(s) (GDK_PIXBUF_SIMPLE_ANIM(RVAL2GOBJ(s))) +#define _SELF(s) (RVAL2GDKPIXBUFSIMPLEANIM(s)) static VALUE rg_initialize(VALUE self, VALUE width, VALUE height, VALUE rate) Modified: gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixdata.c (+2 -2) =================================================================== --- gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixdata.c 2011-12-30 01:52:15 +0900 (80d6d34) +++ gdk_pixbuf2/ext/gdk_pixbuf2/rbgdk-pixdata.c 2011-12-30 02:02:20 +0900 (67f9985) @@ -23,8 +23,8 @@ #define GDK_TYPE_PIXDATA (gdk_pixdata_get_type()) #define RG_TARGET_NAMESPACE cPixdata -#define _SELF(s) ((GdkPixdata*)(RVAL2BOXED(s, GDK_TYPE_PIXDATA))) -#define PIXDATA2RVAL(pix) (BOXED2RVAL(pix, GDK_TYPE_PIXDATA)) +#define _SELF(s) ((GdkPixdata*)(RVAL2GDKPIXDATA(s))) +#define PIXDATA2RVAL(pix) (GDKPIXDATA2RVAL(pix)) static ID id_pixdata; |