gdk_pixbuf2 1.0.3 → 1.1.0

data/ext/gdk_pixbuf2/rbgdk-pixbuf.h

@@ -1,24 +1,33 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdk-pixbuf.h -
-
-  $Author: ggc $
-  $Date: 2005/09/23 22:02:07 $
-
-  Copyright (C) 2002-2004 Masao Mutoh
-************************************************/
-
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002-2004 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#ifndef __RBGDK_PIXBUF_H__
+#define __RBGDK_PIXBUF_H__
 
 #define GDK_PIXBUF_ENABLE_BACKEND
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gdk-pixdata.h>
 #include "rbgobject.h"
+#include "rbgdk-pixbuf2conversions.h"
 
-extern void Init_gdk_pixbuf_animation(VALUE mGLib);
-extern void Init_gdk_pixdata(VALUE mGLib);
-extern void Init_gdk_pixbuf_loader(VALUE mGLib);
-extern void Init_gdk_pixbuf_format(VALUE mGLib);
 extern GType gdk_pixbuf_format_get_type(void);
 
 #define RBGDK_PIXBUF_CHECK_VERSION(major,minor,micro)    \
@@ -27,8 +36,6 @@ extern GType gdk_pixbuf_format_get_type(void);
      (GDK_PIXBUF_MAJOR == (major) && GDK_PIXBUF_MINOR == (minor) && \
       GDK_PIXBUF_MICRO >= (micro)))
 
-#if RBGDK_PIXBUF_CHECK_VERSION(2,8,0)
-extern void Init_gdk_pixbuf_simpleanim(VALUE mGLib);
-#endif
-
 #define GDK_TYPE_PIXBUF_FORMAT (gdk_pixbuf_format_get_type())
+
+#endif /* __RBGDK_PIXBUF_H__ */

data/ext/gdk_pixbuf2/rbgdk-pixbuf2conversions.h

@@ -0,0 +1,42 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#ifndef __RBGDK_PIXBUF2CONVERSIONS_H__
+#define __RBGDK_PIXBUF2CONVERSIONS_H__
+
+#define RVAL2GDKPIXBUF(o)                  (GDK_PIXBUF(RVAL2GOBJ(o)))
+#define RVAL2GDKPIXBUFANIMATION(o)         (GDK_PIXBUF_ANIMATION(RVAL2GOBJ(o)))
+#define RVAL2GDKPIXBUFANIMATIONITER(o)     (GDK_PIXBUF_ANIMATION_ITER(RVAL2GOBJ(o)))
+#define RVAL2GDKPIXBUFLOADER(o)            (GDK_PIXBUF_LOADER(RVAL2GOBJ(o)))
+#define RVAL2GDKPIXBUFSIMPLEANIM(o)        (GDK_PIXBUF_SIMPLE_ANIM(RVAL2GOBJ(o)))
+
+#define RVAL2GDKPIXBUFFORMAT(o)            ((GdkPixbufFormat*)RVAL2BOXED(o, GDK_TYPE_PIXBUF_FORMAT))
+#define GDKPIXBUFFORMAT2RVAL(o)            (BOXED2RVAL(o, GDK_TYPE_PIXBUF_FORMAT))
+#define RVAL2GDKPIXDATA(o)                 ((GdkPixdata*)RVAL2BOXED(o, GDK_TYPE_PIXDATA))
+#define GDKPIXDATA2RVAL(o)                 (BOXED2RVAL(o, GDK_TYPE_PIXDATA))
+
+#define RVAL2GDKCOLORSPACE(o)              (RVAL2GENUM(o, GDK_TYPE_COLORSPACE))
+#define GDKCOLORSPACE2RVAL(o)              (GENUM2RVAL(o, GDK_TYPE_COLORSPACE))
+#define RVAL2GDKINTERPTYPE(o)              (RVAL2GENUM(o, GDK_TYPE_INTERP_TYPE))
+#define GDKINTERPTYPE2RVAL(o)              (GENUM2RVAL(o, GDK_TYPE_INTERP_TYPE))
+#define RVAL2GDKPIXBUFROTATION(o)          (RVAL2GENUM(o, GDK_TYPE_PIXBUF_ROTATION))
+#define GDKPIXBUFROTATION2RVAL(o)          (GENUM2RVAL(o, GDK_TYPE_PIXBUF_ROTATION))
+
+#endif /* __RBGDK_PIXBUF2CONVERSIONS_H__ */

