[geos] 01/04: Merge branch 'experimental'

Bas Couwenberg sebastic at debian.org
Thu Dec 28 09:12:42 UTC 2017


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

sebastic pushed a commit to branch master
in repository geos.

commit e6338ec63a1f0e9add3c3f6ec5b0e5e9019dfdff
Merge: a56f410 5d7b25c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Dec 28 09:49:52 2017 +0100

    Merge branch 'experimental'

 CMakeLists.txt                                     |    62 +-
 ChangeLog                                          | 39010 +++++++++++++------
 Makefile.am                                        |    40 +-
 Makefile.in                                        |    99 +-
 NEWS                                               |   104 +-
 README                                             |   117 +-
 TODO                                               |     2 -
 autogen.bat                                        |     1 +
 capi/Makefile.in                                   |     3 -
 capi/geos_c.cpp                                    |    64 +
 capi/geos_c.h                                      |   246 +-
 capi/geos_c.h.in                                   |   234 +-
 capi/geos_ts_c.cpp                                 |   728 +-
 config.guess                                       |   233 +-
 config.sub                                         |    60 +-
 configure                                          |   322 +-
 configure.ac                                       |    89 +-
 debian/changelog                                   |    30 +
 debian/control                                     |    12 +-
 debian/control.in                                  |     8 +-
 debian/copyright                                   |     4 +-
 debian/gbp.conf                                    |     2 +-
 debian/{libgeos-3.5.1.dirs => libgeos-3.6.2.dirs}  |     0
 ...libgeos-3.5.1.install => libgeos-3.6.2.install} |     0
 ...libgeos-3.5.1.symbols => libgeos-3.6.2.symbols} |   301 +-
 debian/libgeos-c1v5.symbols                        |    33 +-
 ...EOSSimplify-return-on-inner-ring-collapse.patch |   110 -
 debian/patches/libruby                             |     2 +-
 debian/patches/ruby2                               |     4 +-
 debian/patches/series                              |     1 -
 debian/patches/spelling-errors.patch               |     4 +-
 doc/Doxyfile                                       |     2 +-
 doc/Makefile.in                                    |     3 -
 doc/example.cpp                                    |    16 +-
 geos_revision.h                                    |     1 +
 geos_svn_revision.h                                |     1 -
 include/Makefile.in                                |     3 -
 include/geos/Makefile.in                           |     3 -
 include/geos/algorithm/Makefile.in                 |     3 -
 include/geos/algorithm/MinimumDiameter.h           |    45 +
 include/geos/algorithm/SIRtreePointInRing.h        |     1 +
 include/geos/algorithm/distance/Makefile.in        |     3 -
 include/geos/algorithm/locate/Makefile.in          |     3 -
 include/geos/geom/BinaryOp.h                       |     4 +-
 include/geos/geom/Coordinate.h                     |    10 +-
 include/geos/geom/Geometry.h                       |    64 +-
 include/geos/geom/GeometryFactory.h                |   120 +-
 include/geos/geom/LineSegment.h                    |     4 +-
 include/geos/geom/LineString.h                     |    15 +-
 include/geos/geom/Lineal.h                         |    11 +-
 include/geos/geom/Makefile.in                      |     3 -
 include/geos/geom/Polygonal.h                      |    11 +-
 include/geos/geom/Puntal.h                         |    11 +-
 include/geos/geom/prep/Makefile.in                 |     3 -
 include/geos/geom/util/GeometryTransformer.h       |    19 +-
 include/geos/geom/util/Makefile.in                 |     3 -
 include/geos/geomgraph/DirectedEdge.h              |     4 +-
 include/geos/geomgraph/DirectedEdgeStar.h          |     2 +-
 include/geos/geomgraph/EdgeEnd.h                   |     4 +-
 include/geos/geomgraph/EdgeEndStar.h               |    11 +-
 include/geos/geomgraph/Makefile.in                 |     3 -
 include/geos/geomgraph/index/Makefile.in           |     3 -
 include/geos/index/Makefile.in                     |     3 -
 include/geos/index/bintree/Makefile.in             |     3 -
 include/geos/index/chain/Makefile.in               |     3 -
 include/geos/index/intervalrtree/Makefile.in       |     3 -
 include/geos/index/quadtree/Makefile.in            |     3 -
 include/geos/index/strtree/AbstractSTRtree.h       |     8 +-
 include/geos/index/strtree/BoundablePair.h         |   114 +
 include/geos/index/strtree/GeometryItemDistance.h  |    45 +
 include/geos/index/strtree/ItemDistance.h          |    44 +
 include/geos/index/strtree/Makefile.am             |     3 +
 include/geos/index/strtree/Makefile.in             |     6 +-
 include/geos/index/strtree/STRtree.h               |     7 +
 include/geos/index/sweepline/Makefile.in           |     3 -
 include/geos/io/Makefile.in                        |     3 -
 include/geos/linearref/Makefile.in                 |     3 -
 include/geos/noding/Makefile.in                    |     3 -
 include/geos/noding/snapround/Makefile.in          |     3 -
 include/geos/operation/Makefile.in                 |     3 -
 include/geos/operation/buffer/Makefile.in          |     3 -
 include/geos/operation/distance/FacetSequence.h    |    66 +
 .../operation/distance/FacetSequenceTreeBuilder.h  |    52 +
 include/geos/operation/distance/Makefile.am        |     2 +
 include/geos/operation/distance/Makefile.in        |     5 +-
 include/geos/operation/intersection/Makefile.in    |     3 -
 include/geos/operation/linemerge/Makefile.in       |     3 -
 include/geos/operation/overlay/Makefile.in         |     3 -
 .../operation/overlay/snap/LineStringSnapper.h     |     6 +-
 include/geos/operation/overlay/snap/Makefile.in    |     3 -
 include/geos/operation/polygonize/Makefile.in      |     3 -
 include/geos/operation/predicate/Makefile.in       |     3 -
 include/geos/operation/relate/Makefile.in          |     3 -
 include/geos/operation/sharedpaths/Makefile.in     |     3 -
 .../geos/operation/union/CascadedPolygonUnion.h    |    11 +
 include/geos/operation/union/GeometryListHolder.h  |     2 +-
 include/geos/operation/union/Makefile.in           |     3 -
 .../geos/operation/valid/ConnectedInteriorTester.h |     3 +-
 include/geos/operation/valid/Makefile.in           |     3 -
 include/geos/planargraph/Makefile.in               |     3 -
 include/geos/planargraph/algorithm/Makefile.in     |     3 -
 include/geos/precision/GeometryPrecisionReducer.h  |     3 +-
 include/geos/precision/Makefile.am                 |     1 +
 include/geos/precision/Makefile.in                 |     4 +-
 include/geos/precision/MinimumClearance.h          |    60 +
 include/geos/simplify/Makefile.in                  |     3 -
 include/geos/timeval.h                             |    12 +
 include/geos/triangulate/Makefile.in               |     3 -
 include/geos/triangulate/quadedge/Makefile.in      |     3 -
 include/geos/triangulate/quadedge/Vertex.h         |    16 +-
 include/geos/util/GEOSException.h                  |     3 +-
 include/geos/util/Makefile.in                      |     3 -
 include/geos/version.h.vc                          |     8 +-
 install-sh                                         |   373 +-
 ltmain.sh                                          |     4 +-
 macros/Makefile.in                                 |     3 -
 macros/libtool.m4                                  |     1 -
 macros/python.m4                                   |   127 +-
 nmake.opt                                          |     9 +
 php/Makefile.am                                    |    62 -
 php/Makefile.in                                    |   886 -
 php/README                                         |    48 -
 php/TODO                                           |    11 -
 php/geos.c                                         |  2936 --
 php/php_geos.h                                     |    41 -
 php/test/Makefile.am                               |    52 -
 php/test/Makefile.in                               |   914 -
 php/test/crashme.php                               |    25 -
 php/test/test.php                                  |  2378 --
 py-compile                                         |     2 +-
 src/CMakeLists.txt                                 |    52 +-
 src/Makefile.in                                    |     3 -
 src/Makefile.vc                                    |    31 +-
 src/algorithm/CGAlgorithms.cpp                     |    20 +-
 src/algorithm/Centroid.cpp                         |    14 +-
 src/algorithm/LineIntersector.cpp                  |    43 +-
 src/algorithm/Makefile.in                          |     3 -
 src/algorithm/MinimumDiameter.cpp                  |   149 +-
 src/algorithm/RobustDeterminant.cpp                |     3 +-
 src/algorithm/SIRtreePointInRing.cpp               |     5 +
 src/algorithm/distance/Makefile.in                 |     3 -
 src/algorithm/locate/IndexedPointInAreaLocator.cpp |     4 +-
 src/algorithm/locate/Makefile.in                   |     3 -
 src/geom/Coordinate.cpp                            |     6 +-
 src/geom/Geometry.cpp                              |    26 +-
 src/geom/GeometryFactory.cpp                       |    97 +-
 src/geom/IntersectionMatrix.cpp                    |     6 +-
 src/geom/LineSegment.cpp                           |     4 +-
 src/geom/Makefile.in                               |     3 -
 src/geom/prep/Makefile.in                          |     3 -
 src/geom/util/GeometryEditor.cpp                   |    11 +-
 src/geom/util/GeometryTransformer.cpp              |    16 +-
 src/geom/util/Makefile.in                          |     3 -
 src/geomgraph/DirectedEdge.cpp                     |     4 +-
 src/geomgraph/DirectedEdgeStar.cpp                 |     2 +-
 src/geomgraph/EdgeEnd.cpp                          |     2 +-
 src/geomgraph/EdgeEndStar.cpp                      |    38 +-
 src/geomgraph/Makefile.in                          |     3 -
 src/geomgraph/index/Makefile.in                    |     3 -
 src/index/Makefile.in                              |     3 -
 src/index/bintree/Makefile.in                      |     3 -
 src/index/chain/Makefile.in                        |     3 -
 src/index/intervalrtree/Makefile.in                |     3 -
 src/index/quadtree/Makefile.in                     |     3 -
 src/index/strtree/AbstractSTRtree.cpp              |     7 +-
 src/index/strtree/BoundablePair.cpp                |   109 +
 src/index/strtree/GeometryItemDistance.cpp         |    30 +
 src/index/strtree/Makefile.am                      |     4 +-
 src/index/strtree/Makefile.in                      |    12 +-
 src/index/strtree/STRtree.cpp                      |    86 +
 src/index/sweepline/Makefile.in                    |     3 -
 src/io/Makefile.in                                 |     3 -
 src/io/WKBWriter.cpp                               |     5 +
 src/io/WKTReader.cpp                               |    59 +-
 src/io/WKTWriter.cpp                               |     2 +-
 src/linearref/ExtractLineByLocation.cpp            |     2 +-
 src/linearref/Makefile.in                          |     3 -
 src/noding/Makefile.in                             |     3 -
 src/noding/snapround/HotPixel.cpp                  |     8 +-
 src/noding/snapround/Makefile.in                   |     3 -
 src/operation/Makefile.in                          |     3 -
 src/operation/buffer/BufferBuilder.cpp             |    47 +-
 src/operation/buffer/BufferOp.cpp                  |     8 +-
 src/operation/buffer/Makefile.in                   |     3 -
 src/operation/distance/FacetSequence.cpp           |   117 +
 .../distance/FacetSequenceTreeBuilder.cpp          |    76 +
 src/operation/distance/Makefile.am                 |     2 +
 src/operation/distance/Makefile.in                 |    11 +-
 src/operation/intersection/Makefile.in             |     3 -
 .../intersection/RectangleIntersectionBuilder.cpp  |     3 -
 src/operation/linemerge/Makefile.in                |     3 -
 src/operation/overlay/Makefile.in                  |     3 -
 src/operation/overlay/OverlayOp.cpp                |     5 +
 src/operation/overlay/PolygonBuilder.cpp           |     2 +-
 src/operation/overlay/snap/GeometrySnapper.cpp     |    14 +-
 src/operation/overlay/snap/LineStringSnapper.cpp   |    10 +-
 .../overlay/validate/OverlayResultValidator.cpp    |     2 +-
 src/operation/polygonize/Makefile.in               |     3 -
 src/operation/predicate/Makefile.in                |     3 -
 src/operation/relate/Makefile.in                   |     3 -
 src/operation/relate/RelateComputer.cpp            |    19 +
 src/operation/sharedpaths/Makefile.in              |     3 -
 src/operation/union/CascadedPolygonUnion.cpp       |   184 +-
 src/operation/union/CascadedUnion.cpp              |     3 +-
 src/operation/union/Makefile.in                    |     3 -
 src/operation/valid/ConnectedInteriorTester.cpp    |     5 +-
 src/operation/valid/Makefile.in                    |     3 -
 src/planargraph/Makefile.in                        |     3 -
 src/precision/GeometryPrecisionReducer.cpp         |     8 +-
 src/precision/Makefile.am                          |     1 +
 src/precision/Makefile.in                          |     7 +-
 src/precision/MinimumClearance.cpp                 |   186 +
 src/simplify/DouglasPeuckerSimplifier.cpp          |     9 +-
 src/simplify/Makefile.in                           |     3 -
 src/triangulate/Makefile.in                        |     3 -
 src/triangulate/quadedge/Makefile.in               |     3 -
 src/triangulate/quadedge/Vertex.cpp                |    19 +-
 src/util/Makefile.in                               |     3 -
 swig/Makefile.in                                   |     3 -
 swig/geos.i                                        |    12 +-
 swig/python/Makefile.in                            |     3 -
 swig/python/tests/Makefile.in                      |     3 -
 swig/ruby/Makefile.in                              |     3 -
 swig/ruby/test/Makefile.in                         |     3 -
 test-driver                                        |    15 +-
 tests/Makefile.in                                  |     3 -
 tests/bigtest/Makefile.in                          |     3 -
 tests/bigtest/TestSweepLineSpeed.cpp               |     5 +-
 tests/bigtest/bug234.cpp                           |    12 +-
 tests/geostest/Makefile.in                         |     3 -
 tests/perf/Makefile.am                             |     4 +-
 tests/perf/Makefile.in                             |     7 +-
 tests/perf/capi/Makefile.in                        |     3 -
 tests/perf/operation/Makefile.in                   |     3 -
 .../operation/buffer/IteratedBufferStressTest.cpp  |     4 +-
 tests/perf/operation/buffer/Makefile.in            |     3 -
 tests/perf/operation/predicate/Makefile.in         |     3 -
 .../predicate/RectangleIntersectsPerfTest.cpp      |     8 +-
 tests/thread/Makefile.in                           |     3 -
 tests/unit/Makefile.am                             |    17 +-
 tests/unit/Makefile.in                             |    71 +-
 tests/unit/algorithm/ConvexHullTest.cpp            |     7 +-
 tests/unit/algorithm/MinimumDiameterTest.cpp       |   236 +
 tests/unit/algorithm/PointLocatorTest.cpp          |     4 +-
 .../unit/algorithm/RobustLineIntersectionTest.cpp  |     8 +-
 tests/unit/algorithm/RobustLineIntersectorTest.cpp |    11 +-
 .../distance/DiscreteHausdorffDistanceTest.cpp     |     8 +-
 tests/unit/capi/GEOSContainsTest.cpp               |   105 +
 tests/unit/capi/GEOSEqualsTest.cpp                 |   186 +
 tests/unit/capi/GEOSGeom_setPrecisionTest.cpp      |   186 +
 tests/unit/capi/GEOSMinimumClearanceTest.cpp       |   132 +
 tests/unit/capi/GEOSMinimumRectangleTest.cpp       |    84 +
 tests/unit/capi/GEOSMinimumWidthTest.cpp           |    99 +
 tests/unit/capi/GEOSPreparedGeometryTest.cpp       |   116 +-
 tests/unit/capi/GEOSSTRtreeTest.cpp                |   236 +
 tests/unit/capi/GEOSUserDataTest.cpp               |   105 +
 tests/unit/geom/Geometry/clone.cpp                 |     6 +-
 tests/unit/geom/Geometry/coversTest.cpp            |     7 +-
 tests/unit/geom/Geometry/equalsTest.cpp            |     3 +-
 tests/unit/geom/Geometry/isRectangleTest.cpp       |     3 -
 tests/unit/geom/Geometry/normalize.cpp             |     4 +-
 tests/unit/geom/GeometryFactoryTest.cpp            |   276 +-
 tests/unit/geom/LineStringTest.cpp                 |    64 +-
 tests/unit/geom/LinearRingTest.cpp                 |    27 +-
 tests/unit/geom/MultiPointTest.cpp                 |    28 +-
 tests/unit/geom/PointTest.cpp                      |    64 +-
 tests/unit/geom/PolygonTest.cpp                    |    33 +-
 .../unit/geom/prep/PreparedGeometryFactoryTest.cpp |    37 +-
 tests/unit/geom/util/GeometryExtracterTest.cpp     |     6 +-
 tests/unit/io/WKBReaderTest.cpp                    |    24 +-
 tests/unit/io/WKBWriterTest.cpp                    |    37 +-
 tests/unit/io/WKTReaderTest.cpp                    |    33 +-
 tests/unit/io/WKTWriterTest.cpp                    |    10 +-
 tests/unit/linearref/LengthIndexedLineTest.cpp     |     4 +-
 tests/unit/noding/OrientedCoordinateArray.cpp      |     8 +-
 .../noding/snapround/MCIndexSnapRounderTest.cpp    |     8 +-
 tests/unit/operation/IsSimpleOpTest.cpp            |     8 +-
 tests/unit/operation/buffer/BufferBuilderTest.cpp  |     6 +-
 tests/unit/operation/buffer/BufferOpTest.cpp       |     6 +-
 tests/unit/operation/distance/DistanceOpTest.cpp   |     8 +-
 .../intersection/RectangleIntersectionTest.cpp     |     5 +-
 tests/unit/operation/linemerge/LineMergerTest.cpp  |    46 +-
 .../unit/operation/linemerge/LineSequencerTest.cpp |     3 +-
 .../unit/operation/overlay/OverlayOpUnionTest.cpp  |    66 +
 .../operation/overlay/snap/GeometrySnapperTest.cpp |     5 +-
 .../overlay/validate/FuzzyPointLocatorTest.cpp     |     6 +-
 .../overlay/validate/OffsetPointGeneratorTest.cpp  |     4 +-
 .../validate/OverlayResultValidatorTest.cpp        |     4 +-
 tests/unit/operation/polygonize/PolygonizeTest.cpp |     4 +-
 .../operation/sharedpaths/SharedPathsOpTest.cpp    |     3 +-
 .../operation/union/CascadedPolygonUnionTest.cpp   |     6 +-
 tests/unit/operation/union/UnaryUnionOpTest.cpp    |     9 +-
 tests/unit/operation/valid/IsValidTest.cpp         |     7 +-
 tests/unit/operation/valid/ValidClosedRingTest.cpp |     7 +-
 .../valid/ValidSelfTouchingRingFormingHoleTest.cpp |     7 +-
 .../precision/GeometryPrecisionReducerTest.cpp     |    17 +-
 .../SimpleGeometryPrecisionReducerTest.cpp         |     7 +-
 .../unit/simplify/DouglasPeuckerSimplifierTest.cpp |    67 +-
 .../simplify/TopologyPreservingSimplifierTest.cpp  |     8 +-
 tests/unit/triangulate/DelaunayTest.cpp            |     4 +-
 tests/unit/triangulate/VoronoiTest.cpp             |     2 +-
 .../quadedge/QuadEdgeSubdivisionTest.cpp           |    14 +-
 tests/unit/tut/tut.hpp                             |   141 +-
 tests/unit/tut/tut_assert.hpp                      |   155 +-
 tests/unit/tut/tut_config.hpp                      |     6 +
 tests/unit/tut/tut_console_reporter.hpp            |   103 +-
 tests/unit/tut/tut_cppunit_reporter.hpp            |   218 +
 tests/unit/tut/tut_exception.hpp                   |    94 +-
 tests/unit/tut/tut_fpt.hpp                         |   181 +
 tests/unit/tut/tut_macros.hpp                      |    71 +
 tests/unit/tut/tut_main.hpp                        |   111 +
 tests/unit/tut/tut_posix.hpp                       |    69 +-
 tests/unit/tut/tut_reporter.hpp                    |     2 +-
 tests/unit/tut/tut_restartable.hpp                 |     9 +-
 tests/unit/tut/tut_result.hpp                      |    84 +-
 tests/unit/tut/tut_runner.hpp                      |    55 +-
 tests/unit/tut/tut_xml_reporter.hpp                |   310 +
 .../unit/util/UniqueCoordinateArrayFilterTest.cpp  |     7 +-
 tests/xmltester/Makefile.am                        |    12 +-
 tests/xmltester/Makefile.in                        |    13 +-
 tests/xmltester/SimpleWKTTester.cpp                |     4 +-
 tests/xmltester/XMLTester.cpp                      |   196 +-
 tests/xmltester/XMLTester.h                        |     3 +-
 .../tests/general/TestPreparedPointPredicate.xml   |    34 +
 .../tests/general/TestPreparedPolygonPredicate.xml |   191 +
 ...estPreparedPredicatesWithGeometryCollection.xml |    81 +
 tests/xmltester/tests/ticket/bug837.xml            |    16 +
 tools/CMakeLists.txt                               |     2 +-
 tools/Makefile.am                                  |     2 +-
 tools/Makefile.in                                  |     5 +-
 tools/geos-config.in                               |     4 +-
 tools/{svn_repo_revision.sh => repo_revision.sh}   |    30 +-
 332 files changed, 35513 insertions(+), 21875 deletions(-)


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



More information about the Pkg-grass-devel mailing list