lukechilds
/
node-canvas
mirror of https://github.com/lukechilds/node-canvas.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #409 from rvagg/nan-1.0.0 

NAN 1.0.0 for Node 0.11.13 support
v1.x
Juriy Zaytsev 11 years ago
parent
488aab1c0d 8158158abf
commit
dbdb9d854c
16 changed files with 149 additions and 149 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      package.json
  2. 70
      src/Canvas.cc
  3. 2
      src/Canvas.h
  4. 6
      src/CanvasGradient.cc
  5. 2
      src/CanvasGradient.h
  6. 4
      src/CanvasPattern.cc
  7. 2
      src/CanvasPattern.h
  8. 110
      src/CanvasRenderingContext2d.cc
  9. 8
      src/FontFace.cc
  10. 28
      src/Image.cc
  11. 2
      src/Image.h
  12. 8
      src/ImageData.cc
  13. 26
      src/JPEGStream.h
  14. 12
      src/PixelArray.cc
  15. 4
      src/closure.h
  16. 8
      src/init.cc

2
package.json
View File

@ -14,7 +14,7 @@
"test": "make test" "test": "make test"
} }
, "dependencies": { , "dependencies": {
"nan": "~0.7.0" "nan": "~1.0.0"
} }
, "devDependencies": { , "devDependencies": {
"express": "3.0" "express": "3.0"

70
src/Canvas.cc
View File

@ -30,8 +30,8 @@ Canvas::Initialize(Handle<Object> target) {
NanScope(); NanScope();
// Constructor // Constructor
Local<FunctionTemplate> ctor = FunctionTemplate::New(Canvas::New); Local<FunctionTemplate> ctor = NanNew<FunctionTemplate>(Canvas::New);
NanAssignPersistent(FunctionTemplate, constructor, ctor); NanAssignPersistent(constructor, ctor);
ctor->InstanceTemplate()->SetInternalFieldCount(1); ctor->InstanceTemplate()->SetInternalFieldCount(1);
ctor->SetClassName(NanSymbol("Canvas")); ctor->SetClassName(NanSymbol("Canvas"));
@ -46,13 +46,13 @@ Canvas::Initialize(Handle<Object> target) {
proto->SetAccessor(NanSymbol("width"), GetWidth, SetWidth); proto->SetAccessor(NanSymbol("width"), GetWidth, SetWidth);
proto->SetAccessor(NanSymbol("height"), GetHeight, SetHeight); proto->SetAccessor(NanSymbol("height"), GetHeight, SetHeight);
proto->Set("PNG_NO_FILTERS", Uint32::New(PNG_NO_FILTERS)); NanSetTemplate(proto, "PNG_NO_FILTERS", NanNew<Uint32>(PNG_NO_FILTERS));
proto->Set("PNG_FILTER_NONE", Uint32::New(PNG_FILTER_NONE)); NanSetTemplate(proto, "PNG_FILTER_NONE", NanNew<Uint32>(PNG_FILTER_NONE));
proto->Set("PNG_FILTER_SUB", Uint32::New(PNG_FILTER_SUB)); NanSetTemplate(proto, "PNG_FILTER_SUB", NanNew<Uint32>(PNG_FILTER_SUB));
proto->Set("PNG_FILTER_UP", Uint32::New(PNG_FILTER_UP)); NanSetTemplate(proto, "PNG_FILTER_UP", NanNew<Uint32>(PNG_FILTER_UP));
proto->Set("PNG_FILTER_AVG", Uint32::New(PNG_FILTER_AVG)); NanSetTemplate(proto, "PNG_FILTER_AVG", NanNew<Uint32>(PNG_FILTER_AVG));
proto->Set("PNG_FILTER_PAETH", Uint32::New(PNG_FILTER_PAETH)); NanSetTemplate(proto, "PNG_FILTER_PAETH", NanNew<Uint32>(PNG_FILTER_PAETH));
proto->Set("PNG_ALL_FILTERS", Uint32::New(PNG_ALL_FILTERS)); NanSetTemplate(proto, "PNG_ALL_FILTERS", NanNew<Uint32>(PNG_ALL_FILTERS));
target->Set(NanSymbol("Canvas"), ctor->GetFunction()); target->Set(NanSymbol("Canvas"), ctor->GetFunction());
} }
@ -67,7 +67,7 @@ NAN_METHOD(Canvas::New) {
canvas_type_t type = CANVAS_TYPE_IMAGE; canvas_type_t type = CANVAS_TYPE_IMAGE;
if (args[0]->IsNumber()) width = args[0]->Uint32Value(); if (args[0]->IsNumber()) width = args[0]->Uint32Value();
if (args[1]->IsNumber()) height = args[1]->Uint32Value(); if (args[1]->IsNumber()) height = args[1]->Uint32Value();
if (args[2]->IsString()) type = !strcmp("pdf", *String::AsciiValue(args[2])) if (args[2]->IsString()) type = !strcmp("pdf", *String::Utf8Value(args[2]))
? CANVAS_TYPE_PDF ? CANVAS_TYPE_PDF
: CANVAS_TYPE_IMAGE; : CANVAS_TYPE_IMAGE;
Canvas *canvas = new Canvas(width, height, type); Canvas *canvas = new Canvas(width, height, type);
@ -82,7 +82,7 @@ NAN_METHOD(Canvas::New) {
NAN_GETTER(Canvas::GetType) { NAN_GETTER(Canvas::GetType) {
NanScope(); NanScope();
Canvas *canvas = ObjectWrap::Unwrap<Canvas>(args.This()); Canvas *canvas = ObjectWrap::Unwrap<Canvas>(args.This());
NanReturnValue(String::New(canvas->isPDF() ? "pdf" : "image")); NanReturnValue(NanNew<String>(canvas->isPDF() ? "pdf" : "image"));
} }
/* /*
@ -92,7 +92,7 @@ NAN_GETTER(Canvas::GetType) {
NAN_GETTER(Canvas::GetWidth) { NAN_GETTER(Canvas::GetWidth) {
NanScope(); NanScope();
Canvas *canvas = ObjectWrap::Unwrap<Canvas>(args.This()); Canvas *canvas = ObjectWrap::Unwrap<Canvas>(args.This());
NanReturnValue(Number::New(canvas->width)); NanReturnValue(NanNew<Number>(canvas->width));
} }
/* /*
@ -115,7 +115,7 @@ NAN_SETTER(Canvas::SetWidth) {
NAN_GETTER(Canvas::GetHeight) { NAN_GETTER(Canvas::GetHeight) {
NanScope(); NanScope();
Canvas *canvas = ObjectWrap::Unwrap<Canvas>(args.This()); Canvas *canvas = ObjectWrap::Unwrap<Canvas>(args.This());
NanReturnValue(Number::New(canvas->height)); NanReturnValue(NanNew<Number>(canvas->height));
} }
/* /*
@ -211,7 +211,7 @@ Canvas::EIO_AfterToBuffer(eio_req *req) {
} else { } else {
Local<Object> buf = NanNewBufferHandle((char*)closure->data, closure->len); Local<Object> buf = NanNewBufferHandle((char*)closure->data, closure->len);
memcpy(Buffer::Data(buf), closure->data, closure->len); memcpy(Buffer::Data(buf), closure->data, closure->len);
Local<Value> argv[2] = { NanNewLocal<Value>(Null()), buf }; Local<Value> argv[2] = { NanNew(NanNull()), buf };
closure->pfn->Call(2, argv); closure->pfn->Call(2, argv);
} }
@ -246,13 +246,13 @@ NAN_METHOD(Canvas::ToBuffer) {
NanReturnValue(buf); NanReturnValue(buf);
} }
if (args.Length() > 1 && !(args[1]->StrictEquals(Undefined()) && args[2]->StrictEquals(Undefined()))) { if (args.Length() > 1 && !(args[1]->StrictEquals(NanUndefined()) && args[2]->StrictEquals(NanUndefined()))) {
if (!args[1]->StrictEquals(Undefined())) { if (!args[1]->StrictEquals(NanUndefined())) {
bool good = true; bool good = true;
if (args[1]->IsNumber()) { if (args[1]->IsNumber()) {
compression_level = args[1]->Uint32Value(); compression_level = args[1]->Uint32Value();
} else if (args[1]->IsString()) { } else if (args[1]->IsString()) {
if (args[1]->StrictEquals(String::New("0"))) { if (args[1]->StrictEquals(NanNew<String>("0"))) {
compression_level = 0; compression_level = 0;
} else { } else {
uint32_t tmp = args[1]->Uint32Value(); uint32_t tmp = args[1]->Uint32Value();
@ -275,7 +275,7 @@ NAN_METHOD(Canvas::ToBuffer) {
} }
} }
if (!args[2]->StrictEquals(Undefined())) { if (!args[2]->StrictEquals(NanUndefined())) {
if (args[2]->IsUint32()) { if (args[2]->IsUint32()) {
filter = args[2]->Uint32Value(); filter = args[2]->Uint32Value();
} else { } else {
@ -348,10 +348,10 @@ streamPNG(void *c, const uint8_t *data, unsigned len) {
closure_t *closure = (closure_t *) c; closure_t *closure = (closure_t *) c;
Local<Object> buf = NanNewBufferHandle((char *)data, len); Local<Object> buf = NanNewBufferHandle((char *)data, len);
Local<Value> argv[3] = { Local<Value> argv[3] = {
NanNewLocal<Value>(Null()) NanNew(NanNull())
, buf , buf
, Integer::New(len) }; , NanNew<Integer>(len) };
MakeCallback(Context::GetCurrent()->Global(), closure->fn, 3, argv); NanMakeCallback(NanGetCurrentContext()->Global(), closure->fn, 3, argv);
return CAIRO_STATUS_SUCCESS; return CAIRO_STATUS_SUCCESS;
} }
@ -367,13 +367,13 @@ NAN_METHOD(Canvas::StreamPNGSync) {
if (!args[0]->IsFunction()) if (!args[0]->IsFunction())
return NanThrowTypeError("callback function required"); return NanThrowTypeError("callback function required");
if (args.Length() > 1 && !(args[1]->StrictEquals(Undefined()) && args[2]->StrictEquals(Undefined()))) { if (args.Length() > 1 && !(args[1]->StrictEquals(NanUndefined()) && args[2]->StrictEquals(NanUndefined()))) {
if (!args[1]->StrictEquals(Undefined())) { if (!args[1]->StrictEquals(NanUndefined())) {
bool good = true; bool good = true;
if (args[1]->IsNumber()) { if (args[1]->IsNumber()) {
compression_level = args[1]->Uint32Value(); compression_level = args[1]->Uint32Value();
} else if (args[1]->IsString()) { } else if (args[1]->IsString()) {
if (args[1]->StrictEquals(String::New("0"))) { if (args[1]->StrictEquals(NanNew<String>("0"))) {
compression_level = 0; compression_level = 0;
} else { } else {
uint32_t tmp = args[1]->Uint32Value(); uint32_t tmp = args[1]->Uint32Value();
@ -396,7 +396,7 @@ NAN_METHOD(Canvas::StreamPNGSync) {
} }
} }
if (!args[2]->StrictEquals(Undefined())) { if (!args[2]->StrictEquals(NanUndefined())) {
if (args[2]->IsUint32()) { if (args[2]->IsUint32()) {
filter = args[1]->Uint32Value(); filter = args[1]->Uint32Value();
} else { } else {
@ -420,13 +420,13 @@ NAN_METHOD(Canvas::StreamPNGSync) {
NanReturnValue(try_catch.ReThrow()); NanReturnValue(try_catch.ReThrow());
} else if (status) { } else if (status) {
Local<Value> argv[1] = { Canvas::Error(status) }; Local<Value> argv[1] = { Canvas::Error(status) };
MakeCallback(Context::GetCurrent()->Global(), closure.fn, 1, argv); NanMakeCallback(NanGetCurrentContext()->Global(), closure.fn, 1, argv);
} else { } else {
Local<Value> argv[3] = { Local<Value> argv[3] = {
NanNewLocal<Value>(Null()) NanNew(NanNull())
, NanNewLocal<Value>(Null()) , NanNew(NanNull())
, Integer::New(0) }; , NanNew<Uint32>(0) };
MakeCallback(Context::GetCurrent()->Global(), closure.fn, 3, argv); NanMakeCallback(NanGetCurrentContext()->Global(), closure.fn, 1, argv);
} }
NanReturnUndefined(); NanReturnUndefined();
} }
@ -483,7 +483,7 @@ Canvas::Canvas(int w, int h, canvas_type_t t): ObjectWrap() {
} else { } else {
_surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h); _surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w, h);
assert(_surface); assert(_surface);
V8::AdjustAmountOfExternalAllocatedMemory(4 * w * h); NanAdjustExternalMemory(4 * w * h);
} }
} }
@ -501,7 +501,7 @@ Canvas::~Canvas() {
break; break;
case CANVAS_TYPE_IMAGE: case CANVAS_TYPE_IMAGE:
cairo_surface_destroy(_surface); cairo_surface_destroy(_surface);
V8::AdjustAmountOfExternalAllocatedMemory(-4 * width * height); NanAdjustExternalMemory(-4 * width * height);
break; break;
} }
} }
@ -522,10 +522,10 @@ Canvas::resurface(Handle<Object> canvas) {
int old_height = cairo_image_surface_get_height(_surface); int old_height = cairo_image_surface_get_height(_surface);
cairo_surface_destroy(_surface); cairo_surface_destroy(_surface);
_surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); _surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
V8::AdjustAmountOfExternalAllocatedMemory(4 * (width * height - old_width * old_height)); NanAdjustExternalMemory(4 * (width * height - old_width * old_height));
// Reset context // Reset context
Handle<Value> context = canvas->Get(String::New("context")); Handle<Value> context = canvas->Get(NanNew<String>("context"));
if (!context->IsUndefined()) { if (!context->IsUndefined()) {
Context2d *context2d = ObjectWrap::Unwrap<Context2d>(context->ToObject()); Context2d *context2d = ObjectWrap::Unwrap<Context2d>(context->ToObject());
cairo_t *prev = context2d->context(); cairo_t *prev = context2d->context();
@ -542,5 +542,5 @@ Canvas::resurface(Handle<Object> canvas) {
Local<Value> Local<Value>
Canvas::Error(cairo_status_t status) { Canvas::Error(cairo_status_t status) {
return Exception::Error(String::New(cairo_status_to_string(status))); return Exception::Error(NanNew<String>(cairo_status_to_string(status)));
} }

2
src/Canvas.h
View File

@ -19,7 +19,7 @@
#include <cairo/cairo.h> #include <cairo/cairo.h>
#endif #endif
#include "nan.h" #include <nan.h>
using namespace v8; using namespace v8;
using namespace node; using namespace node;

6
src/CanvasGradient.cc
View File

@ -20,8 +20,8 @@ Gradient::Initialize(Handle<Object> target) {
NanScope(); NanScope();
// Constructor // Constructor
Local<FunctionTemplate> ctor = FunctionTemplate::New(Gradient::New); Local<FunctionTemplate> ctor = NanNew<FunctionTemplate>(Gradient::New);
NanAssignPersistent(FunctionTemplate, constructor, ctor); NanAssignPersistent(constructor, ctor);
ctor->InstanceTemplate()->SetInternalFieldCount(1); ctor->InstanceTemplate()->SetInternalFieldCount(1);
ctor->SetClassName(NanSymbol("CanvasGradient")); ctor->SetClassName(NanSymbol("CanvasGradient"));
@ -77,7 +77,7 @@ NAN_METHOD(Gradient::AddColorStop) {
Gradient *grad = ObjectWrap::Unwrap<Gradient>(args.This()); Gradient *grad = ObjectWrap::Unwrap<Gradient>(args.This());
short ok; short ok;
String::AsciiValue str(args[1]); String::Utf8Value str(args[1]);
uint32_t rgba = rgba_from_string(*str, &ok); uint32_t rgba = rgba_from_string(*str, &ok);
if (ok) { if (ok) {

2
src/CanvasGradient.h
View File

@ -8,7 +8,7 @@
#ifndef __NODE_GRADIENT_H__ #ifndef __NODE_GRADIENT_H__
#define __NODE_GRADIENT_H__ #define __NODE_GRADIENT_H__
#include "nan.h" #include <nan.h>
#include "Canvas.h" #include "Canvas.h"
class Gradient: public node::ObjectWrap { class Gradient: public node::ObjectWrap {

4
src/CanvasPattern.cc
View File

@ -20,8 +20,8 @@ Pattern::Initialize(Handle<Object> target) {
NanScope(); NanScope();
// Constructor // Constructor
Local<FunctionTemplate> ctor = FunctionTemplate::New(Pattern::New); Local<FunctionTemplate> ctor = NanNew<FunctionTemplate>(Pattern::New);
NanAssignPersistent(FunctionTemplate, constructor, ctor); NanAssignPersistent(constructor, ctor);
ctor->InstanceTemplate()->SetInternalFieldCount(1); ctor->InstanceTemplate()->SetInternalFieldCount(1);
ctor->SetClassName(NanSymbol("CanvasPattern")); ctor->SetClassName(NanSymbol("CanvasPattern"));

2
src/CanvasPattern.h
View File

@ -8,7 +8,7 @@
#ifndef __NODE_PATTERN_H__ #ifndef __NODE_PATTERN_H__
#define __NODE_PATTERN_H__ #define __NODE_PATTERN_H__
#include "nan.h" #include <nan.h>
#include "Canvas.h" #include "Canvas.h"
class Pattern: public node::ObjectWrap { class Pattern: public node::ObjectWrap {

110
src/CanvasRenderingContext2d.cc
View File

@ -81,8 +81,8 @@ Context2d::Initialize(Handle<Object> target) {
NanScope(); NanScope();
// Constructor // Constructor
Local<FunctionTemplate> ctor = FunctionTemplate::New(Context2d::New); Local<FunctionTemplate> ctor = NanNew<FunctionTemplate>(Context2d::New);
NanAssignPersistent(FunctionTemplate, constructor, ctor); NanAssignPersistent(constructor, ctor);
ctor->InstanceTemplate()->SetInternalFieldCount(1); ctor->InstanceTemplate()->SetInternalFieldCount(1);
ctor->SetClassName(NanSymbol("CanvasRenderingContext2d")); ctor->SetClassName(NanSymbol("CanvasRenderingContext2d"));
@ -694,7 +694,7 @@ NAN_METHOD(Context2d::DrawImage) {
NAN_GETTER(Context2d::GetGlobalAlpha) { NAN_GETTER(Context2d::GetGlobalAlpha) {
NanScope(); NanScope();
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
NanReturnValue(Number::New(context->state->globalAlpha)); NanReturnValue(NanNew<Number>(context->state->globalAlpha));
} }
/* /*
@ -764,7 +764,7 @@ NAN_GETTER(Context2d::GetGlobalCompositeOperation) {
NAN_SETTER(Context2d::SetPatternQuality) { NAN_SETTER(Context2d::SetPatternQuality) {
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
String::AsciiValue quality(value->ToString()); String::Utf8Value quality(value->ToString());
if (0 == strcmp("fast", *quality)) { if (0 == strcmp("fast", *quality)) {
context->state->patternQuality = CAIRO_FILTER_FAST; context->state->patternQuality = CAIRO_FILTER_FAST;
} else if (0 == strcmp("good", *quality)) { } else if (0 == strcmp("good", *quality)) {
@ -803,7 +803,7 @@ NAN_GETTER(Context2d::GetPatternQuality) {
NAN_SETTER(Context2d::SetGlobalCompositeOperation) { NAN_SETTER(Context2d::SetGlobalCompositeOperation) {
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
cairo_t *ctx = context->context(); cairo_t *ctx = context->context();
String::AsciiValue type(value->ToString()); String::Utf8Value type(value->ToString());
if (0 == strcmp("xor", *type)) { if (0 == strcmp("xor", *type)) {
cairo_set_operator(ctx, CAIRO_OPERATOR_XOR); cairo_set_operator(ctx, CAIRO_OPERATOR_XOR);
} else if (0 == strcmp("source-atop", *type)) { } else if (0 == strcmp("source-atop", *type)) {
@ -878,7 +878,7 @@ NAN_SETTER(Context2d::SetGlobalCompositeOperation) {
NAN_GETTER(Context2d::GetShadowOffsetX) { NAN_GETTER(Context2d::GetShadowOffsetX) {
NanScope(); NanScope();
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
NanReturnValue(Number::New(context->state->shadowOffsetX)); NanReturnValue(NanNew<Number>(context->state->shadowOffsetX));
} }
/* /*
@ -897,7 +897,7 @@ NAN_SETTER(Context2d::SetShadowOffsetX) {
NAN_GETTER(Context2d::GetShadowOffsetY) { NAN_GETTER(Context2d::GetShadowOffsetY) {
NanScope(); NanScope();
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
NanReturnValue(Number::New(context->state->shadowOffsetY)); NanReturnValue(NanNew<Number>(context->state->shadowOffsetY));
} }
/* /*
@ -916,7 +916,7 @@ NAN_SETTER(Context2d::SetShadowOffsetY) {
NAN_GETTER(Context2d::GetShadowBlur) { NAN_GETTER(Context2d::GetShadowBlur) {
NanScope(); NanScope();
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
NanReturnValue(Number::New(context->state->shadowBlur)); NanReturnValue(NanNew<Number>(context->state->shadowBlur));
} }
/* /*
@ -953,7 +953,7 @@ NAN_GETTER(Context2d::GetAntiAlias) {
*/ */
NAN_SETTER(Context2d::SetAntiAlias) { NAN_SETTER(Context2d::SetAntiAlias) {
String::AsciiValue str(value->ToString()); String::Utf8Value str(value->ToString());
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
cairo_t *ctx = context->context(); cairo_t *ctx = context->context();
cairo_antialias_t a; cairo_antialias_t a;
@ -994,7 +994,7 @@ NAN_GETTER(Context2d::GetTextDrawingMode) {
*/ */
NAN_SETTER(Context2d::SetTextDrawingMode) { NAN_SETTER(Context2d::SetTextDrawingMode) {
String::AsciiValue str(value->ToString()); String::Utf8Value str(value->ToString());
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
if (0 == strcmp("path", *str)) { if (0 == strcmp("path", *str)) {
context->state->textDrawingMode = TEXT_DRAW_PATHS; context->state->textDrawingMode = TEXT_DRAW_PATHS;
@ -1026,7 +1026,7 @@ NAN_GETTER(Context2d::GetFilter) {
*/ */
NAN_SETTER(Context2d::SetFilter) { NAN_SETTER(Context2d::SetFilter) {
String::AsciiValue str(value->ToString()); String::Utf8Value str(value->ToString());
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
cairo_filter_t filter; cairo_filter_t filter;
if (0 == strcmp("fast", *str)) { if (0 == strcmp("fast", *str)) {
@ -1050,7 +1050,7 @@ NAN_SETTER(Context2d::SetFilter) {
NAN_GETTER(Context2d::GetMiterLimit) { NAN_GETTER(Context2d::GetMiterLimit) {
NanScope(); NanScope();
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
NanReturnValue(Number::New(cairo_get_miter_limit(context->context()))); NanReturnValue(NanNew<Number>(cairo_get_miter_limit(context->context())));
} }
/* /*
@ -1072,7 +1072,7 @@ NAN_SETTER(Context2d::SetMiterLimit) {
NAN_GETTER(Context2d::GetLineWidth) { NAN_GETTER(Context2d::GetLineWidth) {
NanScope(); NanScope();
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
NanReturnValue(Number::New(cairo_get_line_width(context->context()))); NanReturnValue(NanNew<Number>(cairo_get_line_width(context->context())));
} }
/* /*
@ -1110,7 +1110,7 @@ NAN_GETTER(Context2d::GetLineJoin) {
NAN_SETTER(Context2d::SetLineJoin) { NAN_SETTER(Context2d::SetLineJoin) {
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
cairo_t *ctx = context->context(); cairo_t *ctx = context->context();
String::AsciiValue type(value->ToString()); String::Utf8Value type(value->ToString());
if (0 == strcmp("round", *type)) { if (0 == strcmp("round", *type)) {
cairo_set_line_join(ctx, CAIRO_LINE_JOIN_ROUND); cairo_set_line_join(ctx, CAIRO_LINE_JOIN_ROUND);
} else if (0 == strcmp("bevel", *type)) { } else if (0 == strcmp("bevel", *type)) {
@ -1143,7 +1143,7 @@ NAN_GETTER(Context2d::GetLineCap) {
NAN_SETTER(Context2d::SetLineCap) { NAN_SETTER(Context2d::SetLineCap) {
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
cairo_t *ctx = context->context(); cairo_t *ctx = context->context();
String::AsciiValue type(value->ToString()); String::Utf8Value type(value->ToString());
if (0 == strcmp("round", *type)) { if (0 == strcmp("round", *type)) {
cairo_set_line_cap(ctx, CAIRO_LINE_CAP_ROUND); cairo_set_line_cap(ctx, CAIRO_LINE_CAP_ROUND);
} else if (0 == strcmp("square", *type)) { } else if (0 == strcmp("square", *type)) {
@ -1164,9 +1164,9 @@ NAN_METHOD(Context2d::IsPointInPath) {
cairo_t *ctx = context->context(); cairo_t *ctx = context->context();
double x = args[0]->NumberValue() double x = args[0]->NumberValue()
, y = args[1]->NumberValue(); , y = args[1]->NumberValue();
NanReturnValue(Boolean::New(cairo_in_fill(ctx, x, y) || cairo_in_stroke(ctx, x, y))); NanReturnValue(NanNew<Boolean>(cairo_in_fill(ctx, x, y) || cairo_in_stroke(ctx, x, y)));
} }
NanReturnValue(False()); NanReturnValue(NanFalse());
} }
/* /*
@ -1220,7 +1220,7 @@ NAN_METHOD(Context2d::SetStrokePattern) {
NAN_SETTER(Context2d::SetShadowColor) { NAN_SETTER(Context2d::SetShadowColor) {
short ok; short ok;
String::AsciiValue str(value->ToString()); String::Utf8Value str(value->ToString());
uint32_t rgba = rgba_from_string(*str, &ok); uint32_t rgba = rgba_from_string(*str, &ok);
if (ok) { if (ok) {
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
@ -1237,7 +1237,7 @@ NAN_GETTER(Context2d::GetShadowColor) {
char buf[64]; char buf[64];
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
rgba_to_string(context->state->shadow, buf, sizeof(buf)); rgba_to_string(context->state->shadow, buf, sizeof(buf));
NanReturnValue(String::New(buf)); NanReturnValue(NanNew<String>(buf));
} }
/* /*
@ -1248,7 +1248,7 @@ NAN_METHOD(Context2d::SetFillColor) {
NanScope(); NanScope();
short ok; short ok;
if (!args[0]->IsString()) NanReturnUndefined(); if (!args[0]->IsString()) NanReturnUndefined();
String::AsciiValue str(args[0]); String::Utf8Value str(args[0]);
uint32_t rgba = rgba_from_string(*str, &ok); uint32_t rgba = rgba_from_string(*str, &ok);
if (!ok) NanReturnUndefined(); if (!ok) NanReturnUndefined();
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
@ -1266,7 +1266,7 @@ NAN_GETTER(Context2d::GetFillColor) {
char buf[64]; char buf[64];
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
rgba_to_string(context->state->fill, buf, sizeof(buf)); rgba_to_string(context->state->fill, buf, sizeof(buf));
NanReturnValue(String::New(buf)); NanReturnValue(NanNew<String>(buf));
} }
/* /*
@ -1277,7 +1277,7 @@ NAN_METHOD(Context2d::SetStrokeColor) {
NanScope(); NanScope();
short ok; short ok;
if (!args[0]->IsString()) NanReturnUndefined(); if (!args[0]->IsString()) NanReturnUndefined();
String::AsciiValue str(args[0]); String::Utf8Value str(args[0]);
uint32_t rgba = rgba_from_string(*str, &ok); uint32_t rgba = rgba_from_string(*str, &ok);
if (!ok) NanReturnUndefined(); if (!ok) NanReturnUndefined();
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
@ -1295,7 +1295,7 @@ NAN_GETTER(Context2d::GetStrokeColor) {
char buf[64]; char buf[64];
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
rgba_to_string(context->state->stroke, buf, sizeof(buf)); rgba_to_string(context->state->stroke, buf, sizeof(buf));
NanReturnValue(String::New(buf)); NanReturnValue(NanNew<String>(buf));
} }
/* /*
@ -1763,11 +1763,11 @@ NAN_METHOD(Context2d::SetFont) {
|| !args[3]->IsString() || !args[3]->IsString()
|| !args[4]->IsString()) NanReturnUndefined(); || !args[4]->IsString()) NanReturnUndefined();
String::AsciiValue weight(args[0]); String::Utf8Value weight(args[0]);
String::AsciiValue style(args[1]); String::Utf8Value style(args[1]);
double size = args[2]->NumberValue(); double size = args[2]->NumberValue();
String::AsciiValue unit(args[3]); String::Utf8Value unit(args[3]);
String::AsciiValue family(args[4]); String::Utf8Value family(args[4]);
Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This()); Context2d *context = ObjectWrap::Unwrap<Context2d>(args.This());
@ -1876,7 +1876,7 @@ NAN_METHOD(Context2d::MeasureText) {
cairo_t *ctx = context->context(); cairo_t *ctx = context->context();
String::Utf8Value str(args[0]->ToString()); String::Utf8Value str(args[0]->ToString());
Local<Object> obj = Object::New(); Local<Object> obj = NanNew<Object>();
#if HAVE_PANGO #if HAVE_PANGO
@ -1917,21 +1917,21 @@ NAN_METHOD(Context2d::MeasureText) {
y_offset = 0.0; y_offset = 0.0;
} }
obj->Set(String::New("width"), Number::New(logical_rect.width)); obj->Set(NanNew<String>("width"), NanNew<Number>(logical_rect.width));
obj->Set(String::New("actualBoundingBoxLeft"), obj->Set(NanNew<String>("actualBoundingBoxLeft"),
Number::New(x_offset - PANGO_LBEARING(logical_rect))); NanNew<Number>(x_offset - PANGO_LBEARING(logical_rect)));
obj->Set(String::New("actualBoundingBoxRight"), obj->Set(NanNew<String>("actualBoundingBoxRight"),
Number::New(x_offset + PANGO_RBEARING(logical_rect))); NanNew<Number>(x_offset + PANGO_RBEARING(logical_rect)));
obj->Set(String::New("actualBoundingBoxAscent"), obj->Set(NanNew<String>("actualBoundingBoxAscent"),
Number::New(-(y_offset+ink_rect.y))); NanNew<Number>(-(y_offset+ink_rect.y)));
obj->Set(String::New("actualBoundingBoxDescent"), obj->Set(NanNew<String>("actualBoundingBoxDescent"),
Number::New((PANGO_DESCENT(ink_rect) + y_offset))); NanNew<Number>((PANGO_DESCENT(ink_rect) + y_offset)));
obj->Set(String::New("emHeightAscent"), obj->Set(NanNew<String>("emHeightAscent"),
Number::New(PANGO_ASCENT(logical_rect) - y_offset)); NanNew<Number>(PANGO_ASCENT(logical_rect) - y_offset));
obj->Set(String::New("emHeightDescent"), obj->Set(NanNew<String>("emHeightDescent"),
Number::New(PANGO_DESCENT(logical_rect) + y_offset)); NanNew<Number>(PANGO_DESCENT(logical_rect) + y_offset));
obj->Set(String::New("alphabeticBaseline"), obj->Set(NanNew<String>("alphabeticBaseline"),
Number::New((pango_font_metrics_get_ascent(metrics) / PANGO_SCALE) NanNew<Number>((pango_font_metrics_get_ascent(metrics) / PANGO_SCALE)
+ y_offset)); + y_offset));
pango_font_metrics_unref(metrics); pango_font_metrics_unref(metrics);
@ -1972,18 +1972,18 @@ NAN_METHOD(Context2d::MeasureText) {
y_offset = 0.0; y_offset = 0.0;
} }
obj->Set(String::New("width"), Number::New(te.x_advance)); obj->Set(NanNew<String>("width"), NanNew<Number>(te.x_advance));
obj->Set(String::New("actualBoundingBoxLeft"), obj->Set(NanNew<String>("actualBoundingBoxLeft"),
Number::New(x_offset - te.x_bearing)); NanNew<Number>(x_offset - te.x_bearing));
obj->Set(String::New("actualBoundingBoxRight"), obj->Set(NanNew<String>("actualBoundingBoxRight"),
Number::New((te.x_bearing + te.width) - x_offset)); NanNew<Number>((te.x_bearing + te.width) - x_offset));
obj->Set(String::New("actualBoundingBoxAscent"), obj->Set(NanNew<String>("actualBoundingBoxAscent"),
Number::New(-(te.y_bearing + y_offset))); NanNew<Number>(-(te.y_bearing + y_offset)));
obj->Set(String::New("actualBoundingBoxDescent"), obj->Set(NanNew<String>("actualBoundingBoxDescent"),
Number::New(te.height + te.y_bearing + y_offset)); NanNew<Number>(te.height + te.y_bearing + y_offset));
obj->Set(String::New("emHeightAscent"), Number::New(fe.ascent - y_offset)); obj->Set(NanNew<String>("emHeightAscent"), NanNew<Number>(fe.ascent - y_offset));
obj->Set(String::New("emHeightDescent"), Number::New(fe.descent + y_offset)); obj->Set(NanNew<String>("emHeightDescent"), NanNew<Number>(fe.descent + y_offset));
obj->Set(String::New("alphabeticBaseline"), Number::New(y_offset)); obj->Set(NanNew<String>("alphabeticBaseline"), NanNew<Number>(y_offset));
#endif #endif

8
src/FontFace.cc
View File

@ -6,7 +6,7 @@
#include "FontFace.h" #include "FontFace.h"
#include "nan.h" #include <nan.h>
Persistent<FunctionTemplate> FontFace::constructor; Persistent<FunctionTemplate> FontFace::constructor;
@ -30,8 +30,8 @@ FontFace::Initialize(Handle<Object> target) {
NanScope(); NanScope();
// Constructor // Constructor
Local<FunctionTemplate> ctor = FunctionTemplate::New(FontFace::New); Local<FunctionTemplate> ctor = NanNew<FunctionTemplate>(FontFace::New);
NanAssignPersistent(FunctionTemplate, constructor, ctor); NanAssignPersistent(constructor, ctor);
ctor->InstanceTemplate()->SetInternalFieldCount(1); ctor->InstanceTemplate()->SetInternalFieldCount(1);
ctor->SetClassName(NanSymbol("FontFace")); ctor->SetClassName(NanSymbol("FontFace"));
@ -60,7 +60,7 @@ NAN_METHOD(FontFace::New) {
return NanThrowError("Wrong argument types passed to FontFace constructor"); return NanThrowError("Wrong argument types passed to FontFace constructor");
} }
String::AsciiValue filePath(args[0]); String::Utf8Value filePath(args[0]);
int faceIdx = int(args[1]->NumberValue()); int faceIdx = int(args[1]->NumberValue());
FT_Face ftFace; FT_Face ftFace;

28
src/Image.cc
View File

@ -38,8 +38,8 @@ void
Image::Initialize(Handle<Object> target) { Image::Initialize(Handle<Object> target) {
NanScope(); NanScope();
Local<FunctionTemplate> ctor = FunctionTemplate::New(Image::New); Local<FunctionTemplate> ctor = NanNew<FunctionTemplate>(Image::New);
NanAssignPersistent(FunctionTemplate, constructor, ctor); NanAssignPersistent(constructor, ctor);
ctor->InstanceTemplate()->SetInternalFieldCount(1); ctor->InstanceTemplate()->SetInternalFieldCount(1);
ctor->SetClassName(NanSymbol("Image")); ctor->SetClassName(NanSymbol("Image"));
@ -56,8 +56,8 @@ Image::Initialize(Handle<Object> target) {
proto->SetAccessor(NanSymbol("onerror"), GetOnerror, SetOnerror); proto->SetAccessor(NanSymbol("onerror"), GetOnerror, SetOnerror);
#if CAIRO_VERSION_MINOR >= 10 #if CAIRO_VERSION_MINOR >= 10
proto->SetAccessor(NanSymbol("dataMode"), GetDataMode, SetDataMode); proto->SetAccessor(NanSymbol("dataMode"), GetDataMode, SetDataMode);
ctor->Set(NanSymbol("MODE_IMAGE"), Number::New(DATA_IMAGE)); ctor->Set(NanSymbol("MODE_IMAGE"), NanNew<Number>(DATA_IMAGE));
ctor->Set(NanSymbol("MODE_MIME"), Number::New(DATA_MIME)); ctor->Set(NanSymbol("MODE_MIME"), NanNew<Number>(DATA_MIME));
#endif #endif
target->Set(NanSymbol("Image"), ctor->GetFunction()); target->Set(NanSymbol("Image"), ctor->GetFunction());
} }
@ -81,7 +81,7 @@ NAN_METHOD(Image::New) {
NAN_GETTER(Image::GetComplete) { NAN_GETTER(Image::GetComplete) {
NanScope(); NanScope();
Image *img = ObjectWrap::Unwrap<Image>(args.This()); Image *img = ObjectWrap::Unwrap<Image>(args.This());
NanReturnValue(Boolean::New(Image::COMPLETE == img->state)); NanReturnValue(NanNew<Boolean>(Image::COMPLETE == img->state));
} }
#if CAIRO_VERSION_MINOR >= 10 #if CAIRO_VERSION_MINOR >= 10
@ -93,7 +93,7 @@ NAN_GETTER(Image::GetComplete) {
NAN_GETTER(Image::GetDataMode) { NAN_GETTER(Image::GetDataMode) {
NanScope(); NanScope();
Image *img = ObjectWrap::Unwrap<Image>(args.This()); Image *img = ObjectWrap::Unwrap<Image>(args.This());
NanReturnValue(Number::New(img->data_mode)); NanReturnValue(NanNew<Number>(img->data_mode));
} }
/* /*
@ -117,7 +117,7 @@ NAN_SETTER(Image::SetDataMode) {
NAN_GETTER(Image::GetWidth) { NAN_GETTER(Image::GetWidth) {
NanScope(); NanScope();
Image *img = ObjectWrap::Unwrap<Image>(args.This()); Image *img = ObjectWrap::Unwrap<Image>(args.This());
NanReturnValue(Number::New(img->width)); NanReturnValue(NanNew<Number>(img->width));
} }
/* /*
* Get height. * Get height.
@ -126,7 +126,7 @@ NAN_GETTER(Image::GetWidth) {
NAN_GETTER(Image::GetHeight) { NAN_GETTER(Image::GetHeight) {
NanScope(); NanScope();
Image *img = ObjectWrap::Unwrap<Image>(args.This()); Image *img = ObjectWrap::Unwrap<Image>(args.This());
NanReturnValue(Number::New(img->height)); NanReturnValue(NanNew<Number>(img->height));
} }
/* /*
@ -136,7 +136,7 @@ NAN_GETTER(Image::GetHeight) {
NAN_GETTER(Image::GetSource) { NAN_GETTER(Image::GetSource) {
NanScope(); NanScope();
Image *img = ObjectWrap::Unwrap<Image>(args.This()); Image *img = ObjectWrap::Unwrap<Image>(args.This());
NanReturnValue(String::New(img->filename ? img->filename : "")); NanReturnValue(NanNew<String>(img->filename ? img->filename : ""));
} }
/* /*
@ -147,7 +147,7 @@ void
Image::clearData() { Image::clearData() {
if (_surface) { if (_surface) {
cairo_surface_destroy(_surface); cairo_surface_destroy(_surface);
V8::AdjustAmountOfExternalAllocatedMemory(-_data_len); NanAdjustExternalMemory(-_data_len);
_data_len = 0; _data_len = 0;
_surface = NULL; _surface = NULL;
} }
@ -175,7 +175,7 @@ NAN_SETTER(Image::SetSource) {
// url string // url string
if (value->IsString()) { if (value->IsString()) {
String::AsciiValue src(value); String::Utf8Value src(value);
if (img->filename) free(img->filename); if (img->filename) free(img->filename);
img->filename = strdup(*src); img->filename = strdup(*src);
status = img->load(); status = img->load();
@ -359,7 +359,7 @@ Image::loaded() {
width = cairo_image_surface_get_width(_surface); width = cairo_image_surface_get_width(_surface);
height = cairo_image_surface_get_height(_surface); height = cairo_image_surface_get_height(_surface);
_data_len = height * cairo_image_surface_get_stride(_surface); _data_len = height * cairo_image_surface_get_stride(_surface);
V8::AdjustAmountOfExternalAllocatedMemory(_data_len); NanAdjustExternalMemory(_data_len);
if (onload != NULL) { if (onload != NULL) {
onload->Call(0, NULL); onload->Call(0, NULL);
@ -807,7 +807,7 @@ Image::decodeJPEGBufferIntoMimeSurface(uint8_t *buf, unsigned len) {
void void
clearMimeData(void *closure) { clearMimeData(void *closure) {
V8::AdjustAmountOfExternalAllocatedMemory(-((read_closure_t *)closure)->len); NanAdjustExternalMemory(-((read_closure_t *)closure)->len);
free(((read_closure_t *) closure)->buf); free(((read_closure_t *) closure)->buf);
free(closure); free(closure);
} }
@ -834,7 +834,7 @@ Image::assignDataAsMime(uint8_t *data, int len, const char *mime_type) {
mime_closure->buf = mime_data; mime_closure->buf = mime_data;
mime_closure->len = len; mime_closure->len = len;
V8::AdjustAmountOfExternalAllocatedMemory(len); NanAdjustExternalMemory(len);
return cairo_surface_set_mime_data(_surface return cairo_surface_set_mime_data(_surface
, mime_type , mime_type

2
src/Image.h
View File

@ -8,7 +8,7 @@
#ifndef __NODE_IMAGE_H__ #ifndef __NODE_IMAGE_H__
#define __NODE_IMAGE_H__ #define __NODE_IMAGE_H__
#include "nan.h" #include <nan.h>
#include "Canvas.h" #include "Canvas.h"
#ifdef HAVE_JPEG #ifdef HAVE_JPEG

8
src/ImageData.cc
View File

@ -18,8 +18,8 @@ ImageData::Initialize(Handle<Object> target) {
NanScope(); NanScope();
// Constructor // Constructor
Local<FunctionTemplate> ctor = FunctionTemplate::New(ImageData::New); Local<FunctionTemplate> ctor = NanNew<FunctionTemplate>(ImageData::New);
NanAssignPersistent(FunctionTemplate, constructor, ctor); NanAssignPersistent(constructor, ctor);
ctor->InstanceTemplate()->SetInternalFieldCount(1); ctor->InstanceTemplate()->SetInternalFieldCount(1);
ctor->SetClassName(NanSymbol("ImageData")); ctor->SetClassName(NanSymbol("ImageData"));
@ -55,7 +55,7 @@ NAN_METHOD(ImageData::New) {
NAN_GETTER(ImageData::GetWidth) { NAN_GETTER(ImageData::GetWidth) {
NanScope(); NanScope();
ImageData *imageData = ObjectWrap::Unwrap<ImageData>(args.This()); ImageData *imageData = ObjectWrap::Unwrap<ImageData>(args.This());
NanReturnValue(Number::New(imageData->pixelArray()->width())); NanReturnValue(NanNew<Number>(imageData->pixelArray()->width()));
} }
/* /*
@ -65,5 +65,5 @@ NAN_GETTER(ImageData::GetWidth) {
NAN_GETTER(ImageData::GetHeight) { NAN_GETTER(ImageData::GetHeight) {
NanScope(); NanScope();
ImageData *imageData = ObjectWrap::Unwrap<ImageData>(args.This()); ImageData *imageData = ObjectWrap::Unwrap<ImageData>(args.This());
NanReturnValue(Number::New(imageData->pixelArray()->height())); NanReturnValue(NanNew<Number>(imageData->pixelArray()->height()));
} }

26
src/JPEGStream.h
View File

@ -6,7 +6,7 @@
#ifndef __NODE_JPEG_STREAM_H__ #ifndef __NODE_JPEG_STREAM_H__
#define __NODE_JPEG_STREAM_H__ #define __NODE_JPEG_STREAM_H__
#include "nan.h" #include <nan.h>
#include "Canvas.h" #include "Canvas.h"
#include <jpeglib.h> #include <jpeglib.h>
#include <jerror.h> #include <jerror.h>
@ -34,11 +34,11 @@ empty_closure_output_buffer(j_compress_ptr cinfo){
closure_destination_mgr *dest = (closure_destination_mgr *) cinfo->dest; closure_destination_mgr *dest = (closure_destination_mgr *) cinfo->dest;
Local<Object> buf = NanNewBufferHandle((char *)dest->buffer, dest->bufsize); Local<Object> buf = NanNewBufferHandle((char *)dest->buffer, dest->bufsize);
Local<Value> argv[3] = { Local<Value> argv[3] = {
NanNewLocal<Value>(Null()) NanNew(NanNull())
, NanNewLocal<Value>(buf) , NanNew(buf)
, Integer::New(dest->bufsize) , NanNew<Integer>(dest->bufsize)
}; };
dest->closure->fn->Call(Context::GetCurrent()->Global(), 3, argv); NanMakeCallback(NanGetCurrentContext()->Global(), dest->closure->fn, 3, argv);
cinfo->dest->next_output_byte = dest->buffer; cinfo->dest->next_output_byte = dest->buffer;
cinfo->dest->free_in_buffer = dest->bufsize; cinfo->dest->free_in_buffer = dest->bufsize;
return true; return true;
@ -53,21 +53,21 @@ term_closure_destination(j_compress_ptr cinfo){
Local<Object> buf = NanNewBufferHandle((char *)dest->buffer, remaining); Local<Object> buf = NanNewBufferHandle((char *)dest->buffer, remaining);
Local<Value> data_argv[3] = { Local<Value> data_argv[3] = {
NanNewLocal<Value>(Null()) NanNew(NanNull())
, NanNewLocal<Value>(buf) , NanNew(buf)
, Integer::New(remaining) , NanNew<Integer>(remaining)
}; };
dest->closure->fn->Call(Context::GetCurrent()->Global(), 3, data_argv); NanMakeCallback(NanGetCurrentContext()->Global(), dest->closure->fn, 3, data_argv);
// emit "end" // emit "end"
Local<Value> end_argv[3] = { Local<Value> end_argv[3] = {
NanNewLocal<Value>(Null()) NanNew(NanNull())
, NanNewLocal<Value>(Null()) , NanNew(NanNull())
, Integer::New(0) , NanNew<Integer>(0)
}; };
dest->closure->fn->Call(Context::GetCurrent()->Global(), 3, end_argv); NanMakeCallback(NanGetCurrentContext()->Global(), dest->closure->fn, 3, end_argv);
} }
void void

12
src/PixelArray.cc
View File

@ -9,7 +9,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "nan.h" #include <nan.h>
Persistent<FunctionTemplate> PixelArray::constructor; Persistent<FunctionTemplate> PixelArray::constructor;
@ -22,8 +22,8 @@ PixelArray::Initialize(Handle<Object> target) {
NanScope(); NanScope();
// Constructor // Constructor
Local<FunctionTemplate> ctor = FunctionTemplate::New(PixelArray::New); Local<FunctionTemplate> ctor = NanNew<FunctionTemplate>(PixelArray::New);
NanAssignPersistent(FunctionTemplate, constructor, ctor); NanAssignPersistent(constructor, ctor);
ctor->InstanceTemplate()->SetInternalFieldCount(1); ctor->InstanceTemplate()->SetInternalFieldCount(1);
ctor->SetClassName(NanSymbol("CanvasPixelArray")); ctor->SetClassName(NanSymbol("CanvasPixelArray"));
@ -82,7 +82,7 @@ NAN_METHOD(PixelArray::New) {
NAN_GETTER(PixelArray::GetLength) { NAN_GETTER(PixelArray::GetLength) {
NanScope(); NanScope();
NanReturnValue(Number::New(args.This()->GetIndexedPropertiesPixelDataLength())); NanReturnValue(NanNew<Number>(args.This()->GetIndexedPropertiesPixelDataLength()));
} }
/* /*
@ -142,7 +142,7 @@ uint8_t *
PixelArray::alloc() { PixelArray::alloc() {
int len = length(); int len = length();
_data = (uint8_t *) calloc(1, len); _data = (uint8_t *) calloc(1, len);
V8::AdjustAmountOfExternalAllocatedMemory(len); NanAdjustExternalMemory(len);
return _data; return _data;
} }
@ -151,6 +151,6 @@ PixelArray::alloc() {
*/ */
PixelArray::~PixelArray() { PixelArray::~PixelArray() {
V8::AdjustAmountOfExternalAllocatedMemory(-length()); NanAdjustExternalMemory(-length());
free(_data); free(_data);
} }

4
src/closure.h
View File

@ -16,7 +16,7 @@
#define PAGE_SIZE 4096 #define PAGE_SIZE 4096
#endif #endif
#include "nan.h" #include <nan.h>
/* /*
* PNG stream closure. * PNG stream closure.
@ -58,7 +58,7 @@ void
closure_destroy(closure_t *closure) { closure_destroy(closure_t *closure) {
if (closure->len) { if (closure->len) {
free(closure->data); free(closure->data);
V8::AdjustAmountOfExternalAllocatedMemory(- (intptr_t) closure->max_len); NanAdjustExternalMemory(-((intptr_t) closure->max_len));
} }
} }

8
src/init.cc
View File

@ -32,7 +32,7 @@ init (Handle<Object> target) {
FontFace::Initialize(target); FontFace::Initialize(target);
#endif #endif
target->Set(String::New("cairoVersion"), String::New(cairo_version_string())); target->Set(NanNew<String>("cairoVersion"), NanNew<String>(cairo_version_string()));
#ifdef HAVE_JPEG #ifdef HAVE_JPEG
#ifndef JPEG_LIB_VERSION_MAJOR #ifndef JPEG_LIB_VERSION_MAJOR
@ -57,16 +57,16 @@ init (Handle<Object> target) {
} else { } else {
snprintf(jpeg_version, 10, "%d", JPEG_LIB_VERSION_MAJOR); snprintf(jpeg_version, 10, "%d", JPEG_LIB_VERSION_MAJOR);
} }
target->Set(String::New("jpegVersion"), String::New(jpeg_version)); target->Set(NanNew<String>("jpegVersion"), NanNew<String>(jpeg_version));
#endif #endif
#ifdef HAVE_GIF #ifdef HAVE_GIF
#ifndef GIF_LIB_VERSION #ifndef GIF_LIB_VERSION
char gif_version[10]; char gif_version[10];
snprintf(gif_version, 10, "%d.%d.%d", GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE); snprintf(gif_version, 10, "%d.%d.%d", GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE);
target->Set(String::New("gifVersion"), String::New(gif_version)); target->Set(NanNew<String>("gifVersion"), NanNew<String>(gif_version));
#else #else
target->Set(String::New("gifVersion"), String::New(GIF_LIB_VERSION)); target->Set(NanNew<String>("gifVersion"), NanNew<String>(GIF_LIB_VERSION));
#endif #endif
#endif #endif
} }

Write Preview
Loading…
Cancel
Save