Changeset 2726

Timestamp:

Nov 19, 2009, 11:19:39 AM (15 years ago)

Author:

strk

Message:

Change PolygonizeGraph::getEdgeRings signature so not to force heap allocation of std::vector, update Polygonizer accordingly

Location:

trunk/source

Files:

• headers/geos/operation/polygonize/PolygonizeGraph.h (modified) (1 diff)
• headers/geos/operation/polygonize/Polygonizer.h (modified) (1 diff)
• operation/polygonize/PolygonizeGraph.cpp (modified) (3 diffs)
• operation/polygonize/Polygonizer.cpp (modified) (3 diffs)

trunk/source/headers/geos/operation/polygonize/PolygonizeGraph.h

@@ -97 +97 @@
          * Computes the EdgeRings formed by the edges in this graph.
          *
-         * @return a list of the EdgeRing found by the
-         *      polygonization process.
-         */
-        std::vector<EdgeRing*>* getEdgeRings();
+         * @param edgeRingList : the EdgeRing found by the
+         *      polygonization process will be pushed here.
+         *
+         */
+        void getEdgeRings(std::vector<EdgeRing*>& edgeRingList);
 
         /**

trunk/source/headers/geos/operation/polygonize/Polygonizer.h

@@ -96 +96 @@
         void polygonize();
 
-        void findValidRings(std::vector<EdgeRing*> *edgeRingList,
+        /// @todo : take all args by ref
+        void findValidRings(std::vector<EdgeRing*>& edgeRingList,
                         std::vector<EdgeRing*> *validEdgeRingList,
                         std::vector<geom::LineString*> *invalidRingList);

trunk/source/operation/polygonize/PolygonizeGraph.cpp

@@ -214 +214 @@
 }
 
-/**
- * Computes the EdgeRings formed by the edges in this graph.
- * @return a list of the EdgeRing found by the polygonization process.
- */
-std::vector<EdgeRing*>*
-PolygonizeGraph::getEdgeRings()
+/* public */
+void
+PolygonizeGraph::getEdgeRings(std::vector<EdgeRing*>& edgeRingList)
 {
         // maybe could optimize this, since most of these pointers should
@@ -233 +230 @@
 
         // find all edgerings
-        std::vector<EdgeRing*> *edgeRingList=new std::vector<EdgeRing*>();
         for(unsigned int i=0; i<dirEdges.size(); ++i)
         {
@@ -240 +236 @@
                 if (de->isInRing()) continue;
                 EdgeRing *er=findEdgeRing(de);
-                edgeRingList->push_back(er);
-        }
-        return edgeRingList;
+                edgeRingList.push_back(er);
+        }
 }
 

trunk/source/operation/polygonize/Polygonizer.cpp

@@ -237 +237 @@
         dangles=graph->deleteDangles();
         cutEdges=graph->deleteCutEdges();
-        vector<EdgeRing*> *edgeRingList=graph->getEdgeRings();
+        vector<EdgeRing*> edgeRingList;
+        graph->getEdgeRings(edgeRingList);
 #if GEOS_DEBUG
-        cerr<<"Polygonizer::polygonize(): "<<edgeRingList->size()<<" edgeRings in graph"<<endl;
+        cerr<<"Polygonizer::polygonize(): "<<edgeRingList.size()<<" edgeRings in graph"<<endl;
 #endif
         vector<EdgeRing*> *validEdgeRingList=new vector<EdgeRing*>();
@@ -248 +249 @@
         cerr<<"                           "<<invalidRingLines->size()<<" invalid"<<endl;
 #endif
-        delete edgeRingList;
 
         findShellsAndHoles(validEdgeRingList);
@@ -266 +266 @@
 }
 
-void
-Polygonizer::findValidRings(vector<EdgeRing*> *edgeRingList, vector<EdgeRing*> *validEdgeRingList, vector<LineString*> *invalidRingList)
-{
-        for (unsigned int i=0, n=edgeRingList->size(); i<n; ++i)
-        {
-                EdgeRing *er=(*edgeRingList)[i];
+/* private */
+void
+Polygonizer::findValidRings(vector<EdgeRing*>& edgeRingList,
+        vector<EdgeRing*> *validEdgeRingList,
+        vector<LineString*> *invalidRingList)
+{
+        typedef vector<EdgeRing*> EdgeRingList;
+        
+        for (EdgeRingList::size_type i=0, n=edgeRingList.size(); i<n; ++i)
+        {
+                EdgeRing *er = edgeRingList[i];
                 if (er->isValid())
                         validEdgeRingList->push_back(er);