Changeset 16825

Timestamp:

Mar 4, 2008, 5:26:59 PM (18 years ago)

Author:

Paul Price

Message:

Allow Boolean values to be written to FITS tables. Since we can't use
a vector of boolean values, we use U8 instead, and treat the type as
somewhat special.

File:

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

trunk/psLib/src/fits/psFitsTable.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-20 19:14:22 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-03-05 03:26:59 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -439 +439 @@
                 // A new one!
                 colSpec *spec = psAlloc(sizeof(colSpec)); // Specification for this column
-                spec->type = colItem->type;
+                // BOOL type is not a valid vector type, so we translate it to U8
+                spec->type = colItem->type == PS_TYPE_BOOL ? PS_TYPE_U8 : colItem->type;
                 spec->size = size;
                 if (colItem->type == PS_DATA_VECTOR) {
@@ -453 +454 @@
                     spec->size = size;
                 }
-                if (colItem->type != spec->type) {
+                if (colItem->type != spec->type &&
+                    colItem->type != PS_TYPE_BOOL && spec->type != PS_TYPE_U8) {
                     psWarning("Differing type found for column %s: %x vs %x --- using the first found.\n",
                               colSpecItem->name, colItem->type, spec->type);