[geos-commits] r2091 - trunk/source/geom
svn_geos at osgeo.org
svn_geos at osgeo.org
Fri Dec 21 17:49:03 EST 2007
Author: mloskot
Date: 2007-12-21 17:49:03 -0500 (Fri, 21 Dec 2007)
New Revision: 2091
Modified:
trunk/source/geom/CoordinateArraySequence.cpp
trunk/source/geom/CoordinateSequence.cpp
trunk/source/geom/LineString.cpp
Log:
Reverted changes appled in r2089 to three files from source/geom.
Modified: trunk/source/geom/CoordinateArraySequence.cpp
===================================================================
--- trunk/source/geom/CoordinateArraySequence.cpp 2007-12-21 22:47:16 UTC (rev 2090)
+++ trunk/source/geom/CoordinateArraySequence.cpp 2007-12-21 22:49:03 UTC (rev 2091)
@@ -22,7 +22,6 @@
#include <cassert>
#include <algorithm>
#include <vector>
-#include <iostream>
using namespace std;
Modified: trunk/source/geom/CoordinateSequence.cpp
===================================================================
--- trunk/source/geom/CoordinateSequence.cpp 2007-12-21 22:47:16 UTC (rev 2090)
+++ trunk/source/geom/CoordinateSequence.cpp 2007-12-21 22:49:03 UTC (rev 2091)
@@ -25,7 +25,6 @@
#include <algorithm>
#include <vector>
#include <cassert>
-#include <iostream>
using namespace std;
@@ -234,18 +233,12 @@
static Profile *prof= profiler->get("CoordinateSequence::removeRepeatedPoints()");
prof->start();
#endif
- cout << "size: " << cl->size() << endl;
- cout << "getSize: " << cl->getSize() << endl;
const vector<Coordinate> *v=cl->toVector();
vector<Coordinate> *nv=new vector<Coordinate>;
- cout << "XXX: " << v->size() << endl;
nv->reserve(v->size());
- cout << "d\n";
unique_copy(v->begin(), v->end(), back_inserter(*nv));
- cout << "e\n";
CoordinateSequence* ret=CoordinateArraySequenceFactory::instance()->create(nv);
- cout << "f\n";
#if PROFILE
prof->stop();
Modified: trunk/source/geom/LineString.cpp
===================================================================
--- trunk/source/geom/LineString.cpp 2007-12-21 22:47:16 UTC (rev 2090)
+++ trunk/source/geom/LineString.cpp 2007-12-21 22:49:03 UTC (rev 2091)
@@ -34,7 +34,6 @@
#include <typeinfo>
#include <memory>
#include <cassert>
-#include <iostream>
using namespace std;
using namespace geos::algorithm;
@@ -115,8 +114,7 @@
const CoordinateSequence*
LineString::getCoordinatesRO() const
{
- cout << "WWW: " << points.get()->getSize() << endl;
- assert(points.get());
+ assert(0 != points.get());
return points.get();
}
More information about the geos-commits
mailing list