Added patch file
This commit is contained in:
parent
2b442c1340
commit
38c3eb72f9
109
geos-2.2.1-gcc4.patch
Normal file
109
geos-2.2.1-gcc4.patch
Normal file
@ -0,0 +1,109 @@
|
||||
--- source/headers/geos/geom.h~ 2005-11-29 09:52:21.000000000 -0800
|
||||
+++ source/headers/geos/geom.h 2006-01-13 21:37:04.000000000 -0800
|
||||
@@ -358,52 +358,52 @@
|
||||
//double distance(Coordinate& p);
|
||||
static Coordinate nullCoord;
|
||||
|
||||
- void Coordinate::setNull() {
|
||||
+ void setNull() {
|
||||
x=DoubleNotANumber;
|
||||
y=DoubleNotANumber;
|
||||
z=DoubleNotANumber;
|
||||
}
|
||||
|
||||
- static Coordinate& Coordinate::getNull() {
|
||||
+ static Coordinate& getNull() {
|
||||
return nullCoord;
|
||||
}
|
||||
|
||||
- Coordinate::Coordinate() {
|
||||
+ Coordinate() {
|
||||
x=0.0;
|
||||
y=0.0;
|
||||
z=DoubleNotANumber;
|
||||
}
|
||||
|
||||
- Coordinate::Coordinate(double xNew, double yNew, double zNew) {
|
||||
+ Coordinate(double xNew, double yNew, double zNew) {
|
||||
x=xNew;
|
||||
y=yNew;
|
||||
z=zNew;
|
||||
}
|
||||
|
||||
#ifndef PROFILE_COORDINATE_COPIES
|
||||
- Coordinate::Coordinate(const Coordinate& c){
|
||||
+ Coordinate(const Coordinate& c){
|
||||
x=c.x;
|
||||
y=c.y;
|
||||
z=c.z;
|
||||
}
|
||||
#else
|
||||
- Coordinate::Coordinate(const Coordinate& c);
|
||||
+ Coordinate(const Coordinate& c);
|
||||
Coordinate &operator=(const Coordinate &c);
|
||||
#endif
|
||||
|
||||
- Coordinate::Coordinate(double xNew, double yNew){
|
||||
+ Coordinate(double xNew, double yNew){
|
||||
x=xNew;
|
||||
y=yNew;
|
||||
z=DoubleNotANumber;
|
||||
}
|
||||
|
||||
- void Coordinate::setCoordinate(const Coordinate& other) {
|
||||
+ void setCoordinate(const Coordinate& other) {
|
||||
x = other.x;
|
||||
y = other.y;
|
||||
z = other.z;
|
||||
}
|
||||
|
||||
- bool Coordinate::equals2D(const Coordinate& other) const {
|
||||
+ bool equals2D(const Coordinate& other) const {
|
||||
if (x != other.x) {
|
||||
return false;
|
||||
}
|
||||
@@ -413,7 +413,7 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
- int Coordinate::compareTo(const Coordinate& other) const {
|
||||
+ int compareTo(const Coordinate& other) const {
|
||||
if (x < other.x) {
|
||||
return -1;
|
||||
}
|
||||
@@ -429,22 +429,22 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
- bool Coordinate::equals3D(const Coordinate& other) const {
|
||||
+ bool equals3D(const Coordinate& other) const {
|
||||
return (x == other.x) && ( y == other.y) && ((z == other.z)||(ISNAN(z) && ISNAN(other.z)));
|
||||
}
|
||||
|
||||
- void Coordinate::makePrecise(const PrecisionModel *precisionModel) {
|
||||
+ void makePrecise(const PrecisionModel *precisionModel) {
|
||||
x = precisionModel->makePrecise(x);
|
||||
y = precisionModel->makePrecise(y);
|
||||
}
|
||||
|
||||
- double Coordinate::distance(const Coordinate& p) const {
|
||||
+ double distance(const Coordinate& p) const {
|
||||
double dx = x - p.x;
|
||||
double dy = y - p.y;
|
||||
return sqrt(dx * dx + dy * dy);
|
||||
}
|
||||
|
||||
- int Coordinate::hashCode() {
|
||||
+ int hashCode() {
|
||||
//Algorithm from Effective Java by Joshua Bloch [Jon Aquino]
|
||||
int result = 17;
|
||||
result = 37 * result + hashCode(x);
|
||||
@@ -456,7 +456,7 @@
|
||||
* Returns a hash code for a double value, using the algorithm from
|
||||
* Joshua Bloch's book <i>Effective Java</i>
|
||||
*/
|
||||
- static int Coordinate::hashCode(double x) {
|
||||
+ static int hashCode(double x) {
|
||||
int64 f = (int64)(x);
|
||||
return (int)(f^(f>>32));
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user