X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fruby%2Fgfx.c;h=661d8efbcce7d5e31274514f638a1d8c4f1263c5;hb=9bcdd3d1665c7f85d2fc7472e45ebfbf89c65783;hp=1ba0c1e8046d0f4854d0b4a8904e938850bb1ed0;hpb=006f7afc9efc533175af7eba679998af948adfa3;p=swftools.git

diff --git a/lib/ruby/gfx.c b/lib/ruby/gfx.c
index 1ba0c1e..661d8ef 100644
--- a/lib/ruby/gfx.c
+++ b/lib/ruby/gfx.c
@@ -220,7 +220,7 @@ static VALUE image_save_jpeg(VALUE cls, VALUE _filename, VALUE quality)
     Check_Type(_filename, T_STRING);
     Check_Type(quality, T_FIXNUM);
     const char*filename = StringValuePtr(_filename);
-    gfximage_save_jpeg(image->image, FIX2INT(quality), filename);
+    gfximage_save_jpeg(image->image, filename, FIX2INT(quality));
     return cls;
 }
 static VALUE image_save_png(VALUE cls, VALUE _filename)
@@ -281,6 +281,16 @@ static VALUE glyph_advance(VALUE cls)
     return rb_float_new(glyph->font->font->glyphs[glyph->nr].advance);
 }
 
+static VALUE glyph_bbox(VALUE cls)
+{
+    Get_Glyph(glyph,cls);
+    gfxbbox_t bbox = gfxline_getbbox(glyph->font->font->glyphs[glyph->nr].line);
+    return rb_ary_new3(4, rb_float_new(bbox.xmin), 
+	                  rb_float_new(bbox.ymin), 
+			  rb_float_new(bbox.xmax), 
+			  rb_float_new(bbox.ymax));
+}
+
 static VALUE glyph_unicode(VALUE cls)
 {
     Get_Glyph(glyph,cls);
@@ -310,6 +320,18 @@ static VALUE font_allocate(VALUE cls)
     return v;
 }
 
+static VALUE font_ascent(VALUE cls)
+{
+    Get_Font(font,cls);
+    return rb_float_new(font->font->ascent);
+}
+
+static VALUE font_descent(VALUE cls)
+{
+    Get_Font(font,cls);
+    return rb_float_new(font->font->descent);
+}
+
 static VALUE font_name(VALUE cls)
 {
     Get_Font(font,cls);
@@ -634,9 +656,12 @@ void Init_gfx()
     rb_define_method(Glyph, "polygon", glyph_polygon, 0);
     rb_define_method(Glyph, "unicode", glyph_unicode, 0);
     rb_define_method(Glyph, "advance", glyph_advance, 0);
+    rb_define_method(Glyph, "bbox", glyph_bbox, 0);
     
     Font = rb_define_class_under(GFX, "Font", rb_cObject);
     rb_define_method(Font, "name", font_name, 0);
+    rb_define_method(Font, "ascent", font_ascent, 0);
+    rb_define_method(Font, "descent", font_descent, 0);
     rb_define_method(Font, "glyphs", font_glyphs, 0);
     
     Device = rb_define_class_under(GFX, "Device", rb_cObject);