Changeset 3039

Timestamp:

Jan 18, 2005, 10:01:48 AM (22 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src

Files:

• dataIO/psFits.c (modified) (2 diffs)
• fileUtils/psFits.c (modified) (2 diffs)
• fits/psFits.c (modified) (2 diffs)

trunk/psLib/src/dataIO/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-18 19:49:30 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-18 20:01:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1209 +1209 @@
             #define READ_TABLE_ROW_CASE(FITSTYPE, NATIVETYPE, TYPE) \
         case FITSTYPE: { \
-                NATIVETYPE value; \
+                NATIVETYPE value = 0; \
                 int anynul = 0; \
                 fits_read_col(fits->p_fd, FITSTYPE, col,row+1, \
                               1, 1, NULL, &value, &anynul, &status); \
-                if (anynul == 0) { \
-                    psMetadataAdd(data,PS_LIST_TAIL, name, \
-                                  PS_TYPE_##TYPE, PS_META_PRIMITIVE, \
-                                  "", (ps##TYPE)value); \
-                } \
+                psMetadataAdd(data,PS_LIST_TAIL, name, \
+                              PS_TYPE_##TYPE, PS_META_PRIMITIVE, \
+                              "", (ps##TYPE)value); \
                 break; \
             }

trunk/psLib/src/fileUtils/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-18 19:49:30 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-18 20:01:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1209 +1209 @@
             #define READ_TABLE_ROW_CASE(FITSTYPE, NATIVETYPE, TYPE) \
         case FITSTYPE: { \
-                NATIVETYPE value; \
+                NATIVETYPE value = 0; \
                 int anynul = 0; \
                 fits_read_col(fits->p_fd, FITSTYPE, col,row+1, \
                               1, 1, NULL, &value, &anynul, &status); \
-                if (anynul == 0) { \
-                    psMetadataAdd(data,PS_LIST_TAIL, name, \
-                                  PS_TYPE_##TYPE, PS_META_PRIMITIVE, \
-                                  "", (ps##TYPE)value); \
-                } \
+                psMetadataAdd(data,PS_LIST_TAIL, name, \
+                              PS_TYPE_##TYPE, PS_META_PRIMITIVE, \
+                              "", (ps##TYPE)value); \
                 break; \
             }

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-18 19:49:30 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-01-18 20:01:48 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -1209 +1209 @@
             #define READ_TABLE_ROW_CASE(FITSTYPE, NATIVETYPE, TYPE) \
         case FITSTYPE: { \
-                NATIVETYPE value; \
+                NATIVETYPE value = 0; \
                 int anynul = 0; \
                 fits_read_col(fits->p_fd, FITSTYPE, col,row+1, \
                               1, 1, NULL, &value, &anynul, &status); \
-                if (anynul == 0) { \
-                    psMetadataAdd(data,PS_LIST_TAIL, name, \
-                                  PS_TYPE_##TYPE, PS_META_PRIMITIVE, \
-                                  "", (ps##TYPE)value); \
-                } \
+                psMetadataAdd(data,PS_LIST_TAIL, name, \
+                              PS_TYPE_##TYPE, PS_META_PRIMITIVE, \
+                              "", (ps##TYPE)value); \
                 break; \
             }