From a2cc17cbf41726f47ee04ca2fb1d14bd025b83f9 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Thu, 30 Nov 2006 21:42:28 +0000 Subject: Remove stalled patches from previous update. (hi gdt) --- geography/geos/patches/patch-aa | 17 ------- geography/geos/patches/patch-ab | 26 ---------- geography/geos/patches/patch-ac | 17 ------- geography/geos/patches/patch-ad | 105 ---------------------------------------- 4 files changed, 165 deletions(-) delete mode 100644 geography/geos/patches/patch-aa delete mode 100644 geography/geos/patches/patch-ab delete mode 100644 geography/geos/patches/patch-ac delete mode 100644 geography/geos/patches/patch-ad (limited to 'geography/geos') diff --git a/geography/geos/patches/patch-aa b/geography/geos/patches/patch-aa deleted file mode 100644 index 7688b9040b5..00000000000 --- a/geography/geos/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/11/06 10:36:46 minskim Exp $ - -g++-2.95 needs a bit help on complex type casts. - ---- source/geom/LineString.cpp.orig Thu Jul 22 10:45:50 2004 -+++ source/geom/LineString.cpp Thu Apr 7 03:56:53 2005 -@@ -216,8 +216,8 @@ string LineString::getGeometryType() con - - bool LineString::isSimple() const { - IsSimpleOp iso; -- Geometry *in = toInternalGeometry(this); -- bool issimple = iso.isSimple((LineString *)in); -+ LineString *in = dynamic_cast(toInternalGeometry(this)); -+ bool issimple = iso.isSimple(in); - if ( in != this ) delete(in); - return issimple; - } diff --git a/geography/geos/patches/patch-ab b/geography/geos/patches/patch-ab deleted file mode 100644 index 35525cfb7ad..00000000000 --- a/geography/geos/patches/patch-ab +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2005/11/06 10:36:46 minskim Exp $ - -g++-2.95 needs a bit help on complex type casts. - ---- source/geom/MultiLineString.cpp.orig Thu Jul 22 10:45:50 2004 -+++ source/geom/MultiLineString.cpp Thu Apr 7 03:45:20 2005 -@@ -127,8 +127,8 @@ bool MultiLineString::isClosed() const { - - bool MultiLineString::isSimple() const { - IsSimpleOp iso; -- Geometry *in = toInternalGeometry(this); -- bool issimple = iso.isSimple((MultiLineString *)in); -+ MultiLineString *in = dynamic_cast(toInternalGeometry(this)); -+ bool issimple = iso.isSimple(in); - if ( in != this ) delete(in); - return issimple; - } -@@ -137,7 +137,7 @@ Geometry* MultiLineString::getBoundary() - if (isEmpty()) { - return getFactory()->createGeometryCollection(NULL); - } -- Geometry *in = toInternalGeometry(this); -+ MultiLineString *in = dynamic_cast(toInternalGeometry(this)); - GeometryGraph gg(0, in); - CoordinateSequence *pts=gg.getBoundaryPoints(); - if ( in != this ) delete(in); diff --git a/geography/geos/patches/patch-ac b/geography/geos/patches/patch-ac deleted file mode 100644 index b5fb9f70465..00000000000 --- a/geography/geos/patches/patch-ac +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2005/11/06 10:36:46 minskim Exp $ - -g++-2.95 needs a bit help on complex type casts. - ---- source/geom/MultiPoint.cpp.orig Thu Jul 22 10:45:50 2004 -+++ source/geom/MultiPoint.cpp Thu Apr 7 03:46:23 2005 -@@ -117,8 +117,8 @@ Geometry* MultiPoint::getBoundary() cons - - bool MultiPoint::isSimple() const { - IsSimpleOp iso; -- Geometry *in = toInternalGeometry(this); -- bool issimple = iso.isSimple((MultiPoint *)in); -+ MultiPoint *in = dynamic_cast(toInternalGeometry(this)); -+ bool issimple = iso.isSimple(in); - if ( in != this ) delete(in); - return issimple; - } diff --git a/geography/geos/patches/patch-ad b/geography/geos/patches/patch-ad deleted file mode 100644 index 9c3df9dccd3..00000000000 --- a/geography/geos/patches/patch-ad +++ /dev/null @@ -1,105 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/08/24 18:30:24 wiz Exp $ - ---- source/headers/geos/geom.h.orig 2004-07-27 16:35:46.000000000 +0000 -+++ source/headers/geos/geom.h -@@ -546,47 +546,47 @@ public: - //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; - } - -- Coordinate::Coordinate(const Coordinate& c){ -+ Coordinate(const Coordinate& c){ - x=c.x; - y=c.y; - z=c.z; - } - -- 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; - } -@@ -596,7 +596,7 @@ public: - return true; - } - -- int Coordinate::compareTo(const Coordinate& other) const { -+ int compareTo(const Coordinate& other) const { - if (x < other.x) { - return -1; - } -@@ -612,22 +612,22 @@ public: - 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)||(z==DoubleNotANumber && other.z==DoubleNotANumber)); - } - -- 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); -@@ -639,7 +639,7 @@ public: - * Returns a hash code for a double value, using the algorithm from - * Joshua Bloch's book Effective Java" - */ -- static int Coordinate::hashCode(double x) { -+ static int hashCode(double x) { - int64 f = (int64)(x); - return (int)(f^(f>>32)); - } -- cgit v1.2.3