Changeset 7244

Timestamp:

May 30, 2006, 12:11:51 PM (20 years ago)

Author:

Paul Price

Message:

Fix for bug 759: Adding a filter to catch NaN, Inf and -Inf in FITS
headers. Due to a deficiency in cfitsio, fits_get_keytype reports
these as short int, which is its default, "I've no idea what this is"
type. We filter them out explicitly, and add them into the metadata
as F32 types.

File:

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

trunk/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-27 02:09:47 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-30 22:11:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -17 +17 @@
 #include "psFits.h"
 #include "string.h"
+#include "strings.h"
 #include "psError.h"
 #include "psErrorText.h"
@@ -109 +110 @@
             break;
         case 'I': // short int.
-            success = psMetadataAdd(out, PS_LIST_TAIL, keyName, PS_DATA_S16 | dupFlag, keyComment,
-                                    (psS16)atoi(keyValue));
+            // This is the default type that cfitsio reports whenever it doesn't know what it is.
+            // Trap NAN, INF and -INF, which cfitsio doesn't handle.
+            if (strncasecmp(keyValue, "nan", 3) == 0) {
+                success = psMetadataAdd(out, PS_LIST_TAIL, keyName, PS_DATA_F32 | dupFlag, keyComment,
+                                        (psF32)NAN);
+            } else if (strncasecmp(keyValue, "inf", 3) == 0) {
+                success = psMetadataAdd(out, PS_LIST_TAIL, keyName, PS_DATA_F32 | dupFlag, keyComment,
+                                        (psF32)INFINITY);
+            } else if (strncasecmp(keyValue, "-inf", 4) == 0) {
+                success = psMetadataAdd(out, PS_LIST_TAIL, keyName, PS_DATA_F32 | dupFlag, keyComment,
+                                        (psF32)-INFINITY);
+            } else {
+                success = psMetadataAdd(out, PS_LIST_TAIL, keyName, PS_DATA_S16 | dupFlag, keyComment,
+                                        (psS16)atoi(keyValue));
+            }
             break;
         case 'J': // int.