Skip to content

Commit 0158cf4

Browse files
springmeyerspringmeyer
authored
Merge pull request #810 from mapnik/fix-v0.10
fix node v0.10.x
2 parents 3ab3a76 + ba89f99 commit 0158cf4

12 files changed

+23
-23
lines changed

‎src/mapnik_color.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ v8::Local<v8::Value> Color::NewInstance(mapnik::color const& color) {
183183
Color* c = new Color();
184184
c->this_ = std::make_shared<mapnik::color>(color);
185185
v8::Local<v8::Value> ext = Nan::New<v8::External>(c);
186-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
186+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
187187
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Color instance");
188188
return scope.Escape(maybe_local.ToLocalChecked());
189189
}

‎src/mapnik_datasource.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ v8::Local<v8::Value> Datasource::NewInstance(mapnik::datasource_ptr ds_ptr) {
147147
Datasource* d = new Datasource();
148148
d->datasource_ = ds_ptr;
149149
v8::Local<v8::Value> ext = Nan::New<v8::External>(d);
150-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
150+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
151151
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Datasource instance");
152152
return scope.Escape(maybe_local.ToLocalChecked());
153153
}

‎src/mapnik_feature.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ NAN_METHOD(Feature::fromJSON)
114114
}
115115
Feature* feat = new Feature(f);
116116
v8::Local<v8::Value> ext = Nan::New<v8::External>(feat);
117-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
117+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
118118
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Feature instance");
119119
else info.GetReturnValue().Set(maybe_local.ToLocalChecked());
120120
}
@@ -134,7 +134,7 @@ v8::Local<v8::Value> Feature::NewInstance(mapnik::feature_ptr f_ptr)
134134
Nan::EscapableHandleScope scope;
135135
Feature* f = new Feature(f_ptr);
136136
v8::Local<v8::Value> ext = Nan::New<v8::External>(f);
137-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
137+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
138138
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Feature instance");
139139
return scope.Escape(maybe_local.ToLocalChecked());
140140
}

‎src/mapnik_featureset.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ v8::Local<v8::Value> Featureset::NewInstance(mapnik::featureset_ptr fsp)
9898
Featureset* fs = new Featureset();
9999
fs->this_ = fsp;
100100
v8::Local<v8::Value> ext = Nan::New<v8::External>(fs);
101-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
101+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
102102
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Featureset instance");
103103
return scope.Escape(maybe_local.ToLocalChecked());
104104
}

‎src/mapnik_geometry.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ v8::Local<v8::Value> Geometry::NewInstance(mapnik::feature_ptr f) {
8888
Nan::EscapableHandleScope scope;
8989
Geometry* g = new Geometry(f);
9090
v8::Local<v8::Value> ext = Nan::New<v8::External>(g);
91-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
91+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
9292
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Geometry instance");
9393
return scope.Escape(maybe_local.ToLocalChecked());
9494
}

‎src/mapnik_grid_view.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ v8::Local<v8::Value> GridView::NewInstance(Grid * JSGrid,
8383
GridView* gv = new GridView(JSGrid);
8484
gv->this_ = std::make_shared<mapnik::grid_view>(JSGrid->get()->get_view(x,y,w,h));
8585
v8::Local<v8::Value> ext = Nan::New<v8::External>(gv);
86-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
86+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
8787
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new GridView instance");
8888
return scope.Escape(maybe_local.ToLocalChecked());
8989
}

