From 81bc5d79a9eecea130d875b707cfdaa2261b0480 Mon Sep 17 00:00:00 2001
From: King Koopa <bbyholm@abo.fi>
Date: Mon, 29 Jul 2013 23:08:42 +0300
Subject: [PATCH] More cleanup.

---
 src/PNG.h |  8 ++------
 src/nan.h | 57 ++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/PNG.h b/src/PNG.h
index 2100f38..c3c2aa4 100644
--- a/src/PNG.h
+++ b/src/PNG.h
@@ -14,16 +14,13 @@
 #define unlikely(expr) (expr)
 #endif
 
-
-
 static void canvas_png_flush(png_structp png_ptr) {
-//    fprintf(stderr, "Pngtest_flush called");
     /* Do nothing; fflush() is said to be just a waste of energy. */
     (void) png_ptr;   /* Stifle compiler warning */
 }
 
 /* Converts native endian xRGB => RGBx bytes */
-static void canvas_convert_data_to_bytes (png_structp png, png_row_infop row_info, png_bytep data) {
+static void canvas_convert_data_to_bytes(png_structp png, png_row_infop row_info, png_bytep data) {
     unsigned int i;
 
     for (i = 0; i < row_info->rowbytes; i += 4) {
@@ -72,7 +69,6 @@ static cairo_status_t canvas_write_png(cairo_surface_t *surface, png_rw_ptr writ
     uint8_t *data;
     png_structp png;
     png_infop info;
-//    png_infop end_info;
     png_bytep *volatile rows = NULL;
     png_color_16 white;
     int png_color_type;
@@ -118,7 +114,7 @@ static cairo_status_t canvas_write_png(cairo_surface_t *surface, png_rw_ptr writ
     if (unlikely(info == NULL)) {
         status = CAIRO_STATUS_NO_MEMORY;
         png_destroy_write_struct(&png, &info);
-	free(rows);
+        free(rows);
         return status;
 
     }
diff --git a/src/nan.h b/src/nan.h
index fe37c76..411f4c2 100644
--- a/src/nan.h
+++ b/src/nan.h
@@ -3,24 +3,39 @@
  *
  * Copyright (c) 2013 NAN contributors:
  *   - Rod Vagg <https://github.com/rvagg>
- *   - King Koopa <https://github.com/kkoopa>
+ *   - Benjamin Byholm <https://github.com/kkoopa>
  *   - Trevor Norris <https://github.com/trevnorris>
  *
  * MIT +no-false-attribs License <https://github.com/rvagg/nan/blob/master/LICENSE>
  *
- * Version 0.2.0 (current Node unstable: 0.11.4)
+ * Version 0.2.0-wip (current Node unstable: 0.11.4)
  *
- * Changelog:
- *  * 0.2.0 .... TODO
+ * ChangeLog:
+ *  * 0.2.0 .... work in progress
+ *    - Added NAN_PROPERTY_GETTER, NAN_PROPERTY_SETTER, NAN_PROPERTY_ENUMERATOR,
+ *      NAN_PROPERTY_DELETER, NAN_PROPERTY_QUERY
+ *    - Extracted _NAN_METHOD_ARGS, _NAN_GETTER_ARGS, _NAN_SETTER_ARGS,
+ *      _NAN_PROPERTY_GETTER_ARGS, _NAN_PROPERTY_SETTER_ARGS,
+ *      _NAN_PROPERTY_ENUMERATOR_ARGS, _NAN_PROPERTY_DELETER_ARGS,
+ *      _NAN_PROPERTY_QUERY_ARGS
+ *    - Added NanGetInternalFieldPointer, NanSetInternalFieldPointer
+ *    - Added NAN_WEAK_CALLBACK, NAN_WEAK_CALLBACK_OBJECT,
+ *      NAN_WEAK_CALLBACK_DATA, NanMakeWeak
+ *    - Renamed THROW_ERROR to _NAN_THROW_ERROR
+ *    - Added NanNewBufferHandle(char*, size_t, node::smalloc::FreeCallback, void*)
+ *    - Added NanBufferUse(char*, uint32_t)
+ *    - Added NanNewContextHandle(v8::ExtensionConfiguration*,
+ *        v8::Handle<v8::ObjectTemplate>, v8::Handle<v8::Value>)
+ *    - Fixed broken NanCallback#GetFunction()
  *
  *  * 0.1.0 Jul 21 2013
- *           - Added `NAN_GETTER`, `NAN_SETTER`
- *           - Added `NanThrowError` with single Local<Value> argument
- *           - Added `NanNewBufferHandle` with single uint32_t argument
- *           - Added `NanHasInstance(Persistent<FunctionTemplate>&, Handle<Value>)`
- *           - Added `Local<Function> NanCallback#GetFunction()`
- *           - Added `NanCallback#Call(int, Local<Value>[])`
- *           - Deprecated `NanCallback#Run(int, Local<Value>[])` in favour of Call
+ *    - Added `NAN_GETTER`, `NAN_SETTER`
+ *    - Added `NanThrowError` with single Local<Value> argument
+ *    - Added `NanNewBufferHandle` with single uint32_t argument
+ *    - Added `NanHasInstance(Persistent<FunctionTemplate>&, Handle<Value>)`
+ *    - Added `Local<Function> NanCallback#GetFunction()`
+ *    - Added `NanCallback#Call(int, Local<Value>[])`
+ *    - Deprecated `NanCallback#Run(int, Local<Value>[])` in favour of Call
  *
  * See https://github.com/rvagg/nan for the latest update to this file
  **********************************************************************************/
@@ -302,7 +317,8 @@ static v8::Isolate* nan_isolate = v8::Isolate::GetCurrent();
       size_t length,
       node::Buffer::free_callback callback,
       void *hint) {
-    return v8::Local<v8::Object>::New(node::Buffer::New(data, length, callback, hint)->handle_);
+    return v8::Local<v8::Object>::New(
+        node::Buffer::New(data, length, callback, hint)->handle_);
   }
 
   static inline v8::Local<v8::Object> NanNewBufferHandle (
@@ -341,10 +357,13 @@ static v8::Isolate* nan_isolate = v8::Isolate::GetCurrent();
   }
 
   static inline v8::Local<v8::Context> NanNewContextHandle(
-    v8::ExtensionConfiguration* extensions = NULL,
-    v8::Handle<v8::ObjectTemplate> g_template = v8::Handle<v8::ObjectTemplate>(),
-    v8::Handle<v8::Value> g_object = v8::Handle<v8::Value>()) {
-      v8::Persistent<v8::Context> ctx = v8::Context::New(extensions, g_template, g_object);
+        v8::ExtensionConfiguration* extensions = NULL
+      , v8::Handle<v8::ObjectTemplate> g_template =
+            v8::Handle<v8::ObjectTemplate>()
+      , v8::Handle<v8::Value> g_object = v8::Handle<v8::Value>()
+    ) {
+      v8::Persistent<v8::Context> ctx =
+          v8::Context::New(extensions, g_template, g_object);
       v8::Local<v8::Context> lctx = v8::Local<v8::Context>::New(ctx);
       ctx.Dispose();
       return lctx;
@@ -366,9 +385,9 @@ class NanCallback {
    handle.Dispose();
   }
 
-  v8::Local<v8::Function> GetFunction () {
-    NanScope();
-    return NanPersistentToLocal(handle).As<v8::Function>();
+  inline v8::Local<v8::Function> GetFunction () {
+    return NanPersistentToLocal(handle)->Get(NanSymbol("callback"))
+        .As<v8::Function>();
   }
 
   // deprecated