Changeset 4193

Timestamp:

Jun 9, 2005, 11:17:45 AM (21 years ago)

Author:

desonia

Message:

fixed minor bugs (Bug #307, etc.)

Location:

trunk/psLib

Files:

• src/dataIO/psFits.c (modified) (2 diffs)
• src/fft/psImageFFT.c (modified) (2 diffs)
• src/fits/psFits.c (modified) (2 diffs)
• src/image/psImageFFT.c (modified) (2 diffs)
• test/dataIO/tst_psFits.c (modified) (2 diffs)

trunk/psLib/src/dataIO/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-09 19:40:51 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 21:17:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1520 +1520 @@
     }
 
-    psBool mStatus = false;
-    char* extname = psMetadataLookupPtr(&mStatus, header, "EXTNAME");
-    if ( ! mStatus) {
-        extname = psMetadataLookupPtr(&mStatus, header, "HDUNAME");
-        if (! mStatus) {
-            extname = NULL;
+    char* extname = NULL;
+    if (header != NULL) {
+        extname = psMetadataLookupPtr(NULL, header, "EXTNAME");
+        if ( extname == NULL) {
+            extname = psMetadataLookupPtr(NULL, header, "HDUNAME");
         }
     }

trunk/psLib/src/fft/psImageFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 02:29:44 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 21:17:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -409 +409 @@
         psF32 real;
         psF32 imag;
-        psF32 numElementsSquared = numCols * numCols * numRows * numRows;
+        psF32 fNumCols = numCols;
+        psF32 fNumRows = numRows;
+        psF32 numElementsSquared = fNumCols * fNumCols * fNumRows * fNumRows;
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32);

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-09 19:40:51 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 21:17:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -1520 +1520 @@
     }
 
-    psBool mStatus = false;
-    char* extname = psMetadataLookupPtr(&mStatus, header, "EXTNAME");
-    if ( ! mStatus) {
-        extname = psMetadataLookupPtr(&mStatus, header, "HDUNAME");
-        if (! mStatus) {
-            extname = NULL;
+    char* extname = NULL;
+    if (header != NULL) {
+        extname = psMetadataLookupPtr(NULL, header, "EXTNAME");
+        if ( extname == NULL) {
+            extname = psMetadataLookupPtr(NULL, header, "HDUNAME");
         }
     }

trunk/psLib/src/image/psImageFFT.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 02:29:44 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 21:17:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -409 +409 @@
         psF32 real;
         psF32 imag;
-        psF32 numElementsSquared = numCols * numCols * numRows * numRows;
+        psF32 fNumCols = numCols;
+        psF32 fNumRows = numRows;
+        psF32 numElementsSquared = fNumCols * fNumCols * fNumRows * fNumRows;
 
         out = psImageRecycle(out, numCols, numRows, PS_TYPE_F32);

trunk/psLib/test/dataIO/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-09 19:40:51 $
+*  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-09 21:17:45 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -122 +122 @@
                       extname);
 
-        psMetadataAdd(header,PS_LIST_TAIL, "MYSTR",
+        psMetadataAdd(header,PS_LIST_TAIL, "EXTNAME",
                       PS_META_STR,
                       "Extension Name",