[geos-commits] r3699 - in trunk: include/geos/triangulate include/geos/triangulate/quadedge src/triangulate/quadedge

svn_geos at osgeo.org svn_geos at osgeo.org
Wed Jun 27 02:23:32 PDT 2012


Author: strk
Date: 2012-06-27 02:23:32 -0700 (Wed, 27 Jun 2012)
New Revision: 3699

Modified:
   trunk/include/geos/triangulate/DelaunayTriangulationBuilder.h
   trunk/include/geos/triangulate/IncrementalDelaunayTriangulator.h
   trunk/include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h
   trunk/include/geos/triangulate/quadedge/LocateFailureException.h
   trunk/include/geos/triangulate/quadedge/QuadEdge.h
   trunk/include/geos/triangulate/quadedge/QuadEdgeLocator.h
   trunk/include/geos/triangulate/quadedge/QuadEdgeSubdivision.h
   trunk/include/geos/triangulate/quadedge/TrianglePredicate.h
   trunk/include/geos/triangulate/quadedge/TriangleVisitor.h
   trunk/include/geos/triangulate/quadedge/Vertex.h
   trunk/src/triangulate/quadedge/LastFoundQuadEdgeLocator.cpp
   trunk/src/triangulate/quadedge/LocateFailureException.cpp
   trunk/src/triangulate/quadedge/QuadEdge.cpp
   trunk/src/triangulate/quadedge/QuadEdgeLocator.cpp
   trunk/src/triangulate/quadedge/QuadEdgeSubdivision.cpp
   trunk/src/triangulate/quadedge/TrianglePredicate.cpp
   trunk/src/triangulate/quadedge/TriangleVisitor.cpp
   trunk/src/triangulate/quadedge/Vertex.cpp
Log:
Indent and port info style

Modified: trunk/include/geos/triangulate/DelaunayTriangulationBuilder.h
===================================================================
--- trunk/include/geos/triangulate/DelaunayTriangulationBuilder.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/DelaunayTriangulationBuilder.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/DelaunayTriangulationBuilder.java rev. r524
+ * Last port: triangulate/DelaunayTriangulationBuilder.java r524
  *
  **********************************************************************/
 

Modified: trunk/include/geos/triangulate/IncrementalDelaunayTriangulator.h
===================================================================
--- trunk/include/geos/triangulate/IncrementalDelaunayTriangulator.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/IncrementalDelaunayTriangulator.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/IncrementalDelaunayTriangulator.java rev. r524
+ * Last port: triangulate/IncrementalDelaunayTriangulator.java r524
  *
  **********************************************************************/
 

Modified: trunk/include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h
===================================================================
--- trunk/include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/quadedge/LastFoundQuadEdgeLocator.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/LastFoundQuadEdgeLocator.java rev. r524
+ * Last port: triangulate/quadedge/LastFoundQuadEdgeLocator.java r524
  *
  **********************************************************************/
 

Modified: trunk/include/geos/triangulate/quadedge/LocateFailureException.h
===================================================================
--- trunk/include/geos/triangulate/quadedge/LocateFailureException.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/quadedge/LocateFailureException.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/LocateFailureException.java rev. r524
+ * Last port: triangulate/quadedge/LocateFailureException.java r524
  *
  **********************************************************************/
 

Modified: trunk/include/geos/triangulate/quadedge/QuadEdge.h
===================================================================
--- trunk/include/geos/triangulate/quadedge/QuadEdge.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/quadedge/QuadEdge.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/QuadEdge.java rev. r524
+ * Last port: triangulate/quadedge/QuadEdge.java r524
  *
  **********************************************************************/
 

Modified: trunk/include/geos/triangulate/quadedge/QuadEdgeLocator.h
===================================================================
--- trunk/include/geos/triangulate/quadedge/QuadEdgeLocator.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/quadedge/QuadEdgeLocator.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/QuadEdgeLocator.java rev. r524
+ * Last port: triangulate/quadedge/QuadEdgeLocator.java r524
  *
  **********************************************************************/
 

