mirror of
https://github.com/lovell/sharp.git
synced 2025-07-09 18:40:16 +02:00
update to nan 1.1.0
This commit is contained in:
parent
3f8e9f6487
commit
15a519ebd9
@ -31,7 +31,7 @@
|
|||||||
"buffer"
|
"buffer"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"nan": "^1.0.0"
|
"nan": "^1.1.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"imagemagick": "^0.1.3",
|
"imagemagick": "^0.1.3",
|
||||||
|
14
src/sharp.cc
14
src/sharp.cc
@ -352,13 +352,13 @@ NAN_METHOD(resize) {
|
|||||||
baton->width = args[3]->Int32Value();
|
baton->width = args[3]->Int32Value();
|
||||||
baton->height = args[4]->Int32Value();
|
baton->height = args[4]->Int32Value();
|
||||||
Local<String> canvas = args[5]->ToString();
|
Local<String> canvas = args[5]->ToString();
|
||||||
if (canvas->Equals(NanSymbol("c"))) {
|
if (canvas->Equals(NanNew<String>("c"))) {
|
||||||
baton->crop = true;
|
baton->crop = true;
|
||||||
} else if (canvas->Equals(NanSymbol("w"))) {
|
} else if (canvas->Equals(NanNew<String>("w"))) {
|
||||||
baton->extend = VIPS_EXTEND_WHITE;
|
baton->extend = VIPS_EXTEND_WHITE;
|
||||||
} else if (canvas->Equals(NanSymbol("b"))) {
|
} else if (canvas->Equals(NanNew<String>("b"))) {
|
||||||
baton->extend = VIPS_EXTEND_BLACK;
|
baton->extend = VIPS_EXTEND_BLACK;
|
||||||
} else if (canvas->Equals(NanSymbol("m"))) {
|
} else if (canvas->Equals(NanNew<String>("m"))) {
|
||||||
baton->max = true;
|
baton->max = true;
|
||||||
}
|
}
|
||||||
baton->sharpen = args[6]->BooleanValue();
|
baton->sharpen = args[6]->BooleanValue();
|
||||||
@ -383,9 +383,9 @@ NAN_METHOD(cache) {
|
|||||||
|
|
||||||
// Get cache statistics
|
// Get cache statistics
|
||||||
Local<Object> cache = NanNew<Object>();
|
Local<Object> cache = NanNew<Object>();
|
||||||
cache->Set(NanSymbol("current"), NanNew<Number>(vips_tracked_get_mem() / 1048576));
|
cache->Set(NanNew<String>("current"), NanNew<Number>(vips_tracked_get_mem() / 1048576));
|
||||||
cache->Set(NanSymbol("high"), NanNew<Number>(vips_tracked_get_mem_highwater() / 1048576));
|
cache->Set(NanNew<String>("high"), NanNew<Number>(vips_tracked_get_mem_highwater() / 1048576));
|
||||||
cache->Set(NanSymbol("limit"), NanNew<Number>(vips_cache_get_max_mem() / 1048576));
|
cache->Set(NanNew<String>("limit"), NanNew<Number>(vips_cache_get_max_mem() / 1048576));
|
||||||
NanReturnValue(cache);
|
NanReturnValue(cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user