[cig-commits] r16122 - in cs/spatialdata-0.1/trunk: . libsrc/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2009-12-30 13:03:30 -0800 (Wed, 30 Dec 2009)
New Revision: 16122

Modified:
   cs/spatialdata-0.1/trunk/
   cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.icc
   cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.cc
Log:
Small fix.


Property changes on: cs/spatialdata-0.1/trunk
___________________________________________________________________
Name: svn:ignore
   - spatialdata.egg-info
configure
aux-config
autom4te.cache
portinfo.in
aclocal.m4

Makefile.in

   + spatialdata.egg-info
configure
aux-config
autom4te.cache
portinfo.in
aclocal.m4

Makefile.in

.project

.cproject

.pydevproject

.settings


Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.icc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.icc	2009-12-30 14:46:28 UTC (rev 16121)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBData.icc	2009-12-30 21:03:30 UTC (rev 16122)
@@ -48,7 +48,7 @@
 inline
 const double*
 spatialdata::spatialdb::SimpleDBData::coordinates(const int index) const {
-  assert(index >= 0 & index < _numLocs);
+  assert(index >= 0 && index < _numLocs);
   return &_coordinates[index*_spaceDim];
 }
 
@@ -56,7 +56,7 @@
 inline
 double*
 spatialdata::spatialdb::SimpleDBData::coordinates(const int index) {
-  assert(index >= 0 & index < _numLocs);
+  assert(index >= 0 && index < _numLocs);
   return &_coordinates[index*_spaceDim];
 }
 

Modified: cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.cc
===================================================================
--- cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.cc	2009-12-30 14:46:28 UTC (rev 16121)
+++ cs/spatialdata-0.1/trunk/libsrc/spatialdb/SimpleDBQuery.cc	2009-12-30 21:03:30 UTC (rev 16122)
@@ -324,7 +324,7 @@
 // ----------------------------------------------------------------------
 void
 spatialdata::spatialdb::SimpleDBQuery::_findLinePt(std::vector<WtStruct>* pWeights)
-{ // _findPointPt
+{ // _findLinePt
   assert(0 != _db._data);
   assert(0 != pWeights);
   
@@ -336,6 +336,7 @@
 
   const int locIndexA = _nearest[nearIndexA];
   double ptA[3];
+  assert(locIndexA >= 0);
   _setPoint3(ptA, _db._data->coordinates(locIndexA), spaceDim);
 
   double wtA = 0;