Modified: trunk/include/geos/triangulate/quadedge/QuadEdgeSubdivision.h
===================================================================
--- trunk/include/geos/triangulate/quadedge/QuadEdgeSubdivision.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/quadedge/QuadEdgeSubdivision.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/QuadEdgeSubdivision.java rev. r524
+ * Last port: triangulate/quadedge/QuadEdgeSubdivision.java r524
  *
  **********************************************************************/
 

Modified: trunk/include/geos/triangulate/quadedge/TrianglePredicate.h
===================================================================
--- trunk/include/geos/triangulate/quadedge/TrianglePredicate.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/quadedge/TrianglePredicate.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/TrianglePredicate.java rev. r524
+ * Last port: triangulate/quadedge/TrianglePredicate.java r524
  *
  **********************************************************************/
 

Modified: trunk/include/geos/triangulate/quadedge/TriangleVisitor.h
===================================================================
--- trunk/include/geos/triangulate/quadedge/TriangleVisitor.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/quadedge/TriangleVisitor.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/TriangleVisitor.java rev. r524
+ * Last port: triangulate/quadedge/TriangleVisitor.java r524
  *
  **********************************************************************/
 

Modified: trunk/include/geos/triangulate/quadedge/Vertex.h
===================================================================
--- trunk/include/geos/triangulate/quadedge/Vertex.h	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/include/geos/triangulate/quadedge/Vertex.h	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/Vertex.java rev. r524
+ * Last port: triangulate/quadedge/Vertex.java r524
  *
  **********************************************************************/
 

Modified: trunk/src/triangulate/quadedge/LastFoundQuadEdgeLocator.cpp
===================================================================
--- trunk/src/triangulate/quadedge/LastFoundQuadEdgeLocator.cpp	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/src/triangulate/quadedge/LastFoundQuadEdgeLocator.cpp	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/LastFoundQuadEdgeLocator.java rev. r524
+ * Last port: triangulate/quadedge/LastFoundQuadEdgeLocator.java r524
  *
  **********************************************************************/
 
@@ -28,18 +28,21 @@
 {
 }
 
-void LastFoundQuadEdgeLocator::init()
+void
+LastFoundQuadEdgeLocator::init()
 {
 	lastEdge = findEdge();
 }
 
-QuadEdge* LastFoundQuadEdgeLocator::findEdge()
+QuadEdge*
+LastFoundQuadEdgeLocator::findEdge()
 {
 	// assume there is an edge 
 	return *(subdiv->getEdges().begin());
 }
 
