gdk_pixbuf2 1.0.0 → 1.0.1

data/ChangeLog

@@ -1,3 +1,19 @@
+2011-09-16  Nikolai Weibull  <now@bitwi.se>
+
+	* lib/gdk_pixbuf2.rb: Remove unused variable.
+
+2011-09-12  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gdk_pixbuf2/*.c: Remove methods that implement methods already
+	implemented with properties.
+	* ext/gdk_pixbuf2/*.c: call StringValue before calling
+	RSTRING_PTR()/RSTRING_LEN().
+
+2011-09-09  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/gdk_pixbuf2/*.c: Fix all warnings generated with gcc 4.4.5.
+	* ext/gdk_pixbuf2/*.c: Fix all RVAL2CSTR calls.
+
 2011-02-05  Masaaki Aoyagi
 
 	* ext/gdk_pixbuf2/*.c: change to ANSI C style.

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

@@ -60,31 +60,33 @@ static VALUE
 loader_write(VALUE self, VALUE data)
 {
     GError *error = NULL;
-    gboolean res;
   
-    res = gdk_pixbuf_loader_write(_SELF(self), (const guchar*)RVAL2CSTR(data),
-                                  RSTRING_LEN(data), &error);
-    if (error)
+    StringValue(data);
+    if (!gdk_pixbuf_loader_write(_SELF(self),
+                                 (const guchar *)RSTRING_PTR(data),
+                                 RSTRING_LEN(data),
+                                 &error))
         RAISE_GERROR(error);
-    return CBOOL2RVAL(res);
+
+    return Qtrue;
 }
 
 static VALUE
 last_write(VALUE self, VALUE data)
 {
     GError *error = NULL;
-    gboolean res;
 
-    res = gdk_pixbuf_loader_write(_SELF(self), (const guchar*)RVAL2CSTR(data),
-                                  RSTRING_LEN(data), &error);
-    if (error)
+    StringValue(data);
+    if (!gdk_pixbuf_loader_write(_SELF(self),
+                                 (const guchar *)RSTRING_PTR(data),
+                                 RSTRING_LEN(data),
+                                 &error))
         RAISE_GERROR(error);
 
-    res = gdk_pixbuf_loader_close(_SELF(self), &error);
-    if (error)
+    if (!gdk_pixbuf_loader_close(_SELF(self), &error))
         RAISE_GERROR(error);
 
-    return CBOOL2RVAL(res);
+    return Qtrue;
 }
 
 #if RBGDK_PIXBUF_CHECK_VERSION(2,2,0)

data/ext/gdk_pixbuf2/rbgdk-pixbuf.c

@@ -29,30 +29,6 @@ static ID id_pixdata;
 
 /****************************************************/
 /* The GdkPixbuf Structure */
-static VALUE
-get_colorspace(VALUE self)
-{
-    return GENUM2RVAL(gdk_pixbuf_get_colorspace(_SELF(self)), GDK_TYPE_COLORSPACE);
-}
-
-static VALUE
-get_n_channels(VALUE self)
-{
-    return INT2FIX(gdk_pixbuf_get_n_channels(_SELF(self)));
-}
-
-static VALUE
-get_has_alpha(VALUE self)
-{
-    return CBOOL2RVAL(gdk_pixbuf_get_has_alpha(_SELF(self)));
-}
-
-static VALUE
-get_bits_per_sample(VALUE self)
-{
-    return INT2FIX(gdk_pixbuf_get_bits_per_sample(_SELF(self)));
-}
-
 static int
 pixels_size(GdkPixbuf *pixbuf)
 {
@@ -75,7 +51,7 @@ get_pixels(VALUE self)
     int size;
 
     size = pixels_size(pixbuf);
-    return rb_str_new((const char*)gdk_pixbuf_get_pixels(pixbuf), size);
+    return rb_str_new((const char *)gdk_pixbuf_get_pixels(pixbuf), size);
 }
 
 static VALUE
@@ -87,7 +63,7 @@ set_pixels(VALUE self, VALUE pixels)
 
     size = pixels_size(pixbuf);
 
-    Check_Type(pixels, T_STRING);
+    StringValue(pixels);
     arg_size = RSTRING_LEN(pixels);
     if (arg_size != size)
       rb_raise(rb_eRangeError,
@@ -99,25 +75,7 @@ set_pixels(VALUE self, VALUE pixels)
     memcpy(gdk_pixbuf_get_pixels(pixbuf),
            RSTRING_PTR(pixels), MIN(RSTRING_LEN(pixels), size));
 
-  return pixels;
-}
-
-static VALUE
-get_width(VALUE self)
-{
-    return INT2FIX(gdk_pixbuf_get_width(_SELF(self)));
-}
-
-static VALUE
-get_height(VALUE self)
-{
-    return INT2FIX(gdk_pixbuf_get_height(_SELF(self)));
-}
-
-static VALUE
-get_rowstride(VALUE self)
-{
-    return INT2FIX(gdk_pixbuf_get_rowstride(_SELF(self)));
+    return pixels;
 }
 
 static VALUE
