Line
Link Here
|
0 |
-- geos-3.0.0.orig/source/planargraph/DirectedEdge.cpp |
0 |
++ geos-3.0.0/source/planargraph/DirectedEdge.cpp |
Lines 21-26
Link Here
|
21 |
#include <cmath> |
21 |
#include <cmath> |
22 |
#include <sstream> |
22 |
#include <sstream> |
23 |
#include <vector> |
23 |
#include <vector> |
|
|
24 |
#include <typeinfo> |
24 |
|
25 |
|
25 |
using namespace std; |
26 |
using namespace std; |
26 |
using namespace geos::geom; |
27 |
using namespace geos::geom; |
27 |
-- geos-3.0.0.orig/source/precision/SimpleGeometryPrecisionReducer.cpp |
28 |
++ geos-3.0.0/source/precision/SimpleGeometryPrecisionReducer.cpp |
Lines 30-35
Link Here
|
30 |
#include <geos/geom/LinearRing.h> |
30 |
#include <geos/geom/LinearRing.h> |
31 |
|
31 |
|
32 |
#include <vector> |
32 |
#include <vector> |
|
|
33 |
#include <typeinfo> |
33 |
|
34 |
|
34 |
using namespace std; |
35 |
using namespace std; |
35 |
using namespace geos::geom; |
36 |
using namespace geos::geom; |
36 |
-- geos-3.0.0.orig/source/io/ByteOrderValues.cpp |
37 |
++ geos-3.0.0/source/io/ByteOrderValues.cpp |
Lines 22-27
Link Here
|
22 |
#include <geos/util.h> |
22 |
#include <geos/util.h> |
23 |
|
23 |
|
24 |
#include <cassert> |
24 |
#include <cassert> |
|
|
25 |
#include <cstring> |
25 |
|
26 |
|
26 |
namespace geos { |
27 |
namespace geos { |
27 |
namespace io { // geos.io |
28 |
namespace io { // geos.io |
28 |
-- geos-3.0.0.orig/source/io/StringTokenizer.cpp |
29 |
++ geos-3.0.0/source/io/StringTokenizer.cpp |
Lines 17-22
Link Here
|
17 |
#include <geos/io/StringTokenizer.h> |
17 |
#include <geos/io/StringTokenizer.h> |
18 |
|
18 |
|
19 |
#include <string> |
19 |
#include <string> |
|
|
20 |
#include <cstdlib> |
20 |
|
21 |
|
21 |
using namespace std; |
22 |
using namespace std; |
22 |
|
23 |
|
23 |
-- geos-3.0.0.orig/source/operation/buffer/OffsetCurveSetBuilder.cpp |
24 |
++ geos-3.0.0/source/operation/buffer/OffsetCurveSetBuilder.cpp |
Lines 41-46
Link Here
|
41 |
#include <vector> |
41 |
#include <vector> |
42 |
#include <memory> |
42 |
#include <memory> |
43 |
#include <cassert> |
43 |
#include <cassert> |
|
|
44 |
#include <typeinfo> |
44 |
|
45 |
|
45 |
#ifndef GEOS_DEBUG |
46 |
#ifndef GEOS_DEBUG |
46 |
#define GEOS_DEBUG 0 |
47 |
#define GEOS_DEBUG 0 |
47 |
-- geos-3.0.0.orig/source/operation/distance/ConnectedElementPointFilter.cpp |
48 |
++ geos-3.0.0/source/operation/distance/ConnectedElementPointFilter.cpp |
Lines 20-25
Link Here
|
20 |
#include <geos/geom/Polygon.h> |
20 |
#include <geos/geom/Polygon.h> |
21 |
|
21 |
|
22 |
#include <vector> |
22 |
#include <vector> |
|
|
23 |
#include <typeinfo> |
23 |
|
24 |
|
24 |
using namespace std; |
25 |
using namespace std; |
25 |
using namespace geos::geom; |
26 |
using namespace geos::geom; |
26 |
-- geos-3.0.0.orig/source/geomgraph/GeometryGraph.cpp |
27 |
++ geos-3.0.0/source/geomgraph/GeometryGraph.cpp |
Lines 45-50
Link Here
|
45 |
#include <vector> |
45 |
#include <vector> |
46 |
#include <memory> // auto_ptr |
46 |
#include <memory> // auto_ptr |
47 |
#include <cassert> |
47 |
#include <cassert> |
|
|
48 |
#include <typeinfo> |
48 |
|
49 |
|
49 |
#ifndef GEOS_DEBUG |
50 |
#ifndef GEOS_DEBUG |
50 |
#define GEOS_DEBUG 0 |
51 |
#define GEOS_DEBUG 0 |
51 |
-- geos-3.0.0.orig/source/index/quadtree/DoubleBits.cpp |
52 |
++ geos-3.0.0/source/index/quadtree/DoubleBits.cpp |
Lines 22-27
Link Here
|
22 |
#include <geos/util/IllegalArgumentException.h> |
22 |
#include <geos/util/IllegalArgumentException.h> |
23 |
|
23 |
|
24 |
#include <string> |
24 |
#include <string> |
|
|
25 |
#include <cstring> |
25 |
|
26 |
|
26 |
#if __STDC_IEC_559__ |
27 |
#if __STDC_IEC_559__ |
27 |
#define ASSUME_IEEE_DOUBLE 1 |
28 |
#define ASSUME_IEEE_DOUBLE 1 |
28 |
-- geos-3.0.0.orig/source/headers/geos/noding/FastNodingValidator.h |
29 |
++ geos-3.0.0/source/headers/geos/noding/FastNodingValidator.h |
Lines 25-30
Link Here
|
25 |
|
25 |
|
26 |
#include <cassert> |
26 |
#include <cassert> |
27 |
#include <string> |
27 |
#include <string> |
|
|
28 |
#include <memory> |
28 |
|
29 |
|
29 |
// Forward declarations |
30 |
// Forward declarations |
30 |
namespace geos { |
31 |
namespace geos { |
31 |
-- geos-3.0.0.orig/source/headers/geos/noding/IntersectionAdder.h |
32 |
++ geos-3.0.0/source/headers/geos/noding/IntersectionAdder.h |
Lines 19-24
Link Here
|
19 |
#include <vector> |
19 |
#include <vector> |
20 |
#include <iostream> |
20 |
#include <iostream> |
21 |
#include <cmath> // for abs() |
21 |
#include <cmath> // for abs() |
|
|
22 |
#include <cstdlib> // for abs() |
22 |
|
23 |
|
23 |
#include <geos/inline.h> |
24 |
#include <geos/inline.h> |
24 |
|
25 |
|
25 |
-- geos-3.0.0.orig/doc/example.cpp |
26 |
++ geos-3.0.0/doc/example.cpp |
Lines 31-36
Link Here
|
31 |
#include <vector> |
31 |
#include <vector> |
32 |
#include <sstream> |
32 |
#include <sstream> |
33 |
#include <iomanip> |
33 |
#include <iomanip> |
|
|
34 |
#include <cstdlib> |
34 |
#include <geos/geom/PrecisionModel.h> |
35 |
#include <geos/geom/PrecisionModel.h> |
35 |
#include <geos/geom/GeometryFactory.h> |
36 |
#include <geos/geom/GeometryFactory.h> |
36 |
#include <geos/geom/Geometry.h> |
37 |
#include <geos/geom/Geometry.h> |
37 |
-- geos-3.0.0.orig/tests/xmltester/markup/MarkupSTL.h |
38 |
++ geos-3.0.0/tests/xmltester/markup/MarkupSTL.h |
Lines 65-70
Link Here
|
65 |
#include <string> |
65 |
#include <string> |
66 |
#include <map> |
66 |
#include <map> |
67 |
#include <vector> |
67 |
#include <vector> |
|
|
68 |
#include <cstring> |
68 |
|
69 |
|
69 |
#ifdef _DEBUG |
70 |
#ifdef _DEBUG |
70 |
#define _DS(i) (i?&(m_strDoc.c_str())[m_aPos[i].nStartL]:0) |
71 |
#define _DS(i) (i?&(m_strDoc.c_str())[m_aPos[i].nStartL]:0) |
71 |
-- geos-3.0.0.orig/tests/xmltester/XMLTester.cpp |
72 |
++ geos-3.0.0/tests/xmltester/XMLTester.cpp |
Lines 57-62
Link Here
|
57 |
#include <functional> |
57 |
#include <functional> |
58 |
#include <stdexcept> |
58 |
#include <stdexcept> |
59 |
#include <cmath> |
59 |
#include <cmath> |
|
|
60 |
#include <cstring> |
60 |
|
61 |
|
61 |
#ifdef _MSC_VER |
62 |
#ifdef _MSC_VER |
62 |
#include <windows.h> |
63 |
#include <windows.h> |
63 |
-- geos-3.0.0.orig/tests/bigtest/TestSweepLineSpeed.cpp |
64 |
++ geos-3.0.0/tests/bigtest/TestSweepLineSpeed.cpp |
Lines 88-94
Link Here
|
88 |
// cout << "n Pts: " << nPts << " Executed in " << totalTime << endl; |
88 |
// cout << "n Pts: " << nPts << " Executed in " << totalTime << endl; |
89 |
} |
89 |
} |
90 |
|
90 |
|
91 |
int main(int /* argC */, char* /* argV[] */) { |
91 |
int main(int /* argC */, char** /* argV */) { |
92 |
|
92 |
|
93 |
GeometryFactory *fact=new GeometryFactory(); |
93 |
GeometryFactory *fact=new GeometryFactory(); |
94 |
|
94 |
|