Changeset 4191 for trunk/psLib/test

Timestamp:

Jun 9, 2005, 9:40:51 AM (21 years ago)

Author:

desonia

Message:

removed extname from psFitsWrite* functions (Bug #412).

Location:

trunk/psLib/test

Files:

• dataIO/tst_psFits.c (modified) (8 diffs)
• image/tst_psImageGeomManip.c (modified) (3 diffs)

trunk/psLib/test/dataIO/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-08 21:07:59 $
+*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-09 19:40:51 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -122 +122 @@
                       extname);
 
+        psMetadataAdd(header,PS_LIST_TAIL, "MYSTR",
+                      PS_META_STR,
+                      "Extension Name",
+                      extname);
+
         // set the pixels in the image
         psBinaryOp(image,image,"=",psScalarAlloc(lcv,PS_TYPE_F32));
-        if (! psFitsWriteImage(fitsFile,header,image,1, extname) ) {
+        if (! psFitsWriteImage(fitsFile,header,image,1) ) {
             psError(PS_ERR_UNKNOWN, false,
                     "Could not write image.");
@@ -155 +160 @@
     psImage* image = psImageAlloc(16,16,PS_TYPE_F32);
 
-    if (! psFitsWriteImage(fitsFile,NULL,image,1,"primary") ) {
+    if (! psFitsWriteImage(fitsFile,NULL,image,1) ) {
         psError(PS_ERR_UNKNOWN, false,
                 "Could not write PHU image.");
@@ -192 +197 @@
     }
 
-    psFitsWriteTable(fitsFile, NULL, table, "table-1");
+    psFitsWriteTable(fitsFile, NULL, table);
 
     psFree(table);
@@ -1275 +1280 @@
         psFits* fits = psFitsAlloc(filename); \
         psRegion region = {0,0,0,0}; \
-        if (! psFitsWriteImage(fits, NULL, img, 2, "primary")) { \
+        if (! psFitsWriteImage(fits, NULL, img, 2)) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \
             return 1; \
@@ -1283 +1288 @@
             return 2; \
         } \
-        if (! psFitsWriteImage(fits,NULL, img3, 2, "extension")) { \
+        if (! psFitsWriteImage(fits,NULL, img3, 2)) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \
             return 3; \
@@ -1441 +1446 @@
     psFits* fits = psFitsAlloc("tmpImages/writeTest.fits");
 
-    if (! psFitsWriteImage(fits, NULL, img,1,NULL)) {
+    if (! psFitsWriteImage(fits, NULL, img,1)) {
         psError(PS_ERR_UNKNOWN, true,"Couldn't write writeTest.fits.");
         return 14;
@@ -1478 +1483 @@
     */
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message because input image is null.");
-    if ( psFitsWriteImage(fits,NULL,NULL, 1, NULL) ) {
+    if ( psFitsWriteImage(fits,NULL,NULL, 1) ) {
         psError(PS_ERR_UNKNOWN, true,"psImageWriteSection did not return false when input image is NULL.");
         return 20;

trunk/psLib/test/image/tst_psImageGeomManip.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 02:29:44 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 19:40:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -559 +559 @@
     }
 
-    char hduName[80];
     psRegion regionAll = psRegionSet(0,0,0,0);
     for (psS32 rot=-180;rot<=180;rot+=45) {
         psImage* oldOut = fOut;
         psImage* oldBiOut = fBiOut;
-        snprintf(hduName, 80, "%+d", rot);
         if (rot == 90) {
             radianRot = M_PI_2;
@@ -590 +588 @@
         sBiOut = psImageRotate(sBiOut,sImg,radianRot,-1.0,PS_INTERPOLATE_BILINEAR);
 
-        if (! psFitsWriteImage(fOutFile, NULL, fOut, 1, hduName) ) {
+        if (! psFitsWriteImage(fOutFile, NULL, fOut, 1) ) {
             psError(PS_ERR_UNKNOWN, true,"Can not write fOut.");
             return 20;
         }
-        if (! psFitsWriteImage(sOutFile, NULL, sOut, 1, hduName) ) {
+        if (! psFitsWriteImage(sOutFile, NULL, sOut, 1) ) {
             psError(PS_ERR_UNKNOWN, true,"Can not write sOut.");
             return 21;
         }
-        if (! psFitsWriteImage(fBiOutFile, NULL, fBiOut, 1, hduName) ) {
+        if (! psFitsWriteImage(fBiOutFile, NULL, fBiOut, 1) ) {
             psError(PS_ERR_UNKNOWN, true,"Can not write fBiOut.fits.");
             return 40;
         }
-        if (! psFitsWriteImage(sBiOutFile, NULL, sBiOut, 1, hduName) ) {
+        if (! psFitsWriteImage(sBiOutFile, NULL, sBiOut, 1) ) {
             psError(PS_ERR_UNKNOWN, true,"Can not write sBiOut.fits.");
             return 41;