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

diff --git a/lib/ruby/gfx.c b/lib/ruby/gfx.c
index ae4b6d8..1ba0c1e 100644
--- a/lib/ruby/gfx.c
+++ b/lib/ruby/gfx.c
@@ -2,6 +2,7 @@
 #include "../gfxdevice.h"
 #include "../gfxsource.h"
 #include "../gfxtools.h"
+#include "../gfximage.h"
 #include "../devices/pdf.h"
 #include "../readers/swf.h"
 #include "../readers/image.h"
@@ -200,18 +201,34 @@ static VALUE image_height(VALUE cls)
     Get_Image(image,cls)
     return INT2FIX(image->image->height);
 }
+static VALUE image_rescale(VALUE cls, VALUE _width, VALUE _height)
+{
+    Get_Image(image,cls)
+    Check_Type(_width, T_FIXNUM);
+    Check_Type(_height, T_FIXNUM);
+    int width = FIX2INT(_width);
+    int height = FIX2INT(_height);
+    volatile VALUE v_image2 = image_allocate(Bitmap);
+    Get_Image(image2,v_image2)
+    image2->doc = image->doc;
+    image2->image = gfximage_rescale(image->image, width, height);
+    return v_image2;
+}
 static VALUE image_save_jpeg(VALUE cls, VALUE _filename, VALUE quality)
 {
     Get_Image(image,cls)
     Check_Type(_filename, T_STRING);
     Check_Type(quality, T_FIXNUM);
     const char*filename = StringValuePtr(_filename);
-    int l = strlen(filename);
-    char jpeg = 0;
-    if(l>=4 && !strcmp(&filename[l-4], ".jpg")) jpeg = 1;
-    if(l>=5 && !strcmp(&filename[l-5], ".jpeg")) jpeg = 1;
-    if(l>=4 && !strcmp(&filename[l-4], ".JPG")) jpeg = 1;
-    jpeg_save(image->image->data, image->image->width, image->image->height, FIX2INT(quality), filename);
+    gfximage_save_jpeg(image->image, FIX2INT(quality), filename);
+    return cls;
+}
+static VALUE image_save_png(VALUE cls, VALUE _filename)
+{
+    Get_Image(image,cls)
+    Check_Type(_filename, T_STRING);
+    const char*filename = StringValuePtr(_filename);
+    gfximage_save_png(image->image, filename);
     return cls;
 }
 VALUE convert_image(doc_internal_t*doc,gfximage_t*_image)
@@ -501,7 +518,7 @@ void rb_addfont(gfxdevice_t*dev, gfxfont_t*font)
     HEAD
 
     volatile VALUE f = font_is_cached(i, font);
-    if(!f) {f=convert_font(font);cache_font(i,font,v);}
+    if(!f) {f=convert_font(font);cache_font(i,font,f);}
 
     forward(v, id_addfont, 1, f);
 }
@@ -509,7 +526,7 @@ void rb_drawchar(gfxdevice_t*dev, gfxfont_t*font, int glyphnr, gfxcolor_t*color,
 {
     HEAD
     volatile VALUE f = font_is_cached(i, font);
-    if(!f) {f=convert_font(font);cache_font(i,font,v);}
+    if(!f) {f=convert_font(font);cache_font(i,font,f);}
 
     volatile VALUE v_color = convert_color(color);
     volatile VALUE v_matrix = convert_matrix(matrix);
@@ -561,11 +578,26 @@ static VALUE page_render(VALUE cls, VALUE device)
     dev.endpage = rb_endpage;
     dev.finish = rb_finish;
 
+    dev.startpage(&dev, page->page->width, page->page->height);
     page->page->render(page->page, &dev);
+    dev.endpage(&dev);
 
     return cls;
 }
 
+// ---------------------- global functions ----------------------------------
+
+VALUE gfx_setparameter(VALUE module, VALUE _key, VALUE _value)
+{
+    Check_Type(_key, T_STRING);
+    Check_Type(_value, T_STRING);
+    const char*key = StringValuePtr(_key);
+    const char*value = StringValuePtr(_value);
+    pdfdriver->setparameter(pdfdriver, key, value);
+    swfdriver->setparameter(swfdriver, key, value);
+    imagedriver->setparameter(imagedriver, key, value);
+    return GFX;
+}
 
 // --------------------------------------------------------------------------
 
@@ -578,6 +610,8 @@ void Init_gfx()
 
     GFX = rb_define_module("GFX");
     
+    rb_define_module_function(GFX, "setparameter", gfx_setparameter, 2);
+    
     DocumentPage = rb_define_class_under(GFX, "DocumentPage", rb_cObject);
     rb_define_method(DocumentPage, "width", page_width, 0);
     rb_define_method(DocumentPage, "height", page_height, 0);
@@ -591,6 +625,10 @@ void Init_gfx()
     
     Bitmap = rb_define_class_under(GFX, "Bitmap", rb_cObject);
     rb_define_method(Bitmap, "save_jpeg", image_save_jpeg, 2);
+    rb_define_method(Bitmap, "save_png", image_save_png, 1);
+    rb_define_method(Bitmap, "width", image_width, 0);
+    rb_define_method(Bitmap, "height", image_height, 0);
+    rb_define_method(Bitmap, "rescale", image_rescale, 2);
     
     Glyph = rb_define_class_under(GFX, "Glyph", rb_cObject);
     rb_define_method(Glyph, "polygon", glyph_polygon, 0);