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

diff --git a/lib/ruby/gfx.c b/lib/ruby/gfx.c
index 1ba0c1e..641388f 100644
--- a/lib/ruby/gfx.c
+++ b/lib/ruby/gfx.c
@@ -63,6 +63,9 @@ static VALUE doc_initialize(VALUE cls, VALUE _filename)
     const char*filename = StringValuePtr(_filename);
     doc->fontlist = gfxfontlist_create();
     doc->doc = pdfdriver->open(pdfdriver, filename);
+    if(!doc->doc) {
+	rb_raise(rb_eIOError, "couldn't open %s", filename);
+    }
     return cls;
 }
 
@@ -212,6 +215,9 @@ static VALUE image_rescale(VALUE cls, VALUE _width, VALUE _height)
     Get_Image(image2,v_image2)
     image2->doc = image->doc;
     image2->image = gfximage_rescale(image->image, width, height);
+    if(!image2->image) {
+	rb_raise(rb_eArgError, "Can't rescale to size %dx%d", width, height);
+    }
     return v_image2;
 }
 static VALUE image_save_jpeg(VALUE cls, VALUE _filename, VALUE quality)
@@ -220,7 +226,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 +287,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 +326,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);
@@ -322,6 +350,23 @@ static VALUE font_glyphs(VALUE cls)
     return font->glyph_array;
 }
 
+static VALUE font_kerning(VALUE cls)
+{
+    Get_Font(font,cls);
+    gfxkerning_t*kerning = font->font->kerning;
+    int kerning_size = font->font->kerning_size;
+    volatile VALUE a = rb_ary_new2(kerning_size);
+    int t;
+    for(t=0;t<kerning_size;t++) {
+	volatile VALUE tuple = rb_ary_new2(3);
+	rb_ary_store(tuple, 0, INT2FIX(kerning[t].c1));
+	rb_ary_store(tuple, 1, INT2FIX(kerning[t].c2));
+	rb_ary_store(tuple, 2, INT2FIX(kerning[t].advance));
+	rb_ary_store(a, t, tuple);
+    }
+    return a;
+}
+
 // ------------------------ gfx device --------------------------------------
 
 typedef struct device_internal {
@@ -634,10 +679,15 @@ 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);
+    rb_define_method(Font, "kerning", font_kerning, 0);
+    rb_define_method(Font, "get_kerning_table", font_kerning, 0);
     
     Device = rb_define_class_under(GFX, "Device", rb_cObject);
     rb_define_method(Device, "startpage", noop, -1);