Merge branch 'errorHandling'

lib/pngstream.js

@@ -37,8 +37,10 @@ var PNGStream = module.exports = function PNGStream(canvas) {
   var self = this;
   this.canvas = canvas;
   process.nextTick(function(){
-    canvas.streamPNG(function(chunk, len){
+    canvas.streamPNG(function(err, chunk, len){
-      if (len) {
+      if (err) {
+        self.emit('error', err);
+      } else if (len) {
         self.emit('data', chunk, len);
       } else {
         self.emit('end');

src/canvas.cc

@@ -61,14 +61,10 @@ Canvas::New(const Arguments &args) {
 static cairo_status_t
 writeToBuffer(void *c, const uint8_t *data, unsigned len) {
   closure_t *closure = (closure_t *) c;
-  Handle<Value> argv[2];
   Buffer *buf = Buffer::New(len);
   memcpy(buf->data(), data, len);
-  argv[0] = buf->handle_;
+  Handle<Value> argv[3] = { Null(), buf->handle_, Integer::New(len) };
-  argv[1] = Integer::New(len);
+  closure->fn->Call(Context::GetCurrent()->Global(), 3, argv);
-  closure->fn->Call(Context::GetCurrent()->Global(), 2, argv);
-  // TODO: CAIRO_STATUS_NO_MEMORY
-  // TODO: leak
   return CAIRO_STATUS_SUCCESS;
 }
 
@@ -79,18 +75,20 @@ writeToBuffer(void *c, const uint8_t *data, unsigned len) {
 Handle<Value>
 Canvas::StreamPNG(const Arguments &args) {
   HandleScope scope;
-  // TODO: error handling
+  // TODO: async
-  // TODO: nonblocking
   if (!args[0]->IsFunction())
     return ThrowException(Exception::TypeError(String::New("callback function required")));
   Canvas *canvas = ObjectWrap::Unwrap<Canvas>(args.This());
   closure_t closure;
   closure.fn = Handle<Function>::Cast(args[0]);
-  cairo_surface_write_to_png_stream(canvas->getSurface(), writeToBuffer, &closure);
+  cairo_status_t status = cairo_surface_write_to_png_stream(canvas->getSurface(), writeToBuffer, &closure);
-  Handle<Value> argv[2];
+  if (status) {
-  argv[0] = Null();
+    Handle<Value> argv[1] = { Canvas::Error(status) };
-  argv[1] = Integer::New(0);
+    closure.fn->Call(Context::GetCurrent()->Global(), 1, argv);
-  closure.fn->Call(Context::GetCurrent()->Global(), 2, argv);
+  } else {
+    Handle<Value> argv[3] = { Null(), Null(), Integer::New(0) };
+    closure.fn->Call(Context::GetCurrent()->Global(), 3, argv);
+  }
   return Undefined();
 }
 
@@ -110,6 +108,15 @@ Canvas::~Canvas() {
   cairo_surface_destroy(_surface);
 }
 
+/*
+ * Construct an Error from the given cairo status.
+ */
+
+Handle<Value>
+Canvas::Error(cairo_status_t status) {
+  return Exception::Error(String::New(cairo_status_to_string(status)));
+}
+
 /*
  * Save a PNG at the given path.
  */

src/canvas.h

@@ -52,6 +52,7 @@ class Canvas: public node::ObjectWrap {
     static Handle<Value> New(const Arguments &args);
     static Handle<Value> SavePNG(const Arguments &args);
     static Handle<Value> StreamPNG(const Arguments &args);
+    static Handle<Value> Error(cairo_status_t status);
     inline cairo_surface_t *getSurface(){ return _surface; }
     static void blur(cairo_surface_t *surface, int radius);
     Canvas(int width, int height);