[geos-commits] [SCM] geos branch master updated. 97843ef1bac3323503ee2001de6d276e2039d207

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "geos".

The branch, master has been updated
       via  97843ef1bac3323503ee2001de6d276e2039d207 (commit)
      from  0f26249a5808a09e97fda6b0ce4bdb1c0e8a5bcd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 97843ef1bac3323503ee2001de6d276e2039d207
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri Jul 14 11:58:16 2017 +0200

    CascadedUnion uses spaces indent also in include files
    
    Convert the TABS added in previous commit, and a single spurious
    tab found in existing file, secure style in editorconfig

diff --git a/.editorconfig b/.editorconfig
index e7aee52..1386b0e 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -43,7 +43,10 @@ indent_size = 2
 indent_style = space
 indent_size = 2
 
-# This directory was found to be using spaces
+# operation/union directories were found to be using spaces
 [src/operation/union/*.cpp]
 indent_style = space
 indent_size = 2
+[include/geos/operation/union/*.{h,inl}]
+indent_style = space
+indent_size = 2
diff --git a/include/geos/operation/union/CascadedPolygonUnion.h b/include/geos/operation/union/CascadedPolygonUnion.h
index f40c53b..925d5c7 100644
--- a/include/geos/operation/union/CascadedPolygonUnion.h
+++ b/include/geos/operation/union/CascadedPolygonUnion.h
@@ -229,13 +229,13 @@ private:
 
     void extractByEnvelope(geom::Envelope const& env,
         geom::Geometry* geom,
-				std::vector<geom::Geometry*>& intersectingGeoms,
-				std::vector<geom::Geometry*>& disjointGeoms);
+        std::vector<geom::Geometry*>& intersectingGeoms,
+        std::vector<geom::Geometry*>& disjointGeoms);
 
     void extractByEnvelope(geom::Envelope const& env,
-				std::vector<geom::Geometry*>& sourceGeoms,
-				std::vector<geom::Geometry*>& intersectingGeoms,
-				std::vector<geom::Geometry*>& disjointGeoms);
+        std::vector<geom::Geometry*>& sourceGeoms,
+        std::vector<geom::Geometry*>& intersectingGeoms,
+        std::vector<geom::Geometry*>& disjointGeoms);
 
     /**
      * Encapsulates the actual unioning of two polygonal geometries.
diff --git a/include/geos/operation/union/GeometryListHolder.h b/include/geos/operation/union/GeometryListHolder.h
index 9f5f363..f046952 100644
--- a/include/geos/operation/union/GeometryListHolder.h
+++ b/include/geos/operation/union/GeometryListHolder.h
@@ -20,7 +20,7 @@
 namespace geos {
   namespace geom {
     class Geometry;
-	}
+  }
 }
 
 namespace geos {

-----------------------------------------------------------------------

Summary of changes:
 .editorconfig                                       |    5 ++++-
 include/geos/operation/union/CascadedPolygonUnion.h |   10 +++++-----
 include/geos/operation/union/GeometryListHolder.h   |    2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
geos