Changeset 28508

Timestamp:

Jun 25, 2010, 2:28:23 PM (16 years ago)

Author:

Paul Price

Message:

Backporting fix to allow empty header to be a FITS table.

Location:

tags/ipp-20100623

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• psLib/src/fits/psFitsTable.c (modified) (1 diff)
• psModules (modified) (1 prop)
• psphot (modified) (1 prop)

tags/ipp-20100623/psLib/src/fits/psFitsTable.c

@@ -67 +67 @@
         return false;
     }
+    if (hdutype == IMAGE_HDU) {
+        // It could be an empty table
+        long size = 0;                  // Size of 'table'
+        if (fits_get_num_rows(fits->fd, &size, &status)) {
+            psFitsError(status, true, "Unable to determine size of table.");
+            return false;
+        }
+        if (size != 0) {
+            psFitsError(PS_ERR_BAD_FITS, true, "Current FITS HDU is not a table.");
+            return false;
+        }
+    }
     if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) {
-        psError(PS_ERR_IO, true, _("Current FITS HDU is not a table."));
+        psError(PS_ERR_BAD_FITS, true, _("Current FITS HDU is not a table."));
         return false;
     }