Permalink
Browse files

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

  • Loading branch information...
2 parents a0b7108 + ad43b91 commit a6ae0726de886a74438fc7c1fe6ebb5c56cdb185 Dane Springmeyer committed Jan 7, 2013
Showing with 10 additions and 4 deletions.
  1. +6 −0 CHANGELOG.md
  2. +1 −1 package.json
  3. +3 −3 src/mapnik_layer.cpp
View
@@ -1,5 +1,11 @@
# Changlog
+## 0.7.21
+
+ - Fix compile with latest Mapnik 2.2-pre (<limits> header)
+ - Exposed Map.scale() (stefanklug)
+ - More fixes for 64 bit integer support
+
## 0.7.20
- Fix compile with Mapnik 2.1 (stefanklug)
View
@@ -4,7 +4,7 @@
"url" : "http://github.com/mapnik/node-mapnik",
"homepage" : "http://mapnik.org",
"author" : "Dane Springmeyer <dane@dbsgeo.com> (mapnik.org)",
- "version" : "0.7.20",
+ "version" : "0.7.21",
"main" : "./lib/mapnik.js",
"bugs" : {
"email" : "dane@dbsgeo.com",
View
@@ -47,15 +47,15 @@ void Layer::Initialize(Handle<Object> target) {
target->Set(String::NewSymbol("Layer"),constructor->GetFunction());
}
-Layer::Layer(std::string const& name) :
+Layer::Layer(std::string const& name):
ObjectWrap(),
layer_(boost::make_shared<mapnik::layer>(name)) {}
-Layer::Layer(std::string const& name, std::string const& srs) :
+Layer::Layer(std::string const& name, std::string const& srs):
ObjectWrap(),
layer_(boost::make_shared<mapnik::layer>(name,srs)) {}
-Layer::Layer() :
+Layer::Layer():
ObjectWrap(),
layer_() {}

0 comments on commit a6ae072

Please sign in to comment.