Skip to content
Browse files

Merge branch 'node-v8' of github.com:mapnik/node-mapnik

  • Loading branch information...
2 parents a47573a + 20d074a commit 30bb28f3b8c64a9ec769d2759c5079883e05f5e6 @springmeyer springmeyer committed Jun 28, 2012
Showing with 3 additions and 23 deletions.
  1. +3 −1 package.json
  2. +0 −2 src/mapnik_grid.cpp
  3. +0 −2 src/mapnik_grid_view.cpp
  4. +0 −4 src/mapnik_image.cpp
  5. +0 −3 src/mapnik_image_view.cpp
  6. +0 −11 src/mapnik_map.cpp
View
4 package.json
@@ -42,7 +42,9 @@
"examples" : "examples",
"src": "src"
},
- "engines" : { "node": ">=0.6.0" },
+ "engines" : {
+ "node": ">= 0.6.13 && < 0.9.0"
+ },
"scripts" : {
"install" : "node-waf -v configure build",
"pretest" : "npm install --dev",
View
2 src/mapnik_grid.cpp
@@ -382,7 +382,6 @@ Handle<Value> Grid::encode(const Arguments& args) // format, resolution
closure->cb = Persistent<Function>::New(Handle<Function>::Cast(callback));
// todo - reserve lines size?
uv_queue_work(uv_default_loop(), &closure->request, EIO_Encode, EIO_AfterEncode);
- uv_ref(uv_default_loop());
g->Ref();
return Undefined();
}
@@ -461,7 +460,6 @@ void Grid::EIO_AfterEncode(uv_work_t* req)
FatalException(try_catch);
}
- uv_unref(uv_default_loop());
closure->g->Unref();
closure->cb.Dispose();
delete closure;
View
2 src/mapnik_grid_view.cpp
@@ -324,7 +324,6 @@ Handle<Value> GridView::encode(const Arguments& args)
closure->add_features = add_features;
closure->cb = Persistent<Function>::New(Handle<Function>::Cast(callback));
uv_queue_work(uv_default_loop(), &closure->request, EIO_Encode, EIO_AfterEncode);
- uv_ref(uv_default_loop());
g->Ref();
return Undefined();
}
@@ -405,7 +404,6 @@ void GridView::EIO_AfterEncode(uv_work_t* req)
FatalException(try_catch);
}
- uv_unref(uv_default_loop());
closure->g->Unref();
closure->cb.Dispose();
delete closure;
View
4 src/mapnik_image.cpp
@@ -394,7 +394,6 @@ Handle<Value> Image::encode(const Arguments& args)
closure->error = false;
closure->cb = Persistent<Function>::New(Handle<Function>::Cast(callback));
uv_queue_work(uv_default_loop(), &closure->request, EIO_Encode, EIO_AfterEncode);
- uv_ref(uv_default_loop());
im->Ref();
return Undefined();
@@ -449,7 +448,6 @@ void Image::EIO_AfterEncode(uv_work_t* req)
FatalException(try_catch);
}
- uv_unref(uv_default_loop());
closure->im->Unref();
closure->cb.Dispose();
delete closure;
@@ -567,7 +565,6 @@ Handle<Value> Image::composite(const Arguments& args)
closure->error = false;
closure->cb = Persistent<Function>::New(Handle<Function>::Cast(callback));
uv_queue_work(uv_default_loop(), &closure->request, EIO_Composite, EIO_AfterComposite);
- uv_ref(uv_default_loop());
closure->im1->Ref();
closure->im2->Ref();
return Undefined();
@@ -613,7 +610,6 @@ void Image::EIO_AfterComposite(uv_work_t* req)
FatalException(try_catch);
}
- uv_unref(uv_default_loop());
closure->im1->Unref();
closure->im2->Unref();
closure->cb.Dispose();
View
3 src/mapnik_image_view.cpp
@@ -295,9 +295,7 @@ Handle<Value> ImageView::encode(const Arguments& args)
closure->error = false;
closure->cb = Persistent<Function>::New(Handle<Function>::Cast(callback));
uv_queue_work(uv_default_loop(), &closure->request, EIO_Encode, EIO_AfterEncode);
- uv_ref(uv_default_loop());
im->Ref();
-
return Undefined();
}
@@ -351,7 +349,6 @@ void ImageView::EIO_AfterEncode(uv_work_t* req)
FatalException(try_catch);
}
- uv_unref(uv_default_loop());
closure->im->Unref();
closure->cb.Dispose();
delete closure;
View
11 src/mapnik_map.cpp
@@ -576,7 +576,6 @@ Handle<Value> Map::abstractQueryPoint(const Arguments& args, bool geo_coords)
closure->cb = Persistent<Function>::New(Handle<Function>::Cast(callback));
uv_queue_work(uv_default_loop(), &closure->request, EIO_QueryMap, EIO_AfterQueryMap);
m->Ref();
- uv_ref(uv_default_loop());
return Undefined();
}
@@ -686,7 +685,6 @@ void Map::EIO_AfterQueryMap(uv_work_t* req)
}
closure->m->Unref();
- uv_unref(uv_default_loop());
closure->cb.Dispose();
delete closure;
}
@@ -865,7 +863,6 @@ Handle<Value> Map::load(const Arguments& args)
closure->cb = Persistent<Function>::New(Handle<Function>::Cast(callback));
uv_queue_work(uv_default_loop(), &closure->request, EIO_Load, EIO_AfterLoad);
m->Ref();
- uv_ref(uv_default_loop());
return Undefined();
}
@@ -911,7 +908,6 @@ void Map::EIO_AfterLoad(uv_work_t* req)
}
closure->m->Unref();
- uv_unref(uv_default_loop());
closure->cb.Dispose();
delete closure;
}
@@ -1112,7 +1108,6 @@ Handle<Value> Map::fromString(const Arguments& args)
closure->cb = Persistent<Function>::New(Handle<Function>::Cast(callback));
uv_queue_work(uv_default_loop(), &closure->request, EIO_FromString, EIO_AfterFromString);
m->Ref();
- uv_ref(uv_default_loop());
return Undefined();
}
@@ -1158,7 +1153,6 @@ void Map::EIO_AfterFromString(uv_work_t* req)
}
closure->m->Unref();
- uv_unref(uv_default_loop());
closure->cb.Dispose();
delete closure;
}
@@ -1462,7 +1456,6 @@ Handle<Value> Map::render(const Arguments& args)
m->acquire();
m->Ref();
- uv_ref(uv_default_loop());
return Undefined();
}
@@ -1538,7 +1531,6 @@ void Map::EIO_AfterRenderGrid(uv_work_t* req)
closure->m->release();
closure->m->Unref();
- uv_unref(uv_default_loop());
closure->g->_unref();
closure->cb.Dispose();
delete closure;
@@ -1591,7 +1583,6 @@ void Map::EIO_AfterRenderImage(uv_work_t* req)
closure->m->release();
closure->m->Unref();
- uv_unref(uv_default_loop());
closure->im->_unref();
closure->cb.Dispose();
delete closure;
@@ -1692,7 +1683,6 @@ Handle<Value> Map::renderFile(const Arguments& args)
closure->output = output;
uv_queue_work(uv_default_loop(), &closure->request, EIO_RenderFile, EIO_AfterRenderFile);
- uv_ref(uv_default_loop());
m->Ref();
return Undefined();
@@ -1759,7 +1749,6 @@ void Map::EIO_AfterRenderFile(uv_work_t* req)
closure->m->release();
closure->m->Unref();
- uv_unref(uv_default_loop());
closure->cb.Dispose();
delete closure;

0 comments on commit 30bb28f

Please sign in to comment.
Something went wrong with that request. Please try again.