data/ext/gdk_pixbuf2/rbgdk-pixbuf2private.h

@@ -0,0 +1,35 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#ifndef __RBGDK_PIXBUF2PRIVATE_H__
+#define __RBGDK_PIXBUF2PRIVATE_H__
+
+#include "rbgdk-pixbuf.h"
+
+G_GNUC_INTERNAL void Init_gdk_pixbuf_animation(VALUE mGLib);
+G_GNUC_INTERNAL void Init_gdk_pixbuf_animation_iter(VALUE mGLib);
+G_GNUC_INTERNAL void Init_gdk_pixbuf_format(VALUE mGLib);
+G_GNUC_INTERNAL void Init_gdk_pixbuf_loader(VALUE mGLib);
+#if RBGDK_PIXBUF_CHECK_VERSION(2,8,0)
+G_GNUC_INTERNAL void Init_gdk_pixbuf_simpleanim(VALUE mGLib);
+#endif
+G_GNUC_INTERNAL void Init_gdk_pixdata(VALUE mGLib);
+
+#endif /* __RBGDK_PIXBUF2PRIVATE_H__ */

data/ext/gdk_pixbuf2/rbgdk-pixbufanimation.c

@@ -1,20 +1,31 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdk-pixbufanimation.c -
-
-  $Author: mutoh $
-  $Date: 2004/11/30 16:23:13 $
-
-  Copyright (C) 2002,2003 Masao Mutoh
-************************************************/
-#include "rbgdk-pixbuf.h"
-
-#define _SELF(s) (GDK_PIXBUF_ANIMATION(RVAL2GOBJ(s)))
-#define RVAL2ITR(i) (GDK_PIXBUF_ANIMATION_ITER(RVAL2GOBJ(i)))
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbgdk-pixbuf2private.h"
+
+#define RG_TARGET_NAMESPACE cPixbufAnimation
+#define _SELF(s) (RVAL2GDKPIXBUFANIMATION(s))
 
 static VALUE
-animation_initialize(VALUE self, VALUE filename)
+rg_initialize(VALUE self, VALUE filename)
 {
     GdkPixbufAnimation* ret;
     GError* error = NULL;
@@ -28,103 +39,55 @@ animation_initialize(VALUE self, VALUE filename)
 }
 
 static VALUE
-animation_get_width(VALUE self)
+rg_width(VALUE self)
 {
     return INT2NUM(gdk_pixbuf_animation_get_width(_SELF(self)));
 }
 
 static VALUE
-animation_get_height(VALUE self)
+rg_height(VALUE self)
 {
     return INT2NUM(gdk_pixbuf_animation_get_height(_SELF(self)));
 }
 
 static VALUE
-animation_get_iter(int argc, VALUE *argv, VALUE self)
+rg_get_iter(int argc, VALUE *argv, VALUE self)
 {
     VALUE start_time_sec, start_time_usec;
-    GTimeVal* time = NULL;
+    GTimeVal start_time;
 
     rb_scan_args(argc, argv, "02", &start_time_sec, &start_time_usec);
 
-    if (! NIL_P(start_time_sec)){
-        time = g_new(GTimeVal, 1);
-        time->tv_sec = NUM2LONG(start_time_sec);
-        if (NIL_P(start_time_usec)){
-            time->tv_usec = 0;
-        } else {
-            time->tv_usec = NUM2LONG(start_time_usec);
-        }
-    }
-    return GOBJ2RVAL(gdk_pixbuf_animation_get_iter(_SELF(self), time)); 
-}
+    if (NIL_P(start_time_sec))
+        return GOBJ2RVAL(gdk_pixbuf_animation_get_iter(_SELF(self), NULL));
 
-static VALUE
-animation_is_static_image(VALUE self)
-{
-    return CBOOL2RVAL(gdk_pixbuf_animation_is_static_image(_SELF(self)));
-}
+    start_time.tv_sec = NUM2LONG(start_time_sec);
+    start_time.tv_usec = NIL_P(start_time_usec) ? 0 : NUM2LONG(start_time_usec);
 