@@ -252,17 +210,15 @@ initialize(int argc, VALUE *argv, VALUE self)
                 buf = gdk_pixbuf_new_from_file(RVAL2CSTR(arg1), &error);
             }
         } else if (TYPE(arg1) == T_ARRAY) {
-            int i;
-            gchar** data = ALLOCA_N(gchar*, RARRAY_LEN(arg1));
-            for (i=0; i < RARRAY_LEN(arg1); i++) {
-		data[i] = RVAL2CSTR(RARRAY_PTR(arg1)[i]);
-            }
-            buf = gdk_pixbuf_new_from_xpm_data((const gchar**)data);
-            if (buf == NULL){
+            const gchar **data = RVAL2STRV(arg1);
+            buf = gdk_pixbuf_new_from_xpm_data(data);
+            if (buf == NULL) {
                 rb_gc();
-                buf = gdk_pixbuf_new_from_xpm_data((const gchar**)data);
-                if (buf == NULL) NOMEM_ERROR(&error);
+                buf = gdk_pixbuf_new_from_xpm_data(data);
             }
+            g_free(data);
+            if (buf == NULL)
+                NOMEM_ERROR(&error);
         } else {
             rb_raise(rb_eArgError, "Wrong type of 1st argument or wrong number of arguments");
         }
@@ -302,7 +258,7 @@ get_file_info(VALUE self, VALUE filename)
 #endif
 
 static VALUE
-save_to(VALUE self, gchar *filename, gchar *type, VALUE options)
+save_to(VALUE self, const gchar *filename, const gchar *type, VALUE options)
 {
     VALUE result = self;
     GError *error = NULL;
@@ -328,10 +284,10 @@ save_to(VALUE self, gchar *filename, gchar *type, VALUE options)
                 const_key = rb_id2name(SYM2ID(key));
                 keys[i] = (gchar *)const_key;
             } else {
-                keys[i] = RVAL2CSTR(key);
+                keys[i] = (gchar *)RVAL2CSTR(key);
             }
             value = rb_funcall(RARRAY_PTR(RARRAY_PTR(ary)[i])[1], to_s, 0);
-            values[i] = RVAL2CSTR(value);
+            values[i] = (gchar *)RVAL2CSTR(value);
         }
         keys[len] = NULL;
         values[len] = NULL;
@@ -625,15 +581,8 @@ Init_gdk_pixbuf2()
     /* 
      * The GdkPixbuf Structure 
      */
-    rb_define_method(gdkPixbuf, "colorspace", get_colorspace, 0);
-    rb_define_method(gdkPixbuf, "n_channels", get_n_channels, 0);
-    rb_define_method(gdkPixbuf, "has_alpha?", get_has_alpha, 0);
-    rb_define_method(gdkPixbuf, "bits_per_sample", get_bits_per_sample, 0);
-    rb_define_method(gdkPixbuf, "pixels", get_pixels, 0);
+    G_REPLACE_GET_PROPERTY(gdkPixbuf, "pixels", get_pixels, 0);
     rb_define_method(gdkPixbuf, "pixels=", set_pixels, 1);
-    rb_define_method(gdkPixbuf, "width", get_width, 0);
-    rb_define_method(gdkPixbuf, "height", get_height, 0);
-    rb_define_method(gdkPixbuf, "rowstride", get_rowstride, 0);
     rb_define_method(gdkPixbuf, "get_option", get_option, 1);
 
     /* GdkPixbufError */

data/ext/gdk_pixbuf2/rbgdk-pixdata.c

@@ -65,7 +65,7 @@ static VALUE
 pixdata_serialize(VALUE self)
 {
     guint stream_length;
-    gint i;
+    guint i;
     guint8* ret = gdk_pixdata_serialize(_SELF(self), &stream_length);
     VALUE ary = rb_ary_new2(stream_length);
     for (i = 0; i < stream_length; i++) {

data/lib/gdk_pixbuf2.rb

@@ -5,7 +5,7 @@ vendor_dir = base_dir + "vendor" + "local"
 vendor_bin_dir = vendor_dir + "bin"
 GLib.prepend_environment_path(vendor_bin_dir)
 begin
-  major, minor, micro, = RUBY_VERSION.split(/\./)
+  major, minor, _ = RUBY_VERSION.split(/\./)
   require "#{major}.#{minor}/gdk_pixbuf2.so"
 rescue LoadError
   require "gdk_pixbuf2.so"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gdk_pixbuf2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - The Ruby-GNOME2 Proejct Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-13 00:00:00 Z
+date: 2011-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: glib2
@@ -25,12 +25,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 description: Ruby/GdkPixbuf2 is a Ruby binding of GdkPixbuf-2.x.