pango 1.0.0-x86-mingw32 → 1.0.1-x86-mingw32

data/ChangeLog

@@ -1,3 +1,17 @@
+2011-09-16  Nikolai Weibull  <now@bitwi.se>
+
+	* lib/pango.rb: Remove unused variable.
+
+2011-09-12  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/pango/*.c: Call StringValue() before calling
+	RSTRING_PTR()/RSTRING_LEN(); also use RSTRING_PTR() instead of
+	RVAL2CSTR() if StringValue() has already been called on the value.
+
+2011-09-09  Nikolai Weibull  <now@bitwi.se>
+
+	* ext/pango/*.c: Fix all RVAL2CSTR calls.
+
 2011-02-26  Kouhei Sutou  <kou@cozmixng.org>
 
 	* ext/pango/extconf.rb: remove needless add_distcleanfile.

data/ext/pango/rbpangoattribute.c

@@ -27,7 +27,7 @@ pango_get_attribute_klass(VALUE attr_type)
 {
     VALUE type = Qnil;
     if (TYPE(attr_type) == T_STRING){
-        char* strtype = RVAL2CSTR(attr_type);
+        const char *strtype = RVAL2CSTR(attr_type);
         if (strcmp(strtype, "Attribute") == 0){
             type = pattr;
         } else if (strcmp(strtype, "AttrString") == 0){

data/ext/pango/rbpangocoverage.c

@@ -75,7 +75,7 @@ static VALUE
 coverage_s_from_bytes(VALUE self, VALUE bytes)
 {
     StringValue(bytes);
-    return BOXED2RVAL(pango_coverage_from_bytes((guchar*)RVAL2CSTR(bytes), 
+    return BOXED2RVAL(pango_coverage_from_bytes((guchar *)RSTRING_PTR(bytes), 
                                                 RSTRING_LEN(bytes)),
                       PANGO_TYPE_COVERAGE);
 }

data/ext/pango/rbpangoglyphstring.c

@@ -66,7 +66,9 @@ rglyph_index_to_x(VALUE self, VALUE text, VALUE analysis, VALUE index, VALUE tra
     StringValue(text);
 
     pango_glyph_string_index_to_x(_SELF(self),
-                                  RVAL2CSTR(text),
+                                  /* NOTE: This is a bug in the signature of
+                                   * pango_glyph_string_index_to_x */
+                                  (char *)RSTRING_PTR(text),
                                   RSTRING_LEN(text),
                                   (PangoAnalysis*)RVAL2BOXED(analysis, PANGO_TYPE_ANALYSIS),
                                   NUM2INT(index), RVAL2CBOOL(trailing),
@@ -82,7 +84,10 @@ rglyph_x_to_index(VALUE self, VALUE text, VALUE analysis, VALUE x_pos)
 
     StringValue(text);
     pango_glyph_string_x_to_index(_SELF(self),
-                                  RVAL2CSTR(text), RSTRING_LEN(text),
+                                  /* NOTE: This is a bug in the signature of
+                                   * pango_glyph_string_index_to_x */
+                                  (char *)RSTRING_PTR(text),
+                                  RSTRING_LEN(text),
                                   (PangoAnalysis*)RVAL2BOXED(analysis, PANGO_TYPE_ANALYSIS),
                                   NUM2INT(x_pos),
                                   &index, &trailing);
