Changeset 32410

Timestamp:

Sep 16, 2011, 5:11:00 PM (15 years ago)

Author:

bills

Message:

Handle cmf files with empty tables as we did before the rework

Location:

tags/ipp-20110622

Files:

• magic/remove/src/streaksremove.c (modified) (1 diff, 1 prop)
• psLib/src/fits/psFitsTableNew.c (modified) (3 diffs, 1 prop)

tags/ipp-20110622/magic/remove/src/streaksremove.c

@@ -981 +981 @@
         }
 
-        // XXX: Handle case where numCols == 0 Can that happen?
-        // Previously we were writing a blank extension
-
-        // For speed we get intimate with the table
-        // avoid 2 * numRows lookups of the column number by looking
-        // it up ahead of time and verifying that the type is what we
-        // expect.
-        int xCol = psFitsTableGetColumnNumber(table, "X_PSF");
-        assert(xCol >= 0 && xCol < table->numCols);
-        assert(table->columns[xCol].type == PS_DATA_F32);
-
-        int yCol = psFitsTableGetColumnNumber(table, "Y_PSF");
-        assert(yCol >= 0 && yCol < table->numCols);
-        assert(table->columns[yCol].type == PS_DATA_F32);
-
-        // We mark censored rows in this array.
-        bool *rowCensored = psAlloc(table->numRows * sizeof(bool));
-        memset(rowCensored, 0, table->numRows * sizeof(bool));
         int numCensored = 0;
-
-        for (int i = 0 ; i < table->numRows; i++) {
+        bool *rowCensored = NULL;
+        if (table->numRows > 0) {
+            // For speed we get intimate with the table
+            // avoid 2 * numRows lookups of the column number by looking
+            // it up ahead of time and verifying that the type is what we
+            // expect.
+            int xCol = psFitsTableGetColumnNumber(table, "X_PSF");
+            assert(xCol >= 0 && xCol < table->numCols);
+            assert(table->columns[xCol].type == PS_DATA_F32);
+
+            int yCol = psFitsTableGetColumnNumber(table, "Y_PSF");
+            assert(yCol >= 0 && yCol < table->numCols);
+            assert(table->columns[yCol].type == PS_DATA_F32);
+
+            // We mark censored rows in this array.
+            rowCensored = psAlloc(table->numRows * sizeof(bool));
+            memset(rowCensored, 0, table->numRows * sizeof(bool));
+
+            for (int i = 0 ; i < table->numRows; i++) {
 
 #ifndef GO_SLOWER
-            psF32 x = table->columns[xCol].data.F32[i];
-            psF32 y = table->columns[yCol].data.F32[i];
+                psF32 x = table->columns[xCol].data.F32[i];
+                psF32 y = table->columns[yCol].data.F32[i];
 #else
-            psF32 x = psFitsTableGetF32(NULL, table, i, "X_PSF");
-            psF32 y = psFitsTableGetF32(NULL, table, i, "Y_PSF");
+                psF32 x = psFitsTableGetF32(NULL, table, i, "X_PSF");
+                psF32 y = psFitsTableGetF32(NULL, table, i, "Y_PSF");
 #endif
-            psImageMaskType mask;
-            if ((x >= maskImage->numCols) || (y >= maskImage->numRows) || (x <  0) || (y < 0) || isnan(x) || isnan(y)) {
-                mask = maskStreak;
-            } else {
-                mask = maskImage->data.PS_TYPE_IMAGE_MASK_DATA[(int)y][(int)x];
-            }
-
-            // Key the source if the center pixel is not masked with maskStreak
-            if (mask & maskStreak) {
-                rowCensored[i] = true;
-                numCensored++;
-            }
-        }
-
-        // remove the censored rows from the table
-        if (!psFitsTableCensor(table, rowCensored)) {
-            streaksExit("", PS_EXIT_PROG_ERROR);
-        }
-
-        addDestreakKeyword(header, true);
+                psImageMaskType mask;
+                if ((x >= maskImage->numCols) || (y >= maskImage->numRows) || (x <  0) || (y < 0) || isnan(x) || isnan(y)) {
+                    mask = maskStreak;
+                } else {
+                    mask = maskImage->data.PS_TYPE_IMAGE_MASK_DATA[(int)y][(int)x];
+                }
+
+                // Key the source if the center pixel is not masked with maskStreak
+                if (mask & maskStreak) {
+                    rowCensored[i] = true;
+                    numCensored++;
+                }
+            }
+
+            // remove the censored rows from the table
+            if (!psFitsTableCensor(table, rowCensored)) {
+                streaksExit("", PS_EXIT_PROG_ERROR);
+            }
+
+            addDestreakKeyword(header, true);
+        }
 
         if (table->numCols > 0) {

tags/ipp-20110622/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");