-static VALUE
-animation_get_static_image(VALUE self)
-{
-    return GOBJ2RVAL(gdk_pixbuf_animation_get_static_image(_SELF(self)));
+    return GOBJ2RVAL(gdk_pixbuf_animation_get_iter(_SELF(self), &start_time));
 }
 
 static VALUE
-animation_iter_advance(int argc, VALUE *argv, VALUE self)
+rg_static_image_p(VALUE self)
 {
-    VALUE current_time_sec, current_time_usec;
-    GTimeVal* time = NULL;
-
-    rb_scan_args(argc, argv, "02", &current_time_sec, &current_time_usec);
-
-    if (! NIL_P(current_time_sec)){
-        time = g_new(GTimeVal, 1);
-        time->tv_sec = NUM2LONG(current_time_sec);
-        if (NIL_P(current_time_usec)){
-            time->tv_usec = 0;
-        } else {
-            time->tv_usec = NUM2LONG(current_time_usec);
-        }
-    }
-
-    return CBOOL2RVAL(gdk_pixbuf_animation_iter_advance(RVAL2ITR(self), time));
-}
-
-static VALUE
-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(VALUE self)
-{
-    return CBOOL2RVAL(gdk_pixbuf_animation_iter_on_currently_loading_frame(RVAL2ITR(self)));
+    return CBOOL2RVAL(gdk_pixbuf_animation_is_static_image(_SELF(self)));
 }
 
 static VALUE
-animation_iter_get_pixbuf(VALUE self)
+rg_static_image(VALUE self)
 {
-    return GOBJ2RVAL(gdk_pixbuf_animation_iter_get_pixbuf(RVAL2ITR(self)));
+    return GOBJ2RVAL(gdk_pixbuf_animation_get_static_image(_SELF(self)));
 }
 
 void
 Init_gdk_pixbuf_animation(VALUE mGdk)
 {
-    VALUE anim = G_DEF_CLASS(GDK_TYPE_PIXBUF_ANIMATION, "PixbufAnimation", mGdk);    
-    VALUE animiter = G_DEF_CLASS(GDK_TYPE_PIXBUF_ANIMATION_ITER, "PixbufAnimationIter", mGdk);    
-
-    rb_define_method(anim, "initialize", animation_initialize, 1);
-    rb_define_method(anim, "width", animation_get_width, 0);
-    rb_define_method(anim, "height", animation_get_height, 0);
-    rb_define_method(anim, "get_iter", animation_get_iter, -1);
-    rb_define_method(anim, "static_image?", animation_is_static_image, 0);
-    rb_define_method(anim, "static_image", animation_get_static_image, 0);
-    rb_define_method(animiter, "advance", animation_iter_advance, -1);
-    rb_define_method(animiter, "delay_time", animation_iter_get_delay_time, 0);
-    rb_define_method(animiter, "on_currently_loading_frame?", animation_iter_on_currently_loading_frame, 0);
-    rb_define_method(animiter, "pixbuf", animation_iter_get_pixbuf, 0);
-
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_PIXBUF_ANIMATION, "PixbufAnimation", mGdk);    
+
+    RG_DEF_METHOD(initialize, 1);
+    RG_DEF_METHOD(width, 0);
+    RG_DEF_METHOD(height, 0);
+    RG_DEF_METHOD(get_iter, -1);
+    RG_DEF_METHOD_P(static_image, 0);
+    RG_DEF_METHOD(static_image, 0);
 }

data/ext/gdk_pixbuf2/rbgdk-pixbufanimationiter.c