@@ -92,9 +97,9 @@ rglyph_x_to_index(VALUE self, VALUE text, VALUE analysis, VALUE x_pos)
 static VALUE
 rglyph_get_logical_widgths(VALUE self, VALUE text, VALUE embedding_level)
 {
-    int* logical_widths = NULL;
+    int *logical_widths = NULL;
     int len, array_len, i;
-    char* gtext;
+    const char *gtext;
     VALUE ret;
 
     gtext = RVAL2CSTR(text);

data/ext/pango/rbpangoinits.c

@@ -32,7 +32,8 @@ extern void   Init_pangorenderer();
 extern void   Init_pango_script();
 extern void   Init_pango_script_iter();
 extern void   Init_pango_array();
-void Init_pango_inits()
+void
+Init_pango_inits()
 {
    Init_pango_analysis();
    Init_pango_attribute();

data/ext/pango/rbpangolayout.c

@@ -43,7 +43,10 @@ layout_context_changed(VALUE self)
 static VALUE
 layout_set_text(VALUE self, VALUE text)
 {
-    pango_layout_set_text(_SELF(self), RVAL2CSTR(text), RSTRING_LEN(text));
+    StringValue(text);
+
+    pango_layout_set_text(_SELF(self), RSTRING_PTR(text), RSTRING_LEN(text));
+
     return self;
 }
 
@@ -61,13 +64,15 @@ layout_set_markup(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "11", &markup, &accel_marker);
 
+    StringValue(markup);
+
     if (NIL_P(accel_marker)){
         pango_layout_set_markup(_SELF(self),
-                                RVAL2CSTR(markup),
+                                RSTRING_PTR(markup),
                                 RSTRING_LEN(markup));
     } else {
         pango_layout_set_markup_with_accel(_SELF(self),
-                                           RVAL2CSTR(markup),
+                                           RSTRING_PTR(markup),
                                            RSTRING_LEN(markup),
                                            NUM2CHR(accel_marker), &accel_char);
     }
@@ -77,7 +82,10 @@ layout_set_markup(int argc, VALUE *argv, VALUE self)
 static VALUE
 layout_set_markup_eq(VALUE self, VALUE markup)
 {
-    pango_layout_set_markup(_SELF(self), RVAL2CSTR(markup), RSTRING_LEN(markup));
+    StringValue(markup);
+
+    pango_layout_set_markup(_SELF(self), RSTRING_PTR(markup), RSTRING_LEN(markup));
+
     return markup;
 }
 

data/ext/pango/rbpangolayoutiter.c

@@ -15,20 +15,10 @@
 
 /**********************************/
 #ifndef HAVE_PANGO_LAYOUT_ITER_GET_TYPE
-static PangoLayoutIter*
+static PangoLayoutIter *
 layout_iter_copy(const PangoLayoutIter *ref)
 {
-#if PANGO_CHECK_VERSION(1,6,0)
-  PangoLayoutIter* new_ref;
-  g_return_val_if_fail (ref != NULL, NULL);
-  /* This may be broken on pango-1.2.x, but 
-     for backward compatibility. */
-  new_ref = g_new(PangoLayoutIter, 1);
-  *new_ref = *ref;
-  return new_ref;
-#else
-  return (PangoLayoutIter*)ref;
-#endif
+  return (PangoLayoutIter *)ref;
 }
 
 GType

data/ext/pango/rbpangomain.c

@@ -45,7 +45,7 @@ static VALUE
 rpango_find_base_dir(VALUE self, VALUE text)
 {
     StringValue(text);
-    return GENUM2RVAL(pango_find_base_dir(RVAL2CSTR(text), RSTRING_LEN(text)), 
+    return GENUM2RVAL(pango_find_base_dir(RSTRING_PTR(text), RSTRING_LEN(text)), 
                       PANGO_TYPE_DIRECTION);
 }
 #endif
@@ -55,19 +55,18 @@ rpango_break(VALUE self, VALUE text, VALUE analysis)
 {
     gint i, len;
     glong attrs_len;
-    PangoLogAttr* attrs;
-    gchar* gtext;
+    PangoLogAttr *attrs;
+    const gchar *gtext;
     VALUE ret;
 
-    StringValue(text);
+    gtext = StringValuePtr(text);
     len = RSTRING_LEN(text);
-    gtext = RVAL2CSTR(text);
     attrs_len = g_utf8_strlen(gtext, (gssize)len) + 1l;
     attrs = g_new0(PangoLogAttr, attrs_len);
 
-    pango_break((const gchar*)gtext, len,
-                        NIL_P(analysis) ? NULL : RVAL2BOXED(analysis, PANGO_TYPE_ANALYSIS),
-                        attrs, attrs_len);
+    pango_break(gtext, len,
+                NIL_P(analysis) ? NULL : RVAL2BOXED(analysis, PANGO_TYPE_ANALYSIS),
+                attrs, attrs_len);
 
     ret = rb_ary_new();
     for (i = 0; i < attrs_len; i++){
@@ -82,17 +81,16 @@ rpango_get_log_attrs(VALUE self, VALUE text, VALUE level, VALUE language)
 {
     gint i, len;
     glong attrs_len;
-    PangoLogAttr* attrs;
-    gchar* gtext;
+    PangoLogAttr *attrs;
+    const gchar *gtext;
     VALUE ret;
 
-    StringValue(text);
+    gtext = StringValuePtr(text);
     len = RSTRING_LEN(text);
-    gtext = RVAL2CSTR(text);
     attrs_len = g_utf8_strlen(gtext, (gssize)len) + 1l;
     attrs = g_new0(PangoLogAttr, attrs_len);
 
-    pango_get_log_attrs((const gchar*)gtext, len, NUM2INT(level),
+    pango_get_log_attrs(gtext, len, NUM2INT(level),
                         RVAL2BOXED(language, PANGO_TYPE_LANGUAGE),
                         attrs, attrs_len);
 
@@ -109,7 +107,8 @@ rpango_find_paragraph_boundary(VALUE self, VALUE text)
 {
     gint paragraph_delimiter_index, next_paragraph_start;
     
-    pango_find_paragraph_boundary(RVAL2CSTR(text), RSTRING_LEN(text),
+    StringValue(text);
+    pango_find_paragraph_boundary(RSTRING_PTR(text), RSTRING_LEN(text),
                                   &paragraph_delimiter_index,
                                   &next_paragraph_start);
     return rb_ary_new3(2, INT2NUM(paragraph_delimiter_index), 
@@ -131,7 +130,7 @@ rpango_shape(VALUE self, VALUE text, VALUE analysis)
     VALUE ret;
     PangoGlyphString* glyphs = pango_glyph_string_new();
     StringValue(text);
-    pango_shape(RVAL2CSTR(text), RSTRING_LEN(text), RVAL2BOXED(analysis, PANGO_TYPE_ANALYSIS), glyphs);
+    pango_shape(RSTRING_PTR(text), RSTRING_LEN(text), RVAL2BOXED(analysis, PANGO_TYPE_ANALYSIS), glyphs);
     ret = BOXED2RVAL(glyphs, PANGO_TYPE_GLYPH_STRING);
     pango_glyph_string_free (glyphs);
     return ret;
@@ -155,7 +154,8 @@ rpango_parse_markup(int argc, VALUE *argv, VALUE self)
 
     if (NIL_P(markup_text)) rb_raise(rb_eRuntimeError, "1st argument can't accept nil");
 
-    ret = pango_parse_markup(RVAL2CSTR(markup_text),
+    StringValue(markup_text);
+    ret = pango_parse_markup(RSTRING_PTR(markup_text),
                              RSTRING_LEN(markup_text),
                              NIL_P(accel_marker) ? 0 : NUM2CHR(accel_marker),
                              &pattr_list, &gtext, &accel_char, &error);

data/ext/pango/rbpangoscriptiter.c

@@ -48,7 +48,7 @@ rbpango_scriptiter_initialize(VALUE self, VALUE text)
     PangoScriptIter* iter;
 
     StringValue(text);
-    iter = pango_script_iter_new(RVAL2CSTR(text), RSTRING_LEN(text));
+    iter = pango_script_iter_new(RSTRING_PTR(text), RSTRING_LEN(text));
     G_INITIALIZE(self, iter);
     return Qnil;
 }

data/lib/pango.rb

@@ -22,7 +22,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}/pango.so"
 rescue LoadError
   require "pango.so"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pango
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: x86-mingw32
 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: cairo
@@ -41,12 +41,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: *id002
 description: Ruby/Pango is a Ruby binding of pango-1.x.