Changeset 16890 for trunk/Mars/mcore/zfits.h

Timestamp:

06/22/13 16:28:00 (11 years ago)

Author:

tbretz

Message:

Consistency of member names

File:

• trunk/Mars/mcore/zfits.h (modified) (9 diffs)

trunk/Mars/mcore/zfits.h

@@ -63 +63 @@
     bool SkipNextRow()
     {
-        if (!fTable.isCompressed)
+        if (!fTable.is_compressed)
             return fits::SkipNextRow();
 
@@ -76 +76 @@
     virtual void StageRow(size_t row, char* dest)
     {
-        if (!fTable.isCompressed)
+        if (!fTable.is_compressed)
         {
             fits::StageRow(row, dest);
@@ -122 +122 @@
     void InitCompressionReading()
     {
-        if (!fTable.isCompressed)
+        if (!fTable.is_compressed)
             return;
 
@@ -129 +129 @@
             return;
 
-        if (fTable.isCompressed)
-        {
-            for (auto it=fTable.sortedCols.begin(); it!= fTable.sortedCols.end(); it++)
+        if (fTable.is_compressed)
+        {
+            for (auto it=fTable.sorted_cols.begin(); it!= fTable.sorted_cols.end(); it++)
             {
                 if (it->comp == kCompFACT)
@@ -146 +146 @@
         }
 
-        fColumnOrdering.resize(fTable.sortedCols.size());
+        fColumnOrdering.resize(fTable.sorted_cols.size());
         for (auto it=fColumnOrdering.begin(); it != fColumnOrdering.end(); it++)
             (*it) = kOrderByRow;
         //Get compressed specific keywords
-        fNumTiles       = fTable.isCompressed ? GetInt("NAXIS2") : 0;
-        fNumRowsPerTile = fTable.isCompressed ? GetInt("ZTILELEN") : 0;
+        fNumTiles       = fTable.is_compressed ? GetInt("NAXIS2") : 0;
+        fNumRowsPerTile = fTable.is_compressed ? GetInt("ZTILELEN") : 0;
 
         //give it some space for uncompressing
@@ -166 +166 @@
     void MoveColumnDataToUserSpace(char* dest, const char* src, const Table::Column& c)
     {
-        if (!fTable.isCompressed)
+        if (!fTable.is_compressed)
         {
             fits::MoveColumnDataToUserSpace(dest, src, c);
@@ -334 +334 @@
 
             uint32_t i=0;
-            for (auto it=fTable.sortedCols.begin(); it!=fTable.sortedCols.end(); it++, i++)
+            for (auto it=fTable.sorted_cols.begin(); it!=fTable.sorted_cols.end(); it++, i++)
             {
                 char *buffer = fBuffer.data() + it->offset; // pointer to column (destination buffer)
@@ -433 +433 @@
 
         //uncompress column by column
-        for (uint32_t i=0; i<fTable.sortedCols.size(); i++)
-        {
-            const fits::Table::Column &col = fTable.sortedCols[i];
+        for (uint32_t i=0; i<fTable.sorted_cols.size(); i++)
+        {
+            const fits::Table::Column &col = fTable.sorted_cols[i];
             if (col.num == 0)
                 continue;
@@ -524 +524 @@
             {
                 //zero sized column do not have headers. Skip it
-                if (fTable.sortedCols[i].num == 0)
+                if (fTable.sorted_cols[i].num == 0)
                 {
                     catalog.back().push_back(make_pair(0,0));