1 --- geos-2.2.0/source/headers/geos/geom.h.orig 2005-11-29 18:52:21.000000000 +0100
2 +++ geos-2.2.0/source/headers/geos/geom.h 2005-12-11 00:29:14.530893368 +0100
4 //double distance(Coordinate& p);
5 static Coordinate nullCoord;
7 - void Coordinate::setNull() {
14 - static Coordinate& Coordinate::getNull() {
15 + static Coordinate& getNull() {
19 - Coordinate::Coordinate() {
26 - Coordinate::Coordinate(double xNew, double yNew, double zNew) {
27 + Coordinate(double xNew, double yNew, double zNew) {
33 #ifndef PROFILE_COORDINATE_COPIES
34 - Coordinate::Coordinate(const Coordinate& c){
35 + Coordinate(const Coordinate& c){
41 - Coordinate::Coordinate(const Coordinate& c);
42 + Coordinate(const Coordinate& c);
43 Coordinate &operator=(const Coordinate &c);
46 - Coordinate::Coordinate(double xNew, double yNew){
47 + Coordinate(double xNew, double yNew){
53 - void Coordinate::setCoordinate(const Coordinate& other) {
54 + void setCoordinate(const Coordinate& other) {
60 - bool Coordinate::equals2D(const Coordinate& other) const {
61 + bool equals2D(const Coordinate& other) const {
69 - int Coordinate::compareTo(const Coordinate& other) const {
70 + int compareTo(const Coordinate& other) const {
78 - bool Coordinate::equals3D(const Coordinate& other) const {
79 + bool equals3D(const Coordinate& other) const {
80 return (x == other.x) && ( y == other.y) && ((z == other.z)||(ISNAN(z) && ISNAN(other.z)));
83 - void Coordinate::makePrecise(const PrecisionModel *precisionModel) {
84 + void makePrecise(const PrecisionModel *precisionModel) {
85 x = precisionModel->makePrecise(x);
86 y = precisionModel->makePrecise(y);
89 - double Coordinate::distance(const Coordinate& p) const {
90 + double distance(const Coordinate& p) const {
93 return sqrt(dx * dx + dy * dy);
96 - int Coordinate::hashCode() {
98 //Algorithm from Effective Java by Joshua Bloch [Jon Aquino]
100 result = 37 * result + hashCode(x);
102 * Returns a hash code for a double value, using the algorithm from
103 * Joshua Bloch's book <i>Effective Java</i>
105 - static int Coordinate::hashCode(double x) {
106 + static int hashCode(double x) {
107 int64 f = (int64)(x);
108 return (int)(f^(f>>32));