@@ -0,0 +1,71 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 Masao Mutoh
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbgdk-pixbuf2private.h"
+
+#define RG_TARGET_NAMESPACE cPixbufAnimationIter
+#define _SELF(i) (RVAL2GDKPIXBUFANIMATIONITER(i))
+
+static VALUE
+rg_advance(int argc, VALUE *argv, VALUE self)
+{
+    VALUE current_time_sec, current_time_usec;
+    GTimeVal current_time;
+
+    rb_scan_args(argc, argv, "02", &current_time_sec, &current_time_usec);
+
+    if (NIL_P(current_time_sec))
+        return CBOOL2RVAL(gdk_pixbuf_animation_iter_advance(_SELF(self), NULL));
+
+    current_time.tv_sec = NUM2LONG(current_time_sec);
+    current_time.tv_usec = NIL_P(current_time_usec) ? 0 : NUM2LONG(current_time_usec);
+
+    return CBOOL2RVAL(gdk_pixbuf_animation_iter_advance(_SELF(self), &current_time));
+}
+
+static VALUE
+rg_delay_time(VALUE self)
+{
+    return INT2NUM(gdk_pixbuf_animation_iter_get_delay_time(_SELF(self)));
+}
+
+static VALUE
+rg_on_currently_loading_frame_p(VALUE self)
+{
+    return CBOOL2RVAL(gdk_pixbuf_animation_iter_on_currently_loading_frame(_SELF(self)));
+}
+
+static VALUE
+rg_pixbuf(VALUE self)
+{
+    return GOBJ2RVAL(gdk_pixbuf_animation_iter_get_pixbuf(_SELF(self)));
+}
+
+void
+Init_gdk_pixbuf_animation_iter(VALUE mGdk)
+{
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_PIXBUF_ANIMATION_ITER, "PixbufAnimationIter", mGdk);    
+
+    RG_DEF_METHOD(advance, -1);
+    RG_DEF_METHOD(delay_time, 0);
+    RG_DEF_METHOD_P(on_currently_loading_frame, 0);
+    RG_DEF_METHOD(pixbuf, 0);
+}

data/ext/gdk_pixbuf2/rbgdk-pixbufsimpleanim.c

@@ -1,20 +1,32 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
-/************************************************
-
-  rbgdk-pixbufanimation.c -
-
-  $Author: ggc $
-  $Date: 2005/09/23 22:02:07 $
-
-  Copyright (C) 2002,2003 the ruby-gnome2 project
-************************************************/
-#include "rbgdk-pixbuf.h"
+/*
+ *  Copyright (C) 2011  Ruby-GNOME2 Project Team
+ *  Copyright (C) 2002,2003 the ruby-gnome2 project
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ *  MA  02110-1301  USA
+ */
+
+#include "rbgdk-pixbuf2private.h"
 
 #if RBGDK_PIXBUF_CHECK_VERSION(2,8,0)
-#define _SELF(s) (GDK_PIXBUF_SIMPLE_ANIM(RVAL2GOBJ(s)))
+#define RG_TARGET_NAMESPACE cPixbufSimpleAnim
+#define _SELF(s) (RVAL2GDKPIXBUFSIMPLEANIM(s))
 
 static VALUE
-simpleanim_initialize(VALUE self, VALUE width, VALUE height, VALUE rate)
+rg_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);
@@ -22,9 +34,9 @@ simpleanim_initialize(VALUE self, VALUE width, VALUE height, VALUE rate)
 }
 
 static VALUE
-simpleanim_add_frame(VALUE self, VALUE pixbuf)
+rg_add_frame(VALUE self, VALUE pixbuf)
 {
-    gdk_pixbuf_simple_anim_add_frame(_SELF(self), RVAL2GOBJ(pixbuf));
+    gdk_pixbuf_simple_anim_add_frame(_SELF(self), RVAL2GDKPIXBUF(pixbuf));
     return self;
 }
 #endif
@@ -33,9 +45,9 @@ void
 Init_gdk_pixbuf_simpleanim(VALUE mGdk)
 {
 #if RBGDK_PIXBUF_CHECK_VERSION(2,8,0)
-    VALUE anim = G_DEF_CLASS(GDK_TYPE_PIXBUF_SIMPLE_ANIM, "PixbufSimpleAnim", mGdk);    
+    VALUE RG_TARGET_NAMESPACE = G_DEF_CLASS(GDK_TYPE_PIXBUF_SIMPLE_ANIM, "PixbufSimpleAnim", mGdk);    
 
-    rb_define_method(anim, "initialize", simpleanim_initialize, 3);
-    rb_define_method(anim, "add_frame", simpleanim_add_frame, 1);
+    RG_DEF_METHOD(initialize, 3);
+    RG_DEF_METHOD(add_frame, 1);
 #endif
 }