Changeset 32409 for trunk/psLib/src/fits/psFitsTableNew.c

Timestamp:

Sep 16, 2011, 5:09:33 PM (15 years ago)

Author:

bills

Message:

In psFitsReadTableNew a fits table is empty return a psFitsTable struct with numRows and numCols set to zero.
This is compatible with psFitsReadTable

File:

• trunk/psLib/src/fits/psFitsTableNew.c (modified) (3 diffs)

trunk/psLib/src/fits/psFitsTableNew.c

@@ -117 +117 @@
 
 psFitsTable* psFitsTableAlloc(int numCols, int numRows) {
-    if (numCols <= 0) {
+    if (numCols < 0) {
+        // empty table
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 "Can't allocate a psFitsTable with %d columns.", numCols);
@@ -127 +128 @@
     table->numRows = numRows;
     table->numCols = numCols;
-    table->columns = psAlloc(sizeof(psFitsTableColumn) * numCols);
-    memset(table->columns, sizeof(psFitsTableColumn) * numCols, 0);
+    if (numCols > 0) {
+        table->columns = psAlloc(sizeof(psFitsTableColumn) * numCols);
+        memset(table->columns, sizeof(psFitsTableColumn) * numCols, 0);
+    } else {
+        table->columns = NULL;
+    }
     psMemSetDeallocator(table, (psFreeFunc) freeTable);
 
@@ -141 +146 @@
     if (!readTableCheck(fits)) {
         if (emptyTableCheck(fits)) {
-            return NULL;
+            psFitsTable *table = psFitsTableAlloc(0, 0);
+            return table;
         }
         psError(PS_ERR_BAD_FITS, true, "Extension is not a table");