[geos-commits] [SCM] geos branch master updated. 227ad17e4a9ef8d009d16240de492d4b5df70bcc
git at osgeo.org
git at osgeo.org
Sat Jan 13 12:29:18 PST 2018
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 227ad17e4a9ef8d009d16240de492d4b5df70bcc (commit)
from d43e678578cfc60d02fbb051319d65e638474515 (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 227ad17e4a9ef8d009d16240de492d4b5df70bcc
Author: Sandro Santilli <strk at kbt.io>
Date: Sat Jan 13 21:15:02 2018 +0100
Fix -Wmisleading-indentation warnings
diff --git a/src/geom/Polygon.cpp b/src/geom/Polygon.cpp
index 01142f8..91e6f4f 100644
--- a/src/geom/Polygon.cpp
+++ b/src/geom/Polygon.cpp
@@ -151,8 +151,8 @@ Polygon::getCoordinateDimension() const
{
int dimension=2;
- if( shell != nullptr )
- dimension = max(dimension,shell->getCoordinateDimension());
+ if( shell != nullptr )
+ dimension = max(dimension,shell->getCoordinateDimension());
size_t nholes=holes->size();
for (size_t i=0; i<nholes; ++i)
diff --git a/src/io/WKBWriter.cpp b/src/io/WKBWriter.cpp
index 42debda..141da97 100644
--- a/src/io/WKBWriter.cpp
+++ b/src/io/WKBWriter.cpp
@@ -82,9 +82,9 @@ WKBWriter::writeHEX(const Geometry &g, ostream &os)
void
WKBWriter::write(const Geometry &g, ostream &os)
{
- outputDimension = defaultOutputDimension;
- if( outputDimension > g.getCoordinateDimension() )
- outputDimension = g.getCoordinateDimension();
+ outputDimension = defaultOutputDimension;
+ if( outputDimension > g.getCoordinateDimension() )
+ outputDimension = g.getCoordinateDimension();
outStream = &os;
@@ -250,10 +250,10 @@ void
WKBWriter::writeGeometryType(int typeId, int SRID)
{
int flag3D = (outputDimension == 3) ? 0x80000000 : 0;
- int typeInt = typeId | flag3D;
+ int typeInt = typeId | flag3D;
- if (includeSRID && SRID != 0)
- typeInt = typeInt | 0x20000000;
+ if (includeSRID && SRID != 0)
+ typeInt = typeInt | 0x20000000;
writeInt(typeInt);
}
diff --git a/src/io/WKTReader.cpp b/src/io/WKTReader.cpp
index 441b4ed..1547183 100644
--- a/src/io/WKTReader.cpp
+++ b/src/io/WKTReader.cpp
@@ -156,9 +156,9 @@ WKTReader::getNextEmptyOrOpener(StringTokenizer *tokenizer)
{
string nextWord=getNextWord(tokenizer);
- // Skip the Z, M or ZM of an SF1.2 3/4 dim coordinate.
- if (nextWord == "Z" || nextWord == "M" || nextWord == "ZM" )
- nextWord = getNextWord(tokenizer);
+ // Skip the Z, M or ZM of an SF1.2 3/4 dim coordinate.
+ if (nextWord == "Z" || nextWord == "M" || nextWord == "ZM" )
+ nextWord = getNextWord(tokenizer);
if (nextWord=="EMPTY" || nextWord=="(") {
return nextWord;
diff --git a/src/io/WKTWriter.cpp b/src/io/WKTWriter.cpp
index 2c540b7..578d0bf 100644
--- a/src/io/WKTWriter.cpp
+++ b/src/io/WKTWriter.cpp
@@ -236,8 +236,8 @@ WKTWriter::appendPointTaggedText(const Coordinate* coordinate, int level,
Writer *writer)
{
writer->write("POINT ");
- if( outputDimension == 3 && !old3D && coordinate != nullptr )
- writer->write( "Z " );
+ if( outputDimension == 3 && !old3D && coordinate != nullptr )
+ writer->write( "Z " );
appendPointText(coordinate, level, writer);
}
@@ -247,8 +247,8 @@ WKTWriter::appendLineStringTaggedText(const LineString *lineString, int level,
Writer *writer)
{
writer->write("LINESTRING ");
- if( outputDimension == 3 && !old3D && !lineString->isEmpty() )
- writer->write( "Z " );
+ if( outputDimension == 3 && !old3D && !lineString->isEmpty() )
+ writer->write( "Z " );
appendLineStringText(lineString, level, false, writer);
}
@@ -262,43 +262,43 @@ WKTWriter::appendLineStringTaggedText(const LineString *lineString, int level,
*/
void WKTWriter::appendLinearRingTaggedText(const LinearRing* linearRing, int level, Writer *writer) {
writer->write("LINEARRING ");
- if( outputDimension == 3 && !old3D && !linearRing->isEmpty() )
- writer->write( "Z " );
+ if( outputDimension == 3 && !old3D && !linearRing->isEmpty() )
+ writer->write( "Z " );
appendLineStringText((LineString*)linearRing, level, false, writer);
}
void WKTWriter::appendPolygonTaggedText(const Polygon *polygon, int level, Writer *writer) {
writer->write("POLYGON ");
- if( outputDimension == 3 && !old3D && !polygon->isEmpty())
- writer->write( "Z " );
+ if( outputDimension == 3 && !old3D && !polygon->isEmpty())
+ writer->write( "Z " );
appendPolygonText(polygon, level, false, writer);
}
void WKTWriter::appendMultiPointTaggedText(const MultiPoint *multipoint, int level, Writer *writer) {
writer->write("MULTIPOINT ");
- if( outputDimension == 3 && !old3D && !multipoint->isEmpty() )
- writer->write( "Z " );
+ if( outputDimension == 3 && !old3D && !multipoint->isEmpty() )
+ writer->write( "Z " );
appendMultiPointText(multipoint, level, writer);
}
void WKTWriter::appendMultiLineStringTaggedText(const MultiLineString *multiLineString, int level,Writer *writer) {
writer->write("MULTILINESTRING ");
- if( outputDimension == 3 && !old3D && !multiLineString->isEmpty() )
- writer->write( "Z " );
+ if( outputDimension == 3 && !old3D && !multiLineString->isEmpty() )
+ writer->write( "Z " );
appendMultiLineStringText(multiLineString, level, false, writer);
}
void WKTWriter::appendMultiPolygonTaggedText(const MultiPolygon *multiPolygon, int level, Writer *writer) {
writer->write("MULTIPOLYGON ");
- if( outputDimension == 3 && !old3D && !multiPolygon->isEmpty() )
- writer->write( "Z " );
+ if( outputDimension == 3 && !old3D && !multiPolygon->isEmpty() )
+ writer->write( "Z " );
appendMultiPolygonText(multiPolygon, level, writer);
}
void WKTWriter::appendGeometryCollectionTaggedText(const GeometryCollection *geometryCollection, int level,Writer *writer) {
writer->write("GEOMETRYCOLLECTION ");
- if( outputDimension == 3 && !old3D && !geometryCollection->isEmpty() )
- writer->write( "Z " );
+ if( outputDimension == 3 && !old3D && !geometryCollection->isEmpty() )
+ writer->write( "Z " );
appendGeometryCollectionText(geometryCollection, level, writer);
}
diff --git a/src/operation/valid/IsValidOp.cpp b/src/operation/valid/IsValidOp.cpp
index 88578e2..784d712 100644
--- a/src/operation/valid/IsValidOp.cpp
+++ b/src/operation/valid/IsValidOp.cpp
@@ -124,10 +124,10 @@ IsValidOp::checkValid()
void
IsValidOp::checkValid(const Geometry *g)
{
- assert( validErr == nullptr );
+ assert( validErr == nullptr );
- if (nullptr == g)
- return;
+ if (nullptr == g)
+ return;
// empty geometries are always valid!
if (g->isEmpty()) return;
-----------------------------------------------------------------------
Summary of changes:
src/geom/Polygon.cpp | 4 ++--
src/io/WKBWriter.cpp | 12 ++++++------
src/io/WKTReader.cpp | 6 +++---
src/io/WKTWriter.cpp | 32 ++++++++++++++++----------------
src/operation/valid/IsValidOp.cpp | 6 +++---
5 files changed, 30 insertions(+), 30 deletions(-)
hooks/post-receive
--
geos
More information about the geos-commits
mailing list