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

Timestamp:

Apr 19, 2006, 3:13:11 PM (20 years ago)

Author:

drobbin

Message:

edited files to reflect changes & patches applied by IFA. Currently fixing testing procedures.

File:

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

trunk/psLib/test/fits/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-04 19:52:47 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-20 01:13:11 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -391 +391 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (image == NULL || abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -424 +425 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -526 +528 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
-
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
         if (image == NULL || abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
             psError(PS_ERR_UNKNOWN, true,
@@ -548 +550 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -580 +583 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (image == NULL || abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -610 +614 @@
         // check that the image is associated to the extension moved, i.e.,
         // did we really move to the proper extension?
-        psImage* image = psFitsReadImage(NULL, fits,region,0);
+        psImage* image = NULL;
+        image = psFitsReadImage(fits,region,0);
 
         if (abs(image->data.F32[0][0] - (float)lcv) > FLT_EPSILON) {
@@ -1448 +1453 @@
         fits = psFitsOpen(filename,"r"); \
         psRegion reg = {readM0, readM, readN0, readN}; \
-        img = psFitsReadImage(img, fits, reg, 0); \
-        img3 = psFitsReadImage(img3, fits, reg, 1); \
+        img = psFitsReadImage(fits, reg, 0); \
+        img3 = psFitsReadImage(fits, reg, 1); \
         if (img3 == NULL) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to read test image %s",filename); \
@@ -1477 +1482 @@
         img3 = NULL; \
         psFitsMoveExtNum(fits,1, false); \
-        img3 = psFitsReadImage(img3, fits, reg, 0); \
-        img = psFitsReadImage(img, fits, reg, 1); \
+        img3 = psFitsReadImage(fits, reg, 0); \
+        img = psFitsReadImage(fits, reg, 1); \
         if (img == NULL) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to read test image %s",filename); \
@@ -1530 +1535 @@
                           0,0,0,0
                       };
-    if(psFitsReadImage(NULL,NULL,region,0) != NULL) {
+    if(psFitsReadImage(NULL,region,0) != NULL) {
         psError(PS_ERR_UNKNOWN,true,"Did not return NULL for NULL psFits");
         return 100;
@@ -1596 +1601 @@
     psRegion region = {0,0,0,0};
     fits = psFitsOpen("tmpImages/writeTest.fits","r");
-    img = psFitsReadImage(NULL, fits, region, 0);
+    img = NULL;
+    img = psFitsReadImage(fits, region, 0);
     if (img == NULL) {
         psError(PS_ERR_UNKNOWN, true,"Could not read in writeTest.fits.");