Changeset 6354 for trunk/psLib/test/fits/tst_psFits.c

Timestamp:

Feb 7, 2006, 3:03:35 PM (20 years ago)

Author:

desonia

Message:

fixed a leak in psFits table reading and cleaned up things according to
the API Delta report.

-rdd
`

File:

• trunk/psLib/test/fits/tst_psFits.c (modified) (6 diffs)

trunk/psLib/test/fits/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-03 00:12:01 $
+*  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-02-08 01:03:35 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -818 +818 @@
     psFitsMoveExtNum(fits,numHDUs/2, false);
 
-    psMetadata* headerSet = psFitsReadHeaderSet(NULL, fits);
+    psMetadata* headerSet = psFitsReadHeaderSet(fits);
 
     if (headerSet == NULL) {
@@ -859 +859 @@
     }
 
-    psMetadata* set2 = psMetadataAlloc();
-    set2 = psFitsReadHeaderSet(set2,NULL);
+    psMetadata* set2 = psFitsReadHeaderSet(NULL);
     if (set2 != NULL) {
         psError(PS_ERR_UNKNOWN, false,
@@ -867 +866 @@
     }
 
-    psMetadata* set3 = psMetadataAlloc();
-    set3 = psFitsReadHeaderSet(set3,fits);
-
+    psMetadata* set3 = psFitsReadHeaderSet(fits);
     if (set3 == NULL) {
         psError(PS_ERR_UNKNOWN, false,
@@ -1258 +1255 @@
                            "row K"
                        };
+
 
     if (! makeTable()) {
@@ -1525 +1523 @@
     mkdir("tmpImages",0777);
 
-    testReadTypeSize(1,1,0,0,0,0,U8,"tmpImages/1x1_" "U8.fits");
-    testReadTypeSize(M,1,M/4,0,M*3/4,0,U8,"tmpImages/Mx1_" "U8.fits");
-    testReadTypeSize(1,N,0,N/4,0,N*3/4,U8,"tmpImages/1xN_" "U8.fits");
-    testReadTypeSize(M,N,M/4,N/4,M*3/4,N*3/4,U8,"tmpImages/MxN_" "U8.fits");
-
-
     testReadType(U8,"U8.fits");
     testReadType(S8,"S8.fits");   // Not a requirement