[geos-commits] [SCM] GEOS branch master updated. 7a30a2650452a1594ebb9d805633b9f0770980ba
git at osgeo.org
git at osgeo.org
Tue Jan 29 13:53:13 PST 2019
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 7a30a2650452a1594ebb9d805633b9f0770980ba (commit)
from af778396870b07582bd0371de66879964be4cbb2 (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 7a30a2650452a1594ebb9d805633b9f0770980ba
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Tue Jan 29 13:52:59 2019 -0800
Clean ups for make dist and build bots
diff --git a/Makefile.am b/Makefile.am
index d4e45d2..8a2176a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,8 +24,8 @@ SUBDIRS = \
BUILT_SOURCES = geos_revision.h
-EXTRA_DIST = acsite.m4 .editorconfig makefile.vc \
- Version.txt nmake.opt autogen.bat CMakeLists.txt \
+EXTRA_DIST = acsite.m4 .editorconfig \
+ Version.txt CMakeLists.txt \
cmake/modules/CheckPrototypeExists.cmake \
cmake/modules/COPYING-CMAKE-SCRIPTS \
cmake/modules/GenerateSourceGroups.cmake \
diff --git a/include/geos/Makefile.am b/include/geos/Makefile.am
index f9fe788..8fa3be0 100644
--- a/include/geos/Makefile.am
+++ b/include/geos/Makefile.am
@@ -16,7 +16,7 @@ SUBDIRS = \
triangulate \
util
-EXTRA_DIST = version.h.vc
+EXTRA_DIST =
geosdir = $(includedir)/geos
diff --git a/include/geos/algorithm/Makefile.am b/include/geos/algorithm/Makefile.am
index 711ffc1..e4c22f1 100644
--- a/include/geos/algorithm/Makefile.am
+++ b/include/geos/algorithm/Makefile.am
@@ -26,6 +26,7 @@ geos_HEADERS = \
InteriorPointPoint.h \
Length.h \
LineIntersector.h \
+ MinimumBoundingCircle.h \
MinimumDiameter.h \
NotRepresentableException.h \
Orientation.h \
diff --git a/include/geos/noding/IntersectionAdder.h b/include/geos/noding/IntersectionAdder.h
index 58d9090..f9b49b3 100644
--- a/include/geos/noding/IntersectionAdder.h
+++ b/include/geos/noding/IntersectionAdder.h
@@ -72,8 +72,8 @@ private:
const geom::Coordinate* properIntersectionPoint;
algorithm::LineIntersector& li;
- bool isSelfIntersection;
- //bool intersectionFound;
+ // bool isSelfIntersection;
+ // bool intersectionFound;
/**
* A trivial intersection is an apparent self-intersection which
diff --git a/include/geos/version.h.vc b/include/geos/version.h.vc
deleted file mode 100644
index 368fcfe..0000000
--- a/include/geos/version.h.vc
+++ /dev/null
@@ -1,48 +0,0 @@
-/**********************************************************************
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.osgeo.org
- *
- * Copyright (C) 2007 Refractions Research Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation.
- * See the COPYING file for more information.
- *
- **********************************************************************
- *
- * This is a version header dedicated for use with Microsoft Visual C++
- * compiler.
- * NOTE: Remember to update this file manually when version
- * number changes.
- *
- **********************************************************************/
-#ifndef GEOS_VERSION_H_INCLUDED
-#define GEOS_VERSION_H_INCLUDED
-
-#ifndef _MSC_VER
-#error "This version.h intended for use with MS Visual C++"
-#endif
-
-#ifndef GEOS_VERSION_MAJOR
-#define GEOS_VERSION_MAJOR 3
-#endif
-
-#ifndef GEOS_VERSION_MINOR
-#define GEOS_VERSION_MINOR 8
-#endif
-
-#ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH 0dev
-#endif
-
-#ifndef GEOS_VERSION
-#define GEOS_VERSION "3.8.0dev"
-#endif
-
-#ifndef GEOS_JTS_PORT
-#define GEOS_JTS_PORT "1.13.0"
-#endif
-
-#endif // GEOS_VERSION_H_INCLUDED
diff --git a/makefile.vc b/makefile.vc
deleted file mode 100644
index 37262a3..0000000
--- a/makefile.vc
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# NMAKE Makefile to build GEOS on Windows
-###############################################################################
-# This makefile.vc delegates making targets to src\makefile.vc
-# so it's just a thin wrapper.
-#
-# Building on Win32 with Visual Studio
-# ------------------------------------
-#
-# 1) Requires Visual C++ 2002 or later
-# 2) Build running command "nmake /f makefile.vc" in top-level directory
-#
-# Produces:
-# src\geos.dll: DLL - only exports the C API
-# src\geos_i.lib: Stub library to link against for use of geos.dll.
-# src\geos.lib: static library for use of C or C++ API.
-###############################################################################
-GEOS_ROOT=.
-!INCLUDE $(GEOS_ROOT)\nmake.opt
-
-default: src_dir
-
-src_dir:
- cd src
- $(MAKE) /f makefile.vc
- cd ..
-
-clean:
- cd src
- $(MAKE) /f makefile.vc clean
- cd ..
diff --git a/src/Makefile.am b/src/Makefile.am
index 27dce43..1bba8e8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ SUBDIRS = \
triangulate \
util
-EXTRA_DIST = Makefile.vc dirlist.mk CMakeLists.txt info.plist.in
+EXTRA_DIST = dirlist.mk CMakeLists.txt info.plist.in
AM_CPPFLAGS = -I$(top_srcdir)/include
diff --git a/src/algorithm/MinimumBoundingCircle.cpp b/src/algorithm/MinimumBoundingCircle.cpp
index f178ae0..0928d66 100644
--- a/src/algorithm/MinimumBoundingCircle.cpp
+++ b/src/algorithm/MinimumBoundingCircle.cpp
@@ -213,7 +213,8 @@ MinimumBoundingCircle::computeCirclePoints()
* at most <tt>pts.length</tt> iterations are required to terminate
* with a correct result.
*/
- for (auto p: pts) {
+ size_t i = 0, n = pts.size();
+ while (i++ < n) {
Coordinate R = pointWithMinAngleWithSegment(pts, P, Q);
// if PRQ is obtuse, then MBC is determined by P and Q
diff --git a/tests/xmltester/makefile.vc b/tests/xmltester/makefile.vc
deleted file mode 100644
index 340871b..0000000
--- a/tests/xmltester/makefile.vc
+++ /dev/null
@@ -1,77 +0,0 @@
-GEOS_ROOT=../..
-
-!IFNDEF XMLTESTER
-XMLTESTER=xmltester.exe
-!ENDIF
-
-SAFE_XMLTESTS= \
- $(GEOS_ROOT)/tests/xmltester/tests/testLeaksBig.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/split.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/hexwkb.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/test.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/linemerge.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/TestIsValid.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/robustness.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/singlesidedbuffer.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/bug176.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/bug188.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/bug244.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/bug275.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestBoundary.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestBuffer.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestBufferMitredJoin.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestCentroid.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestConvexHull.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestConvexHull-big.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionAAPrec.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionAA.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionLAPrec.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionLA.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionLLPrec.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionLL.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionPA.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionPLPrec.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionPL.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionPP.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestInteriorPoint.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestRectanglePredicate.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateAA.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateLA.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateLL.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelatePL.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateAC.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateLC.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelatePA.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelatePP.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestSimple.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestValid.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestValid2.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestValid2-big.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/general/TestWithinDistance.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/stmlf/stmlf-cases-20061020.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/stmlf/stmlf-cases-20070119.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/robust/TestRobustOverlayFixed.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/robust/TestRobustRelate.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/fme.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/TestBufferExternal.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/TestBufferExternal2.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/heisenbugs.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/badguy3.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/hole_from_shell.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/hole_red.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/safe/16595.xml \
- $(GEOS_ROOT)/tests/xmltester/tests/safe/16596.xml
-
-all:
- @echo Usage:
- @echo 1) Run XMLTester.exe program from current directory:
- @echo " nmake /f makefile.vc"
- @echo 2) Run XMLTester.exe program from specified location:
- @echo " nmake /f makefile.vc XMLTESTER=C:\path\to\XMLTester.exe"
- @echo
-
-test:
- @echo ====== Running GEOX XMLTester test cases ======
- @echo ====== XMLTester program: $(XMLTESTER)
- @for %t in ( $(SAFE_XMLTESTS) ) do \
- $(XMLTESTER) %t
-----------------------------------------------------------------------
Summary of changes:
Makefile.am | 4 +-
include/geos/Makefile.am | 2 +-
include/geos/algorithm/Makefile.am | 1 +
include/geos/noding/IntersectionAdder.h | 4 +-
include/geos/version.h.vc | 48 --------------------
makefile.vc | 31 -------------
src/Makefile.am | 2 +-
src/algorithm/MinimumBoundingCircle.cpp | 3 +-
tests/xmltester/makefile.vc | 77 ---------------------------------
9 files changed, 9 insertions(+), 163 deletions(-)
delete mode 100644 include/geos/version.h.vc
delete mode 100644 makefile.vc
delete mode 100644 tests/xmltester/makefile.vc
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list