[lmi-commits] [4922] Fix defect introduced 20050114T1947Z

[Greg Chicares]

Revision: 4922
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=4922
Author:   chicares
Date:     2010-05-08 12:04:38 +0000 (Sat, 08 May 2010)
Log Message:
-----------
Fix defect introduced 20050114T1947Z

Modified Paths:
--------------
    lmi/trunk/database.cpp
    lmi/trunk/ihs_database.cpp

Modified: lmi/trunk/database.cpp
===================================================================
--- lmi/trunk/database.cpp      2010-05-08 02:53:11 UTC (rev 4921)
+++ lmi/trunk/database.cpp      2010-05-08 12:04:38 UTC (rev 4922)
@@ -111,13 +111,13 @@
 {
     database_entity const& v = GetEntry(k);
     double const*const z = v[index_];
-    dst.resize(length_);
-    if(1 == v.GetNDims())
+    if(1 == v.GetLength())
         {
         dst.assign(length_, *z);
         }
     else
         {
+        dst.resize(length_);
         int s = std::min(length_, v.GetLength());
         for(int j = 0; j < s; ++j)
             {

Modified: lmi/trunk/ihs_database.cpp
===================================================================
--- lmi/trunk/ihs_database.cpp  2010-05-08 02:53:11 UTC (rev 4921)
+++ lmi/trunk/ihs_database.cpp  2010-05-08 12:04:38 UTC (rev 4922)
@@ -173,12 +173,9 @@
 {
     database_entity const& v = GetEntry(k);
     double const*const z = v[index_];
-    // TODO ?? Can this be right?
-    if(1 == v.GetNDims())
+    if(1 == v.GetLength())
         {
-        // TODO ?? Can this be right? Seems unreachable.
-        int len = length_;   // TODO ?? First arg of assign not const?
-        dst.assign(len, *z);
+        dst.assign(length_, *z);
         }
     else
         {