‎src/mapnik_image.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,7 @@ void Image::EIO_AfterCopy(uv_work_t* req)
16151615
{
16161616
Image* im = new Image(closure->im2);
16171617
v8::Local<v8::Value> ext = Nan::New<v8::External>(im);
1618-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
1618+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
16191619
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
16201620
v8::Local<v8::Value> argv[2] = { Nan::Null(), maybe_local.ToLocalChecked() };
16211621
Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 2, argv);
@@ -1734,7 +1734,7 @@ v8::Local<v8::Value> Image::_copySync(Nan::NAN_METHOD_ARGS_TYPE info)
17341734
);
17351735
Image* new_im = new Image(imagep);
17361736
v8::Local<v8::Value> ext = Nan::New<v8::External>(new_im);
1737-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
1737+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
17381738
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
17391739
return scope.Escape(maybe_local.ToLocalChecked());
17401740
}
@@ -2080,7 +2080,7 @@ void Image::EIO_AfterResize(uv_work_t* req)
20802080
{
20812081
Image* im = new Image(closure->im2);
20822082
v8::Local<v8::Value> ext = Nan::New<v8::External>(im);
2083-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
2083+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
20842084
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
20852085
v8::Local<v8::Value> argv[2] = { Nan::Null(), maybe_local.ToLocalChecked() };
20862086
Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 2, argv);
@@ -2267,7 +2267,7 @@ v8::Local<v8::Value> Image::_resizeSync(Nan::NAN_METHOD_ARGS_TYPE info)
22672267
mapnik::util::apply_visitor(visit, *imagep);
22682268
Image* new_im = new Image(imagep);
22692269
v8::Local<v8::Value> ext = Nan::New<v8::External>(new_im);
2270-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
2270+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
22712271
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
22722272
return scope.Escape(maybe_local.ToLocalChecked());
22732273
}
@@ -2378,7 +2378,7 @@ v8::Local<v8::Value> Image::_openSync(Nan::NAN_METHOD_ARGS_TYPE info)
23782378
}
23792379
Image* im = new Image(imagep);
23802380
v8::Local<v8::Value> ext = Nan::New<v8::External>(im);
2381-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
2381+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
23822382
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
23832383
return scope.Escape(maybe_local.ToLocalChecked());
23842384
}
@@ -2516,7 +2516,7 @@ void Image::EIO_AfterOpen(uv_work_t* req)
25162516
{
25172517
Image* im = new Image(closure->im);
25182518
v8::Local<v8::Value> ext = Nan::New<v8::External>(im);
2519-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
2519+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
25202520
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
25212521
v8::Local<v8::Value> argv[2] = { Nan::Null(), maybe_local.ToLocalChecked() };
25222522
Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 2, argv);
@@ -2725,7 +2725,7 @@ v8::Local<v8::Value> Image::_fromSVGSync(bool fromFile, Nan::NAN_METHOD_ARGS_TYP
27252725
image_ptr imagep = std::make_shared<mapnik::image_any>(im);
27262726
Image *im2 = new Image(imagep);
27272727
v8::Local<v8::Value> ext = Nan::New<v8::External>(im2);
2728-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
2728+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
27292729
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
27302730
return scope.Escape(maybe_local.ToLocalChecked());
27312731
}
@@ -2963,7 +2963,7 @@ void Image::EIO_AfterFromSVG(uv_work_t* req)
29632963
{
29642964
Image* im = new Image(closure->im);
29652965
v8::Local<v8::Value> ext = Nan::New<v8::External>(im);
2966-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
2966+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
29672967
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
29682968
v8::Local<v8::Value> argv[2] = { Nan::Null(), maybe_local.ToLocalChecked() };
29692969
Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 2, argv);
@@ -3296,7 +3296,7 @@ v8::Local<v8::Value> Image::_fromBufferSync(Nan::NAN_METHOD_ARGS_TYPE info)
32963296
image_ptr imagep = std::make_shared<mapnik::image_any>(im_wrapper);
32973297
Image* im = new Image(imagep);
32983298
v8::Local<v8::Value> ext = Nan::New<v8::External>(im);
3299-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
3299+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
33003300
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
33013301
v8::Local<v8::Object> image_obj = maybe_local.ToLocalChecked()->ToObject();
33023302
image_obj->Set(Nan::New("_buffer").ToLocalChecked(),obj);
@@ -3352,7 +3352,7 @@ v8::Local<v8::Value> Image::_fromBytesSync(Nan::NAN_METHOD_ARGS_TYPE info)
33523352
image_ptr imagep = std::make_shared<mapnik::image_any>(reader->read(0,0,reader->width(),reader->height()));
33533353
Image* im = new Image(imagep);
33543354
v8::Local<v8::Value> ext = Nan::New<v8::External>(im);
3355-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
3355+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
33563356
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
33573357
return scope.Escape(maybe_local.ToLocalChecked());
33583358
}
@@ -3523,7 +3523,7 @@ void Image::EIO_AfterFromBytes(uv_work_t* req)
35233523
{
35243524
Image* im = new Image(closure->im);
35253525
v8::Local<v8::Value> ext = Nan::New<v8::External>(im);
3526-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
3526+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
35273527
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Image instance");
35283528
v8::Local<v8::Value> argv[2] = { Nan::Null(), maybe_local.ToLocalChecked() };
35293529
Nan::MakeCallback(Nan::GetCurrentContext()->Global(), Nan::New(closure->cb), 2, argv);

‎src/mapnik_image_view.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ v8::Local<v8::Value> ImageView::NewInstance(Image * JSImage ,
9898
ImageView* imv = new ImageView(JSImage);
9999
imv->this_ = std::make_shared<mapnik::image_view_any>(mapnik::create_view(*(JSImage->get()),x,y,w,h));
100100
v8::Local<v8::Value> ext = Nan::New<v8::External>(imv);
101-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
101+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
102102
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new ImageView instance");
103103
return scope.Escape(maybe_local.ToLocalChecked());
104104
}

‎src/mapnik_layer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ v8::Local<v8::Value> Layer::NewInstance(mapnik::layer const& lay_ref) {
111111
// copy new mapnik::layer into the shared_ptr
112112
l->layer_ = std::make_shared<mapnik::layer>(lay_ref);
113113
v8::Local<v8::Value> ext = Nan::New<v8::External>(l);
114-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
114+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
115115
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Layer instance");
116116
return scope.Escape(maybe_local.ToLocalChecked());
117117
}

‎src/mapnik_map.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,7 @@ NAN_METHOD(Map::clone)
14561456
Map* m2 = new Map();
14571457
m2->map_ = std::make_shared<mapnik::Map>(*m->map_);
14581458
v8::Local<v8::Value> ext = Nan::New<v8::External>(m2);
1459-
v8::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
1459+
Nan::MaybeLocal<v8::Object> maybe_local = Nan::NewInstance(Nan::New(constructor)->GetFunction(), 1, &ext);
14601460
if (maybe_local.IsEmpty()) Nan::ThrowError("Could not create new Map instance");
14611461
else info.GetReturnValue().Set(maybe_local.ToLocalChecked());
14621462
}

0 commit comments

Comments
 (0)