[geos-commits] r2275 - trunk/source/geom

[svn_geos at osgeo.org]

Author: mloskot
Date: 2009-03-11 08:18:47 -0400 (Wed, 11 Mar 2009)
New Revision: 2275

Modified:
   trunk/source/geom/CoordinateArraySequence.cpp
Log:
Number of assertions in CoordinateArraySequence class.

Modified: trunk/source/geom/CoordinateArraySequence.cpp
===================================================================
--- trunk/source/geom/CoordinateArraySequence.cpp	2009-03-10 17:29:50 UTC (rev 2274)
+++ trunk/source/geom/CoordinateArraySequence.cpp	2009-03-11 12:18:47 UTC (rev 2275)
@@ -61,30 +61,35 @@
 void
 CoordinateArraySequence::setPoints(const vector<Coordinate> &v)
 {
+    assert(0 != vect);
 	vect->assign(v.begin(), v.end());
 }
 
 const vector<Coordinate>*
 CoordinateArraySequence::toVector() const
 {
+    assert(0 != vect);
 	return vect; //new vector<Coordinate>(vect->begin(),vect->end());
 }
 
 bool
 CoordinateArraySequence::isEmpty() const
 {
+    assert(0 != vect);
 	return vect->empty();
 }
 
 void
 CoordinateArraySequence::add(const Coordinate& c)
 {
+    assert(0 != vect);
 	vect->push_back(c);
 }
 
 void
 CoordinateArraySequence::add(const Coordinate& c, bool allowRepeated)
 {
+    assert(0 != vect);
 	if (!allowRepeated && ! vect->empty() )
 	{
 		const Coordinate& last=vect->back();
@@ -102,13 +107,15 @@
 const Coordinate &
 CoordinateArraySequence::getAt(size_t pos) const
 {
-	assert(pos<vect->size());
+    assert(0 != vect);
+	assert(pos < vect->size());
 	return (*vect)[pos];
 }
 
 void
 CoordinateArraySequence::getAt(size_t pos, Coordinate &c) const
 {
+    assert(0 != vect);
 	assert(pos<vect->size());
 	c=(*vect)[pos];
 }
@@ -116,6 +123,7 @@
 void
 CoordinateArraySequence::setAt(const Coordinate& c, size_t pos)
 {
+    assert(0 != vect);
 	assert(pos<vect->size());
 	(*vect)[pos]=c;
 }
@@ -123,6 +131,7 @@
 void
 CoordinateArraySequence::deleteAt(size_t pos)
 {
+    assert(0 != vect);
 	assert(pos<vect->size());
 	vect->erase(vect->begin()+pos);
 }
@@ -153,6 +162,7 @@
 void
 CoordinateArraySequence::expandEnvelope(Envelope &env) const
 {
+    assert(0 != vect);
 	size_t size = vect->size();
 	for (size_t i=0; i<size; i++) env.expandToInclude((*vect)[i]);
 }
@@ -160,7 +170,7 @@
 double
 CoordinateArraySequence::getOrdinate(size_t index, size_t ordinateIndex) const
 {
-
+    assert(0 != vect);
 	assert(index<vect->size());
 
 	switch (ordinateIndex)
@@ -181,6 +191,7 @@
 	double value)
 {
 
+    assert(0 != vect);
 	assert(index<vect->size());
 
     assert(ordinateIndex == CoordinateSequence::X
@@ -206,6 +217,7 @@
 void
 CoordinateArraySequence::apply_rw(const CoordinateFilter *filter)
 {
+    assert(0 != vect);
 	for (vector<Coordinate>::iterator i=vect->begin(), e=vect->end(); i!=e; ++i)
 	{
 		filter->filter_rw(&(*i));
@@ -215,6 +227,7 @@
 void
 CoordinateArraySequence::apply_ro(CoordinateFilter *filter) const
 {
+    assert(0 != vect);
 	for (vector<Coordinate>::const_iterator i=vect->begin(), e=vect->end(); i!=e; ++i)
 	{
 		filter->filter_ro(&(*i));
@@ -224,6 +237,7 @@
 CoordinateSequence&
 CoordinateArraySequence::removeRepeatedPoints()
 {
+    assert(0 != vect);
 	// We use == operator, which is 2D only
 	vector<Coordinate>::iterator new_end = \
 		std::unique(vect->begin(), vect->end());