Mercurial > mxe-octave

annotate src/geos-1-fixes.patch @ 1703:24f0e217a254

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
package geos: gcc 4.6 compatibility
author Mark Brand <mabrand@mabrand.nl>
date Sat, 26 Mar 2011 11:29:37 +0100
parents
children 9e49c835d73e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1703
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 See doc/index.html for further information.
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 From d63201ebcc9c6e186660a70973e2fb485fb2c681 Mon Sep 17 00:00:00 2001
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 From: mingw-cross-env
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 Date: Sat, 26 Mar 2011 10:13:26 +0100
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 Subject: [PATCH 1/3] fix missing size_t
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 diff --git a/source/headers/geos/geom/CoordinateArraySequenceFactory.h b/source/headers/geos/geom/CoordinateArraySequenceFactory.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13 index 1f19e09..9bcf835 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 --- a/source/headers/geos/geom/CoordinateArraySequenceFactory.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15 +++ b/source/headers/geos/geom/CoordinateArraySequenceFactory.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 @@ -51,10 +51,10 @@ public:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18 CoordinateSequence *create(std::vector<Coordinate> *coords) const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 - CoordinateSequence *create(std::vector<Coordinate> *coords, size_t dims) const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 + CoordinateSequence *create(std::vector<Coordinate> *coords, std::size_t dims) const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 /** @see CoordinateSequenceFactory::create(size_t, int) */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 - CoordinateSequence *create(size_t size, size_t dimension=3) const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 + CoordinateSequence *create(std::size_t size, std::size_t dimension=3) const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 /** \brief
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 * Returns the singleton instance of CoordinateArraySequenceFactory
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 diff --git a/source/headers/geos/geom/CoordinateSequence.h b/source/headers/geos/geom/CoordinateSequence.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 index fd1da03..c9f1277 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 --- a/source/headers/geos/geom/CoordinateSequence.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 +++ b/source/headers/geos/geom/CoordinateSequence.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 @@ -95,7 +95,7 @@ public:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 * Coordinate or merely a copy depends on the implementation.
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 //virtual const Coordinate& getCoordinate(int i) const=0;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 - virtual const Coordinate& getAt(size_t i) const=0;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 + virtual const Coordinate& getAt(std::size_t i) const=0;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 /// Return last Coordinate in the sequence
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 const Coordinate& back() const {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 diff --git a/source/headers/geos/geom/CoordinateSequenceFactory.h b/source/headers/geos/geom/CoordinateSequenceFactory.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43 index 6441d94..50ddc48 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 --- a/source/headers/geos/geom/CoordinateSequenceFactory.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 +++ b/source/headers/geos/geom/CoordinateSequenceFactory.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 @@ -75,8 +75,8 @@ public:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47 * @param dimension the dimension of the coordinates in the sequence
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 * (if user-specifiable, otherwise ignored)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49 */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 - virtual CoordinateSequence *create(size_t size,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 - size_t dimension) const=0;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 + virtual CoordinateSequence *create(std::size_t size,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 + std::size_t dimension) const=0;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 virtual ~CoordinateSequenceFactory();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 };
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 diff --git a/source/headers/geos/index/chain/MonotoneChainBuilder.h b/source/headers/geos/index/chain/MonotoneChainBuilder.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 index 7c27e83..e227559 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 --- a/source/headers/geos/index/chain/MonotoneChainBuilder.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 +++ b/source/headers/geos/index/chain/MonotoneChainBuilder.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 @@ -97,8 +97,8 @@ private:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 *
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 * NOTE: aborts if 'start' is >= pts.getSize()
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64 */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65 - static size_t findChainEnd(const geom::CoordinateSequence& pts,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 - size_t start);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67 + static std::size_t findChainEnd(const geom::CoordinateSequence& pts,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68 + std::size_t start);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69 };
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
71 } // namespace geos::index::chain
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
72 diff --git a/source/headers/geos/planargraph/DirectedEdgeStar.h b/source/headers/geos/planargraph/DirectedEdgeStar.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73 index cc36ca7..c15b0a0 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74 --- a/source/headers/geos/planargraph/DirectedEdgeStar.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
75 +++ b/source/headers/geos/planargraph/DirectedEdgeStar.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
76 @@ -86,7 +86,7 @@ public:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
77 * \brief Returns the number of edges around the Node associated
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
78 * with this DirectedEdgeStar.
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
79 */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
80 - size_t getDegree() const { return outEdges.size(); }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
81 + std::size_t getDegree() const { return outEdges.size(); }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
82
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
83 /**
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
84 * \brief Returns the coordinate for the node at wich this
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
85 diff --git a/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h b/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
86 index 5dd0412..f6fd1ef 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
87 --- a/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
88 +++ b/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
89 @@ -81,7 +81,7 @@ private:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
90 BoolVectAutoPtr usePt;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
91 double distanceTolerance;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
92
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
93 - void simplifySection(size_t i, size_t j);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
94 + void simplifySection(std::size_t i, std::size_t j);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
95
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
96 // Declare type as noncopyable
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
97 DouglasPeuckerLineSimplifier(const DouglasPeuckerLineSimplifier& other);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
98 diff --git a/source/headers/geos/simplify/TaggedLineString.h b/source/headers/geos/simplify/TaggedLineString.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
99 index 49af2ba..8078eb3 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
100 --- a/source/headers/geos/simplify/TaggedLineString.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
101 +++ b/source/headers/geos/simplify/TaggedLineString.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
102 @@ -66,11 +66,11 @@ public:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
103 typedef std::auto_ptr<geom::CoordinateSequence> CoordSeqPtr;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
104
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
105 TaggedLineString(const geom::LineString* nParentLine,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
106 - size_t minimumSize=2);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
107 + std::size_t minimumSize=2);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
108
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
109 ~TaggedLineString();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
110
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
111 - size_t getMinimumSize() const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
112 + std::size_t getMinimumSize() const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
113
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
114 const geom::LineString* getParent() const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
115
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
116 @@ -78,11 +78,11 @@ public:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
117
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
118 CoordSeqPtr getResultCoordinates() const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
119
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
120 - size_t getResultSize() const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
121 + std::size_t getResultSize() const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
122
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
123 - TaggedLineSegment* getSegment(size_t);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
124 + TaggedLineSegment* getSegment(std::size_t x);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
125
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
126 - const TaggedLineSegment* getSegment(size_t) const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
127 + const TaggedLineSegment* getSegment(std::size_t x) const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
128
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
129 std::vector<TaggedLineSegment*>& getSegments();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
130
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
131 @@ -104,7 +104,7 @@ private:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
132 // TaggedLineSegments owned by this object
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
133 std::vector<TaggedLineSegment*> resultSegs;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
134
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
135 - size_t minimumSize;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
136 + std::size_t minimumSize;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
137
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
138 void init();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
139
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
140 diff --git a/source/headers/geos/simplify/TaggedLineStringSimplifier.h b/source/headers/geos/simplify/TaggedLineStringSimplifier.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
141 index 8ab8507..e54f3e5 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
142 --- a/source/headers/geos/simplify/TaggedLineStringSimplifier.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
143 +++ b/source/headers/geos/simplify/TaggedLineStringSimplifier.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
144 @@ -92,20 +92,20 @@ private:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
145
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
146 double distanceTolerance;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
147
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
148 - void simplifySection(size_t i, size_t j,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
149 - size_t depth);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
150 + void simplifySection(std::size_t i, std::size_t j,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
151 + std::size_t depth);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
152
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
153 - static size_t findFurthestPoint(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
154 + static std::size_t findFurthestPoint(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
155 const geom::CoordinateSequence* pts,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
156 - size_t i, size_t j,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
157 + std::size_t i, std::size_t j,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
158 double& maxDistance);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
159
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
160 bool hasBadIntersection(const TaggedLineString* parentLine,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
161 - const std::vector<size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
162 + const std::vector<std::size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
163 const geom::LineSegment& candidateSeg);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
164
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
165 bool hasBadInputIntersection(const TaggedLineString* parentLine,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
166 - const std::vector<size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
167 + const std::vector<std::size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
168 const geom::LineSegment& candidateSeg);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
169
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
170 bool hasBadOutputIntersection(const geom::LineSegment& candidateSeg);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
171 @@ -114,7 +114,7 @@ private:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
172 const geom::LineSegment& seg1) const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
173
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
174 std::auto_ptr<TaggedLineSegment> flatten(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
175 - size_t start, size_t end);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
176 + std::size_t start, std::size_t end);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
177
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
178 /** \brief
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
179 * Tests whether a segment is in a section of a TaggedLineString
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
180 @@ -126,7 +126,7 @@ private:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
181 */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
182 static bool isInLineSection(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
183 const TaggedLineString* parentLine,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
184 - const std::vector<size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
185 + const std::vector<std::size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
186 const TaggedLineSegment* seg);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
187
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
188 /** \brief
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
189 @@ -138,8 +138,8 @@ private:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
190 * @param sectionEndIndex
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
191 */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
192 void remove(const TaggedLineString* line,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
193 - size_t start,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
194 - size_t end);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
195 + std::size_t start,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
196 + std::size_t end);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
197
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
198 };
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
199
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
200 diff --git a/source/index/chain/MonotoneChainBuilder.cpp b/source/index/chain/MonotoneChainBuilder.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
201 index 8448431..4dcc571 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
202 --- a/source/index/chain/MonotoneChainBuilder.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
203 +++ b/source/index/chain/MonotoneChainBuilder.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
204 @@ -56,13 +56,13 @@ void
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
205 MonotoneChainBuilder::getChains(const CoordinateSequence* pts, void* context,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
206 vector<MonotoneChain*>& mcList)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
207 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
208 - vector<size_t> startIndex;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
209 + vector<std::size_t> startIndex;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
210 getChainStartIndices(*pts, startIndex);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
211 - size_t nindexes = startIndex.size();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
212 + std::size_t nindexes = startIndex.size();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
213 if (nindexes > 0)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
214 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
215 - size_t n = nindexes - 1;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
216 - for(size_t i = 0; i < n; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
217 + std::size_t n = nindexes - 1;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
218 + for(std::size_t i = 0; i < n; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
219 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
220 MonotoneChain* mc = new MonotoneChain(*pts, startIndex[i], startIndex[i+1], context);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
221 mcList.push_back(mc);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
222 @@ -73,16 +73,16 @@ MonotoneChainBuilder::getChains(const CoordinateSequence* pts, void* context,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
223 /* static public */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
224 void
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
225 MonotoneChainBuilder::getChainStartIndices(const CoordinateSequence& pts,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
226 - vector<size_t>& startIndexList)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
227 + vector<std::size_t>& startIndexList)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
228 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
229 // find the startpoint (and endpoints) of all monotone chains
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
230 // in this edge
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
231 - size_t start = 0;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
232 + std::size_t start = 0;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
233 startIndexList.push_back(start);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
234 - const size_t n = pts.getSize() - 1;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
235 + const std::size_t n = pts.getSize() - 1;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
236 do
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
237 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
238 - size_t last = findChainEnd(pts, start);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
239 + std::size_t last = findChainEnd(pts, start);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
240 startIndexList.push_back(last);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
241 start = last;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
242 } while (start < n);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
243 @@ -90,17 +90,17 @@ MonotoneChainBuilder::getChainStartIndices(const CoordinateSequence& pts,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
244 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
245
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
246 /* private static */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
247 -size_t
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
248 -MonotoneChainBuilder::findChainEnd(const CoordinateSequence& pts, size_t start)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
249 +std::size_t
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
250 +MonotoneChainBuilder::findChainEnd(const CoordinateSequence& pts, std::size_t start)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
251 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
252
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
253 - const size_t npts = pts.getSize(); // cache
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
254 + const std::size_t npts = pts.getSize(); // cache
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
255
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
256 assert(start < npts);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
257 assert(npts); // should be implied by the assertion above,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
258 // 'start' being unsigned
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
259
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
260 - size_t safeStart = start;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
261 + std::size_t safeStart = start;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
262
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
263 // skip any zero-length segments at the start of the sequence
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
264 // (since they cannot be used to establish a quadrant)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
265 @@ -119,7 +119,7 @@ MonotoneChainBuilder::findChainEnd(const CoordinateSequence& pts, size_t start)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
266 // (which is the starting quadrant)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
267 int chainQuad = Quadrant::quadrant(pts[safeStart],
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
268 pts[safeStart + 1]);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
269 - size_t last = start + 1;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
270 + std::size_t last = start + 1;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
271 while (last < npts)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
272 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
273 // skip zero-length segments, but include them in the chain
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
274 diff --git a/source/simplify/DouglasPeuckerLineSimplifier.cpp b/source/simplify/DouglasPeuckerLineSimplifier.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
275 index 29761c2..67cbae9 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
276 --- a/source/simplify/DouglasPeuckerLineSimplifier.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
277 +++ b/source/simplify/DouglasPeuckerLineSimplifier.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
278 @@ -68,7 +68,7 @@ DouglasPeuckerLineSimplifier::simplify()
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
279 usePt = BoolVectAutoPtr(new BoolVect(pts.size(), true));
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
280 simplifySection(0, pts.size() - 1);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
281
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
282 - for (size_t i=0, n=pts.size(); i<n; ++i)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
283 + for (std::size_t i=0, n=pts.size(); i<n; ++i)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
284 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
285 if ( usePt->operator[](i) )
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
286 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
287 @@ -84,17 +84,17 @@ DouglasPeuckerLineSimplifier::simplify()
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
288 /*private*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
289 void
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
290 DouglasPeuckerLineSimplifier::simplifySection(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
291 - size_t i,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
292 - size_t j)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
293 + std::size_t i,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
294 + std::size_t j)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
295 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
296 if ( (i+1) == j ) return;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
297
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
298 geos::geom::LineSegment seg(pts[i], pts[j]);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
299 double maxDistance = -1.0;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
300
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
301 - size_t maxIndex = i;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
302 + std::size_t maxIndex = i;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
303
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
304 - for (size_t k=i+1; k<j; k++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
305 + for (std::size_t k=i+1; k<j; k++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
306 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
307 double distance = seg.distance(pts[k]);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
308 if (distance > maxDistance) {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
309 @@ -103,7 +103,7 @@ DouglasPeuckerLineSimplifier::simplifySection(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
310 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
311 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
312 if (maxDistance <= distanceTolerance) {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
313 - for(size_t k =i+1; k<j; k++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
314 + for(std::size_t k =i+1; k<j; k++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
315 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
316 usePt->operator[](k) = false;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
317 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
318 diff --git a/source/simplify/TaggedLineString.cpp b/source/simplify/TaggedLineString.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
319 index 3d1fcbc..bbf3c9d 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
320 --- a/source/simplify/TaggedLineString.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
321 +++ b/source/simplify/TaggedLineString.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
322 @@ -44,7 +44,7 @@ namespace simplify { // geos::simplify
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
323
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
324 /*public*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
325 TaggedLineString::TaggedLineString(const geom::LineString* nParentLine,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
326 - size_t nMinimumSize)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
327 + std::size_t nMinimumSize)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
328 :
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
329 parentLine(nParentLine),
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
330 minimumSize(nMinimumSize)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
331 @@ -60,10 +60,10 @@ TaggedLineString::~TaggedLineString()
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
332 << endl;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
333 #endif
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
334
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
335 - for (size_t i=0, n=segs.size(); i<n; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
336 + for (std::size_t i=0, n=segs.size(); i<n; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
337 delete segs[i];
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
338
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
339 - for (size_t i=0, n=resultSegs.size(); i<n; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
340 + for (std::size_t i=0, n=resultSegs.size(); i<n; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
341 delete resultSegs[i];
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
342 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
343
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
344 @@ -81,7 +81,7 @@ TaggedLineString::init()
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
345
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
346 segs.reserve(pts->size()-1);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
347
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
348 - for (size_t i=0, n=pts->size()-1; i<n; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
349 + for (std::size_t i=0, n=pts->size()-1; i<n; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
350 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
351 TaggedLineSegment* seg = new TaggedLineSegment(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
352 pts->getAt(i),
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
353 @@ -100,7 +100,7 @@ TaggedLineString::init()
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
354 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
355
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
356 /*public*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
357 -size_t
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
358 +std::size_t
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
359 TaggedLineString::getMinimumSize() const
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
360 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
361 return minimumSize;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
362 @@ -155,7 +155,7 @@ TaggedLineString::extractCoordinates(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
363 cerr << __FUNCTION__ << " segs.size: " << segs.size() << endl;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
364 #endif
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
365
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
366 - size_t i=0, size=segs.size();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
367 + std::size_t i=0, size=segs.size();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
368
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
369 assert(size);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
370
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
371 @@ -173,7 +173,7 @@ TaggedLineString::extractCoordinates(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
372 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
373
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
374 /*public*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
375 -size_t
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
376 +std::size_t
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
377 TaggedLineString::getResultSize() const
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
378 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
379 unsigned resultSegsSize = resultSegs.size();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
380 @@ -182,14 +182,14 @@ TaggedLineString::getResultSize() const
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
381
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
382 /*public*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
383 TaggedLineSegment*
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
384 -TaggedLineString::getSegment(size_t i)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
385 +TaggedLineString::getSegment(std::size_t i)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
386 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
387 return segs[i];
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
388 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
389
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
390 /*public*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
391 const TaggedLineSegment*
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
392 -TaggedLineString::getSegment(size_t i) const
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
393 +TaggedLineString::getSegment(std::size_t i) const
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
394 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
395 return segs[i];
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
396 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
397 diff --git a/source/simplify/TaggedLineStringSimplifier.cpp b/source/simplify/TaggedLineStringSimplifier.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
398 index 5981b7a..025e41d 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
399 --- a/source/simplify/TaggedLineStringSimplifier.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
400 +++ b/source/simplify/TaggedLineStringSimplifier.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
401 @@ -83,8 +83,8 @@ TaggedLineStringSimplifier::simplify(TaggedLineString* nLine)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
402
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
403 /*private*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
404 void
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
405 -TaggedLineStringSimplifier::simplifySection(size_t i,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
406 - size_t j, size_t depth)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
407 +TaggedLineStringSimplifier::simplifySection(std::size_t i,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
408 + std::size_t j, std::size_t depth)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
409 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
410 depth += 1;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
411
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
412 @@ -94,7 +94,7 @@ TaggedLineStringSimplifier::simplifySection(size_t i,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
413 << std::endl;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
414 #endif
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
415
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
416 - vector<size_t> sectionIndex(2);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
417 + vector<std::size_t> sectionIndex(2);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
418
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
419 if((i+1) == j)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
420 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
421 @@ -124,7 +124,7 @@ TaggedLineStringSimplifier::simplifySection(size_t i,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
422 */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
423 if (line->getResultSize() < line->getMinimumSize())
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
424 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
425 - size_t worstCaseSize = depth + 1;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
426 + std::size_t worstCaseSize = depth + 1;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
427 if (worstCaseSize < line->getMinimumSize())
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
428 isValidToSimplify = false;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
429 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
430 @@ -132,7 +132,7 @@ TaggedLineStringSimplifier::simplifySection(size_t i,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
431 double distance;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
432
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
433 // pass distance by ref
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
434 - size_t furthestPtIndex = findFurthestPoint(linePts, i, j, distance);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
435 + std::size_t furthestPtIndex = findFurthestPoint(linePts, i, j, distance);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
436
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
437 #if GEOS_DEBUG
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
438 std::cerr << "furthest point " << furthestPtIndex
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
439 @@ -176,7 +176,7 @@ TaggedLineStringSimplifier::simplifySection(size_t i,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
440
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
441 /*private*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
442 auto_ptr<TaggedLineSegment>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
443 -TaggedLineStringSimplifier::flatten(size_t start, size_t end)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
444 +TaggedLineStringSimplifier::flatten(std::size_t start, std::size_t end)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
445 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
446 // make a new segment for the simplified geometry
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
447 const Coordinate& p0 = linePts->getAt(start);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
448 @@ -192,7 +192,7 @@ TaggedLineStringSimplifier::flatten(size_t start, size_t end)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
449 bool
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
450 TaggedLineStringSimplifier::hasBadIntersection(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
451 const TaggedLineString* parentLine,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
452 - const vector<size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
453 + const vector<std::size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
454 const LineSegment& candidateSeg)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
455 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
456 if (hasBadOutputIntersection(candidateSeg))
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
457 @@ -242,7 +242,7 @@ TaggedLineStringSimplifier::hasInteriorIntersection(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
458 bool
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
459 TaggedLineStringSimplifier::hasBadInputIntersection(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
460 const TaggedLineString* parentLine,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
461 - const vector<size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
462 + const vector<std::size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
463 const LineSegment& candidateSeg)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
464 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
465 auto_ptr< vector<LineSegment*> > querySegs =
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
466 @@ -278,14 +278,14 @@ TaggedLineStringSimplifier::hasBadInputIntersection(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
467 bool
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
468 TaggedLineStringSimplifier::isInLineSection(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
469 const TaggedLineString* line,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
470 - const vector<size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
471 + const vector<std::size_t>& sectionIndex,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
472 const TaggedLineSegment* seg)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
473 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
474 // not in this line
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
475 if (seg->getParent() != line->getParent())
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
476 return false;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
477
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
478 - size_t segIndex = seg->getIndex();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
479 + std::size_t segIndex = seg->getIndex();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
480 if (segIndex >= sectionIndex[0] && segIndex < sectionIndex[1])
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
481 return true;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
482
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
483 @@ -295,13 +295,13 @@ TaggedLineStringSimplifier::isInLineSection(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
484 /*private*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
485 void
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
486 TaggedLineStringSimplifier::remove(const TaggedLineString* line,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
487 - size_t start,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
488 - size_t end)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
489 + std::size_t start,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
490 + std::size_t end)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
491 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
492 assert(end <= line->getSegments().size() );
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
493 assert(start < end); // I'm not sure this should always be true
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
494
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
495 - for (size_t i = start; i < end; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
496 + for (std::size_t i = start; i < end; i++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
497 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
498 const TaggedLineSegment* seg = line->getSegment(i);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
499 inputIndex->remove(seg);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
500 @@ -309,10 +309,10 @@ TaggedLineStringSimplifier::remove(const TaggedLineString* line,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
501 }
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
502
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
503 /*private static*/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
504 -size_t
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
505 +std::size_t
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
506 TaggedLineStringSimplifier::findFurthestPoint(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
507 const geom::CoordinateSequence* pts,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
508 - size_t i, size_t j,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
509 + std::size_t i, std::size_t j,
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
510 double& maxDistance)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
511 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
512 LineSegment seg(pts->getAt(i), pts->getAt(j));
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
513 @@ -321,8 +321,8 @@ TaggedLineStringSimplifier::findFurthestPoint(
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
514 << std::endl;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
515 #endif
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
516 double maxDist = -1.0;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
517 - size_t maxIndex = i;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
518 - for (size_t k = i + 1; k < j; k++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
519 + std::size_t maxIndex = i;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
520 + for (std::size_t k = i + 1; k < j; k++)
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
521 {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
522 const Coordinate& midPt = pts->getAt(k);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
523 double distance = seg.distance(midPt);
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
524 --
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
525 1.7.4.1
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
526
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
527
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
528 From bc687db602e42b4620ec9605db89ad49ee1951bb Mon Sep 17 00:00:00 2001
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
529 From: mingw-cross-env
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
530 Date: Sat, 26 Mar 2011 10:23:03 +0100
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
531 Subject: [PATCH 2/3] fix missing NULL
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
532
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
533
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
534 diff --git a/source/headers/geos/index/chain/MonotoneChainBuilder.h b/source/headers/geos/index/chain/MonotoneChainBuilder.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
535 index e227559..3cd11e6 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
536 --- a/source/headers/geos/index/chain/MonotoneChainBuilder.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
537 +++ b/source/headers/geos/index/chain/MonotoneChainBuilder.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
538 @@ -22,6 +22,7 @@
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
539
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
540 #include <geos/export.h>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
541 #include <vector>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
542 +#include <cstddef>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
543
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
544 // Forward declarations
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
545 namespace geos {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
546 diff --git a/source/headers/geos/operation/valid/SimpleNestedRingTester.h b/source/headers/geos/operation/valid/SimpleNestedRingTester.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
547 index b8888ac..d9436ff 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
548 --- a/source/headers/geos/operation/valid/SimpleNestedRingTester.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
549 +++ b/source/headers/geos/operation/valid/SimpleNestedRingTester.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
550 @@ -23,6 +23,7 @@
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
551
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
552 #include <geos/export.h>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
553
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
554 +#include <cstddef>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
555 #include <vector>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
556
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
557 // Forward declarations
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
558 diff --git a/source/index/bintree/Bintree.cpp b/source/index/bintree/Bintree.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
559 index 66a5ebc..3bd9ce1 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
560 --- a/source/index/bintree/Bintree.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
561 +++ b/source/index/bintree/Bintree.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
562 @@ -14,6 +14,7 @@
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
563 *
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
564 **********************************************************************/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
565
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
566 +#include <cstddef>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
567 #include <geos/index/bintree/Bintree.h>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
568 #include <geos/index/bintree/Root.h>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
569 #include <geos/index/bintree/Interval.h>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
570 diff --git a/source/index/bintree/Node.cpp b/source/index/bintree/Node.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
571 index a879bc9..59bd95d 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
572 --- a/source/index/bintree/Node.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
573 +++ b/source/index/bintree/Node.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
574 @@ -14,6 +14,7 @@
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
575 *
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
576 **********************************************************************/
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
577
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
578 +#include <cstddef>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
579 #include <cassert>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
580
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
581 #include <geos/index/bintree/Node.h>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
582 diff --git a/source/index/bintree/Root.cpp b/source/index/bintree/Root.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
583 index 0f2de89..b3419c5 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
584 --- a/source/index/bintree/Root.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
585 +++ b/source/index/bintree/Root.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
586 @@ -19,6 +19,7 @@
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
587 #include <geos/index/bintree/Interval.h>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
588 #include <geos/index/quadtree/IntervalSize.h>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
589
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
590 +#include <cstddef>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
591 #include <cassert>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
592
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
593 namespace geos {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
594 diff --git a/source/index/strtree/AbstractNode.cpp b/source/index/strtree/AbstractNode.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
595 index bd07cf4..00267d0 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
596 --- a/source/index/strtree/AbstractNode.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
597 +++ b/source/index/strtree/AbstractNode.cpp
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
598 @@ -17,6 +17,7 @@
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
599 #include <geos/index/strtree/AbstractNode.h>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
600
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
601 #include <vector>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
602 +#include <cstddef>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
603 #include <cassert>
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
604
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
605 using namespace std;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
606 --
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
607 1.7.4.1
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
608
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
609
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
610 From febd67da3fdf6afa19b33bf50b544b4fa911f4b9 Mon Sep 17 00:00:00 2001
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
611 From: mingw-cross-env
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
612 Date: Sat, 26 Mar 2011 10:53:53 +0100
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
613 Subject: [PATCH 3/3] fix uninitialized const caused by missing constructor
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
614
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
615
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
616 diff --git a/source/headers/geos/operation/overlay/OverlayNodeFactory.h b/source/headers/geos/operation/overlay/OverlayNodeFactory.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
617 index 12fb81c..186c9b2 100644
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
618 --- a/source/headers/geos/operation/overlay/OverlayNodeFactory.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
619 +++ b/source/headers/geos/operation/overlay/OverlayNodeFactory.h
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
620 @@ -46,6 +46,7 @@ namespace overlay { // geos::operation::overlay
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
621 */
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
622 class GEOS_DLL OverlayNodeFactory: public geomgraph::NodeFactory {
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
623 public:
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
624 + OverlayNodeFactory():geomgraph::NodeFactory() {}
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
625 geomgraph::Node* createNode(const geom::Coordinate &coord) const;
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
626 static const geomgraph::NodeFactory &instance();
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
627 };
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
628 --
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
629 1.7.4.1
24f0e217a254 package geos: gcc 4.6 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
630