-QuadEdge* LastFoundQuadEdgeLocator::locate(const Vertex &v)
+QuadEdge*
+LastFoundQuadEdgeLocator::locate(const Vertex &v)
 {
 	if (!lastEdge || !lastEdge->isLive()) {
 		init();

Modified: trunk/src/triangulate/quadedge/LocateFailureException.cpp
===================================================================
--- trunk/src/triangulate/quadedge/LocateFailureException.cpp	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/src/triangulate/quadedge/LocateFailureException.cpp	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/LocateFailureException.java rev. r524
+ * Last port: triangulate/quadedge/LocateFailureException.java r524
  *
  **********************************************************************/
 

Modified: trunk/src/triangulate/quadedge/QuadEdge.cpp
===================================================================
--- trunk/src/triangulate/quadedge/QuadEdge.cpp	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/src/triangulate/quadedge/QuadEdge.cpp	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/QuadEdge.java rev. r524
+ * Last port: triangulate/quadedge/QuadEdge.java r524
  *
  **********************************************************************/
 
@@ -24,7 +24,8 @@
 
 using namespace geos::geom;
 
-std::auto_ptr<QuadEdge> QuadEdge::makeEdge(const Vertex &o, const Vertex &d)
+std::auto_ptr<QuadEdge>
+QuadEdge::makeEdge(const Vertex &o, const Vertex &d)
 {
 	QuadEdge *q0 = new QuadEdge();
 	//q1-q3 are free()'d by q0
@@ -49,7 +50,8 @@
 	return std::auto_ptr<QuadEdge>(base);
 }
 
-std::auto_ptr<QuadEdge> QuadEdge::connect(QuadEdge &a, QuadEdge &b) 
+std::auto_ptr<QuadEdge>
+QuadEdge::connect(QuadEdge &a, QuadEdge &b) 
 {
 	std::auto_ptr<QuadEdge> q0 = makeEdge(a.dest(), b.orig());
 	splice(*q0, a.lNext());
@@ -57,7 +59,8 @@
 	return q0;
 }
 
-void QuadEdge::splice(QuadEdge &a, QuadEdge &b)
+void
+QuadEdge::splice(QuadEdge &a, QuadEdge &b)
 {
 	QuadEdge &alpha = a.oNext().rot();
 	QuadEdge &beta = b.oNext().rot();
@@ -73,7 +76,8 @@
 	beta.setNext(&t4);
 }
 
-void QuadEdge::swap(QuadEdge &e)
+void
+QuadEdge::swap(QuadEdge &e)
 {
 	QuadEdge &a = e.oPrev();
 	QuadEdge &b = e.sym().oPrev();
@@ -92,7 +96,8 @@
 {
 }
 
-void QuadEdge::free()
+void
+QuadEdge::free()
 {
 	if(_rot)
 	{
@@ -111,7 +116,8 @@
 	}
 }
 
-const QuadEdge& QuadEdge::getPrimary() const
+const QuadEdge&
+QuadEdge::getPrimary() const
 {
 	if (orig().getCoordinate().compareTo(dest().getCoordinate()) <= 0)
 		return *this;
@@ -119,17 +125,20 @@
 		return sym();
 }
 
-void QuadEdge::setData(void* data)
+void
+QuadEdge::setData(void* data)
 {
 	this->data = data;
 }
 
-void* QuadEdge::getData()
+void*
+QuadEdge::getData()
 {
 	return data;
 }
 
-void QuadEdge::remove()
+void
+QuadEdge::remove()
 {
 	rot().rot().rot().isAlive = false;
 	rot().rot().isAlive = false;
@@ -137,7 +146,8 @@
 	isAlive = false;
 }
 
-bool QuadEdge::equalsNonOriented(const QuadEdge &qe) const
+bool
+QuadEdge::equalsNonOriented(const QuadEdge &qe) const
 {
 	if (equalsOriented(qe))
 		return true;
@@ -146,7 +156,8 @@
 	return false;
 }
 
-bool QuadEdge::equalsOriented(const QuadEdge &qe) const
+bool
+QuadEdge::equalsOriented(const QuadEdge &qe) const
 {
 	if (orig().getCoordinate().equals2D(qe.orig().getCoordinate())
 			&& dest().getCoordinate().equals2D(qe.dest().getCoordinate()))
@@ -154,7 +165,8 @@
 	return false;
 }
 
-std::auto_ptr<LineSegment> QuadEdge::toLineSegment() const
+std::auto_ptr<LineSegment>
+QuadEdge::toLineSegment() const
 {
 	return std::auto_ptr<geom::LineSegment>(
 			new geom::LineSegment(vertex.getCoordinate(), dest().getCoordinate()));

Modified: trunk/src/triangulate/quadedge/QuadEdgeLocator.cpp
===================================================================
--- trunk/src/triangulate/quadedge/QuadEdgeLocator.cpp	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/src/triangulate/quadedge/QuadEdgeLocator.cpp	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/QuadEdgeLocator.java rev. r524
+ * Last port: triangulate/quadedge/QuadEdgeLocator.java r524
  *
  **********************************************************************/
 

Modified: trunk/src/triangulate/quadedge/QuadEdgeSubdivision.cpp
===================================================================
--- trunk/src/triangulate/quadedge/QuadEdgeSubdivision.cpp	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/src/triangulate/quadedge/QuadEdgeSubdivision.cpp	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/QuadEdgeSubdivision.java rev. r524
+ * Last port: triangulate/quadedge/QuadEdgeSubdivision.java r524
  *
  **********************************************************************/
 #include <geos/triangulate/quadedge/QuadEdgeSubdivision.h>
@@ -41,7 +41,8 @@
 namespace triangulate { //geos.triangulate
 namespace quadedge { //geos.triangulate.quadedge
 
-void QuadEdgeSubdivision::getTriangleEdges(const QuadEdge &startQE,
+void
+QuadEdgeSubdivision::getTriangleEdges(const QuadEdge &startQE,
 		const QuadEdge* triEdge[3])
 {
 	triEdge[0] = &startQE;
@@ -80,7 +81,8 @@
 	}
 }
 
-void QuadEdgeSubdivision::createFrame(const geom::Envelope &env)
+void
+QuadEdgeSubdivision::createFrame(const geom::Envelope &env)
 {
 	double deltaX = env.getWidth();
 	double deltaY = env.getHeight();
@@ -100,7 +102,8 @@
 			.getCoordinate());
 	frameEnv.expandToInclude(frameVertex[2].getCoordinate());
 }
-void QuadEdgeSubdivision::initSubdiv(QuadEdge* initEdges[3])
+void
+QuadEdgeSubdivision::initSubdiv(QuadEdge* initEdges[3])
 {
 	std::auto_ptr<QuadEdge> tmp_auto_ptr;
 	// build initial subdivision from frame
@@ -123,7 +126,8 @@
 	QuadEdge::splice(initEdges[2]->sym(), *initEdges[0]);
 }
 
-QuadEdge& QuadEdgeSubdivision::makeEdge(const Vertex &o, const Vertex &d)
+QuadEdge&
+QuadEdgeSubdivision::makeEdge(const Vertex &o, const Vertex &d)
 {
 	std::auto_ptr<QuadEdge> q0 = QuadEdge::makeEdge(o, d);
 	QuadEdge *q0_ptr = q0.get();
@@ -133,7 +137,8 @@
 	return *q0_ptr;
 }
 
-QuadEdge& QuadEdgeSubdivision::connect(QuadEdge &a, QuadEdge &b)
+QuadEdge&
+QuadEdgeSubdivision::connect(QuadEdge &a, QuadEdge &b)
 {
 	std::auto_ptr<QuadEdge> q0 = QuadEdge::connect(a, b);
 	QuadEdge *q0_ptr = q0.get();
@@ -143,7 +148,8 @@
 	return *q0_ptr;
 }
 
-void QuadEdgeSubdivision::remove(QuadEdge &e)
+void
+QuadEdgeSubdivision::remove(QuadEdge &e)
 {
 	QuadEdge::splice(e, e.oPrev());
 	QuadEdge::splice(e.sym(), e.sym().oPrev());
@@ -159,7 +165,8 @@
 	removedEdges.push_back(&e);
 }
 
-QuadEdge* QuadEdgeSubdivision::locateFromEdge(const Vertex &v,
+QuadEdge*
+QuadEdgeSubdivision::locateFromEdge(const Vertex &v,
 		const QuadEdge &startEdge) const
 {
 	int iter = 0;
@@ -198,7 +205,8 @@
 	return e;
 }
 
-QuadEdge* QuadEdgeSubdivision::locate(const Coordinate &p0, const Coordinate &p1)
+QuadEdge*
+QuadEdgeSubdivision::locate(const Coordinate &p0, const Coordinate &p1)
 {
 	// find an edge containing one of the points
 	QuadEdge *e = locator->locate(Vertex(p0));
@@ -219,7 +227,8 @@
 	return NULL;
 }
 
-QuadEdge& QuadEdgeSubdivision::insertSite(const Vertex &v)
+QuadEdge&
+QuadEdgeSubdivision::insertSite(const Vertex &v)
 {
 	QuadEdge *e = locate(v);
 
@@ -241,14 +250,16 @@
 	return *startEdge;
 }
 
-bool QuadEdgeSubdivision::isFrameEdge(const QuadEdge &e) const
+bool
+QuadEdgeSubdivision::isFrameEdge(const QuadEdge &e) const
 {
 	if (isFrameVertex(e.orig()) || isFrameVertex(e.dest()))
 		return true;
 	return false;
 }
 
-bool QuadEdgeSubdivision::isFrameBorderEdge(const QuadEdge &e) const
+bool
+QuadEdgeSubdivision::isFrameBorderEdge(const QuadEdge &e) const
 {
 	// check other vertex of triangle to left of edge
 	Vertex vLeftTriOther = e.lNext().dest();
@@ -262,7 +273,8 @@
 	return false;
 }
 
-bool QuadEdgeSubdivision::isFrameVertex(const Vertex &v) const
+bool
+QuadEdgeSubdivision::isFrameVertex(const Vertex &v) const
 {
 	if (v.equals(frameVertex[0]))
 		return true;
@@ -273,7 +285,8 @@
 	return false;
 }
 
-bool QuadEdgeSubdivision::isOnEdge(const QuadEdge &e, const Coordinate &p) const
+bool
+QuadEdgeSubdivision::isOnEdge(const QuadEdge &e, const Coordinate &p) const
 {
 	geom::LineSegment seg;
 	seg.setCoordinates(e.orig().getCoordinate(), e.dest().getCoordinate());
@@ -282,7 +295,8 @@
 	return dist < edgeCoincidenceTolerance;
 }
 
-bool QuadEdgeSubdivision::isVertexOfEdge(const QuadEdge &e, const Vertex &v) const
+bool
+QuadEdgeSubdivision::isVertexOfEdge(const QuadEdge &e, const Vertex &v) const
 {
 	if ((v.equals(e.orig(), tolerance)) || (v.equals(e.dest(), tolerance))) {
 		return true;
@@ -290,7 +304,8 @@
 	return false;
 }
 
-std::auto_ptr<QuadEdgeSubdivision::QuadEdgeList> QuadEdgeSubdivision::getPrimaryEdges(bool includeFrame)
+std::auto_ptr<QuadEdgeSubdivision::QuadEdgeList>
+QuadEdgeSubdivision::getPrimaryEdges(bool includeFrame)
 {
 	QuadEdgeList *edges = new QuadEdgeList();
 	QuadEdgeStack edgeStack;
@@ -319,7 +334,8 @@
 	return std::auto_ptr<QuadEdgeList>(edges);
 }
 
-QuadEdge** QuadEdgeSubdivision::fetchTriangleToVisit(QuadEdge *edge,
+QuadEdge**
+QuadEdgeSubdivision::fetchTriangleToVisit(QuadEdge *edge,
 		QuadEdgeStack &edgeStack, bool includeFrame, QuadEdgeSet &visitedEdges)
 {
 	QuadEdge *curr = edge;
@@ -350,7 +366,8 @@
 	return triEdges;
 }
 
-class QuadEdgeSubdivision::TriangleCoordinatesVisitor : public TriangleVisitor {
+class
+QuadEdgeSubdivision::TriangleCoordinatesVisitor : public TriangleVisitor {
 private:
 	QuadEdgeSubdivision::TriList *triCoords;
 	CoordinateArraySequenceFactory coordSeqFact;
@@ -372,13 +389,15 @@
 	}
 }; 
 
-void QuadEdgeSubdivision::getTriangleCoordinates(QuadEdgeSubdivision::TriList* triList, bool includeFrame)
+void
+QuadEdgeSubdivision::getTriangleCoordinates(QuadEdgeSubdivision::TriList* triList, bool includeFrame)
 {
 	TriangleCoordinatesVisitor visitor(triList);
 	visitTriangles((TriangleVisitor*)&visitor, includeFrame);
 }
 
-void QuadEdgeSubdivision::visitTriangles(TriangleVisitor *triVisitor, bool includeFrame)
+void
+QuadEdgeSubdivision::visitTriangles(TriangleVisitor *triVisitor, bool includeFrame)
 {
 
 	QuadEdgeStack edgeStack;
@@ -398,7 +417,8 @@
 	}
 }
 
-std::auto_ptr<geom::MultiLineString> QuadEdgeSubdivision::getEdges(const geom::GeometryFactory& geomFact)
+std::auto_ptr<geom::MultiLineString>
+QuadEdgeSubdivision::getEdges(const geom::GeometryFactory& geomFact)
 {
 	std::auto_ptr<QuadEdgeList> quadEdges(getPrimaryEdges(false));
 	std::vector<Geometry *> edges(quadEdges->size());
@@ -425,7 +445,8 @@
 	return std::auto_ptr<MultiLineString>(result);
 }
 
-std::auto_ptr<GeometryCollection> QuadEdgeSubdivision::getTriangles( const GeometryFactory &geomFact)
+std::auto_ptr<GeometryCollection>
+QuadEdgeSubdivision::getTriangles( const GeometryFactory &geomFact)
 {
 	TriList triPtsList;
 	getTriangleCoordinates(&triPtsList, false);

Modified: trunk/src/triangulate/quadedge/TrianglePredicate.cpp
===================================================================
--- trunk/src/triangulate/quadedge/TrianglePredicate.cpp	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/src/triangulate/quadedge/TrianglePredicate.cpp	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/TrianglePredicate.java rev. r524
+ * Last port: triangulate/quadedge/TrianglePredicate.java r524
  *
  **********************************************************************/
 
@@ -23,7 +23,8 @@
 namespace geos {
 namespace geom { // geos.geom
 
-bool TrianglePredicate::isInCircleNonRobust(
+bool
+TrianglePredicate::isInCircleNonRobust(
 		const Coordinate &a, const Coordinate &b, const Coordinate &c, 
 		const Coordinate &p)
 {
@@ -36,7 +37,8 @@
 	return isInCircle;
 }
 
-bool TrianglePredicate::isInCircleNormalized(
+bool
+TrianglePredicate::isInCircleNormalized(
 		const Coordinate &a, const Coordinate &b, const Coordinate &c, 
 		const Coordinate &p)
 {
@@ -58,14 +60,16 @@
 	return disc > 0;
 }
 
-double TrianglePredicate::triArea(const Coordinate &a,
+double
+TrianglePredicate::triArea(const Coordinate &a,
 		const Coordinate &b, const Coordinate &c)
 {
 	return (b.x - a.x) * (c.y - a.y) 
 		- (b.y - a.y) * (c.x - a.x);
 }
 
-bool TrianglePredicate::isInCircleRobust(
+bool
+TrianglePredicate::isInCircleRobust(
 		const Coordinate &a, const Coordinate &b, const Coordinate &c, 
 		const Coordinate &p) 
 {

Modified: trunk/src/triangulate/quadedge/TriangleVisitor.cpp
===================================================================
--- trunk/src/triangulate/quadedge/TriangleVisitor.cpp	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/src/triangulate/quadedge/TriangleVisitor.cpp	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/quadedge/TriangleVisitor.java rev. r524
+ * Last port: triangulate/quadedge/TriangleVisitor.java r524
  *
  **********************************************************************/
 

Modified: trunk/src/triangulate/quadedge/Vertex.cpp
===================================================================
--- trunk/src/triangulate/quadedge/Vertex.cpp	2012-06-26 20:42:15 UTC (rev 3698)
+++ trunk/src/triangulate/quadedge/Vertex.cpp	2012-06-27 09:23:32 UTC (rev 3699)
@@ -12,7 +12,7 @@
  *
  **********************************************************************
  *
- * Last port: triangulate/Vertex.java rev. r524
+ * Last port: triangulate/Vertex.java r524
  *
  **********************************************************************/
 



More information about the geos-commits mailing list