Changeset 16424

Timestamp:

05/29/13 11:59:19 (11 years ago)

Author:

tbretz

Message:

Added new member in Column to store the total number of bytes; replaced num*size by bytes.

File:

• trunk/Mars/mcore/fits.h (modified) (6 diffs)

trunk/Mars/mcore/fits.h

@@ -113 +113 @@
             size_t num;
             size_t size;
+            size_t bytes;  // num*size
             char   type;
             string unit;
@@ -346 +347 @@
                 }
 
-                const Table::Column col = { bytes, n, size, type, unit, compress};
+                const Table::Column col = { bytes, n, size, n*size, type, unit, compress};
 
                 cols[id] = col;
@@ -781 +782 @@
 
     template<size_t N>
-        void revcpy(char *dest, const char *src, int num)
+        void revcpy(char *dest, const char *src, const int &num)
     {
         const char *pend = src + num*N;
@@ -788 +789 @@
     }
 
-    virtual void MoveColumnDataToUserSpace(char* dest, const char*src, const Table::Column& c)
+    virtual void MoveColumnDataToUserSpace(char *dest, const char *src, const Table::Column& c)
     {
         // Let the compiler do some optimization by
@@ -794 +795 @@
         switch (c.size)
         {
-        case 1: memcpy   (dest, src, c.num*c.size); break;
-        case 2: revcpy<2>(dest, src, c.num);        break;
-        case 4: revcpy<4>(dest, src, c.num);        break;
-        case 8: revcpy<8>(dest, src, c.num);        break;
+        case 1: memcpy   (dest, src, c.bytes); break;
+        case 2: revcpy<2>(dest, src, c.num);   break;
+        case 4: revcpy<4>(dest, src, c.num);   break;
+        case 8: revcpy<8>(dest, src, c.num);   break;
         }
     }
@@ -873 +874 @@
             return it->second;
 
-        fGarbage.emplace_back(fTable.cols[name].size*fTable.cols[name].num);
+        fGarbage.emplace_back(fTable.cols[name].bytes);
 
         void *ptr = fGarbage.back().data();