[osm2pgsql] 01/04: Imported Upstream version 0.92.0+ds

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit a642226b947349bbd2efd1b1f36236c32ff05aef
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 16 11:02:47 2016 +0100

    Imported Upstream version 0.92.0+ds
---
 CMakeLists.txt       | 2 +-
 geometry-builder.cpp | 4 ++--
 options.cpp          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fa79a6..db48c1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(PACKAGE osm2pgsql)
 set(PACKAGE_NAME osm2pgsql)
-set(PACKAGE_VERSION 0.92.0-RC1)
+set(PACKAGE_VERSION 0.92.0)
 
 cmake_minimum_required(VERSION 2.8.7)
 
diff --git a/geometry-builder.cpp b/geometry-builder.cpp
index c9a07ef..e978341 100644
--- a/geometry-builder.cpp
+++ b/geometry-builder.cpp
@@ -502,7 +502,7 @@ geometry_builder::pg_geoms_t geometry_builder::build_polygons(const multinodelis
                     if (!multipoly->isValid() && !excludepoly) {
                         multipoly = geom_ptr(multipoly->buffer(0));
                         multipoly->normalize();
-                        if (!!multipoly->isEmpty() && multipoly->isValid()) {
+                        if (!multipoly->isEmpty() && multipoly->isValid()) {
                             wkbs.emplace_back(multipoly.get(), true, projection);
                         }
                     } else {
@@ -517,7 +517,7 @@ geometry_builder::pg_geoms_t geometry_builder::build_polygons(const multinodelis
                         if (!poly->isValid() && !excludepoly) {
                             poly = geom_ptr(poly->buffer(0));
                             poly->normalize();
-                            if (!!poly->isEmpty() && poly->isValid()) {
+                            if (!poly->isEmpty() && poly->isValid()) {
                                 wkbs.emplace_back(poly.get(), true, projection);
                             }
                         } else {
diff --git a/options.cpp b/options.cpp
index 3c5c8ad..c2b9be5 100644
--- a/options.cpp
+++ b/options.cpp
@@ -16,7 +16,7 @@
 
 namespace
 {
-    const char * short_options = "ab:cd:KhlmMp:suvU:WH:P:i:IE:C:S:e:o:B:O:xkjGz:r:V";
+    const char * short_options = "ab:cd:KhlmMp:suvU:WH:P:i:IE:C:S:e:o:O:xkjGz:r:V";
     const struct option long_options[] =
     {
         {"append",   0, 0, 'a'},

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