[osmium] 01/04: Imported Upstream version 0.0~20140825-3f3d229

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository osmium.

commit abb877ed15a1aa207576517bcd844938946057bb
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 5 23:54:21 2014 +0200

    Imported Upstream version 0.0~20140825-3f3d229
---
 include/osmium/export/shapefile.hpp                    | 2 +-
 include/osmium/javascript/wrapper/export_shapefile.hpp | 2 +-
 include/osmium/osm/area.hpp                            | 2 +-
 include/osmium/osm/node.hpp                            | 2 +-
 include/osmium/osm/relation.hpp                        | 2 +-
 include/osmium/osm/way.hpp                             | 2 +-
 include/osmium/tags/regex_filter.hpp                   | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/osmium/export/shapefile.hpp b/include/osmium/export/shapefile.hpp
index 772d9e2..2f5e6a4 100644
--- a/include/osmium/export/shapefile.hpp
+++ b/include/osmium/export/shapefile.hpp
@@ -263,7 +263,7 @@ namespace Osmium {
             void add_attribute_with_truncate(const int field, const char* value) const {
                 char dest[max_dbf_field_length+1];
                 size_t length = m_fields[field].width();
-                dest[length+1] = '\0';
+                dest[length] = '\0';
                 strncpy(dest, value, length);
                 size_t i = length-1;
                 if (dest[i] & 128) {
diff --git a/include/osmium/javascript/wrapper/export_shapefile.hpp b/include/osmium/javascript/wrapper/export_shapefile.hpp
index c961fa0..a5285b2 100644
--- a/include/osmium/javascript/wrapper/export_shapefile.hpp
+++ b/include/osmium/javascript/wrapper/export_shapefile.hpp
@@ -51,7 +51,7 @@ namespace Osmium {
                         } else if (!strcmp(*type, "polygon")) {
                             oc = new Osmium::Export::PolygonShapefile(filename);
                         } else {
-                            throw std::runtime_error("unkown shapefile type");
+                            throw std::runtime_error("unknown shapefile type");
                         }
 
                         return Osmium::Javascript::Wrapper::ExportShapefile::get<Osmium::Javascript::Wrapper::ExportShapefile>().create_instance(static_cast<void*>(oc));
diff --git a/include/osmium/osm/area.hpp b/include/osmium/osm/area.hpp
index 77945cb..a5979f6 100644
--- a/include/osmium/osm/area.hpp
+++ b/include/osmium/osm/area.hpp
@@ -138,7 +138,7 @@ namespace Osmium {
             if (lhs.id() == rhs.id()) {
                 return lhs.version() < rhs.version();
             } else {
-                return abs(lhs.id()) < abs(rhs.id());
+                return std::abs(lhs.id()) < std::abs(rhs.id());
             }
         }
 
diff --git a/include/osmium/osm/node.hpp b/include/osmium/osm/node.hpp
index 3e42058..f4dea1f 100644
--- a/include/osmium/osm/node.hpp
+++ b/include/osmium/osm/node.hpp
@@ -88,7 +88,7 @@ namespace Osmium {
             if (lhs.id() == rhs.id()) {
                 return lhs.version() < rhs.version();
             } else {
-                return abs(lhs.id()) < abs(rhs.id());
+                return std::abs(lhs.id()) < std::abs(rhs.id());
             }
         }
 
diff --git a/include/osmium/osm/relation.hpp b/include/osmium/osm/relation.hpp
index 2211690..e20dadf 100644
--- a/include/osmium/osm/relation.hpp
+++ b/include/osmium/osm/relation.hpp
@@ -79,7 +79,7 @@ namespace Osmium {
             if (lhs.id() == rhs.id()) {
                 return lhs.version() < rhs.version();
             } else {
-                return abs(lhs.id()) < abs(rhs.id());
+                return std::abs(lhs.id()) < std::abs(rhs.id());
             }
         }
 
diff --git a/include/osmium/osm/way.hpp b/include/osmium/osm/way.hpp
index 1e8e6a5..89562a9 100644
--- a/include/osmium/osm/way.hpp
+++ b/include/osmium/osm/way.hpp
@@ -114,7 +114,7 @@ namespace Osmium {
             if (lhs.id() == rhs.id()) {
                 return lhs.version() < rhs.version();
             } else {
-                return abs(lhs.id()) < abs(rhs.id());
+                return std::abs(lhs.id()) < std::abs(rhs.id());
             }
         }
 
diff --git a/include/osmium/tags/regex_filter.hpp b/include/osmium/tags/regex_filter.hpp
index ba3e780..a3beb56 100644
--- a/include/osmium/tags/regex_filter.hpp
+++ b/include/osmium/tags/regex_filter.hpp
@@ -22,7 +22,7 @@ You should have received a copy of the Licenses along with Osmium. If not, see
 
 */
 
-#define OSMIUM_LINK_WITH_LIBS_GEOS -lboost_regex
+#define OSMIUM_LINK_WITH_LIBS_REGEX -lboost_regex
 
 #include <functional>
 #include <vector>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium.git