Changeset 2210

Timestamp:

Oct 27, 2004, 9:35:59 AM (22 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src

Files:

• astronomy/psAstronomyErrors.h (modified) (2 diffs)
• image/psImageIO.c (modified) (3 diffs)
• sys/psMemory.c (modified) (2 diffs)
• sysUtils/psMemory.c (modified) (2 diffs)

trunk/psLib/src/astronomy/psAstronomyErrors.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-09-11 00:43:54 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 19:35:55 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 
 //~Start #define PS_ERRORTEXT_$1 "$2"
-#define PS_ERRORTEXT_ ""
 //~End
 

trunk/psLib/src/image/psImageIO.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 19:35:58 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
     psS32 anynull = 0;
     psS32 bitPix = 0;             /* Pixel type */
-    psS64 nAxes[3];
-    psS64 firstPixel[3];         /* lower-left corner of image subset */
-    psS64 lastPixel[3];          /* upper-right corner of image subset */
-    psS64 increment[3];          /* increment for image subset */
+    long nAxes[3];
+    long firstPixel[3];         /* lower-left corner of image subset */
+    long lastPixel[3];          /* upper-right corner of image subset */
+    long increment[3];          /* increment for image subset */
     char fitsErr[80] = "";      /* CFITSIO error message string */
     psS32 hduType = IMAGE_HDU;
@@ -240 +240 @@
     psS32 status = 0;             /* CFITSIO status */
     fitsfile *fptr = NULL;      /* pointer to the FITS file */
-    psS64 nAxes[3];              /* Image axis vars */
-    psS64 firstPixel[3];         /* First Pixel to read */
-    psS64 lastPixel[3];          /* Last Pixel to read */
+    long nAxes[3];              /* Image axis vars */
+    long firstPixel[3];         /* First Pixel to read */
+    long lastPixel[3];          /* Last Pixel to read */
     char fitsErr[80];           /* FITSIO message string */
     psS32 datatype = 0;           /* the datatype of the image */

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-27 00:57:31 $
+*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 19:35:59 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -463 +463 @@
                 }
 
-                fprintf(fd, "   %20s:%-4d %ld\n", iter->file, iter->lineno, iter->id);
+                fprintf(fd, "   %20s:%-4d %ld\n", iter->file, (int)iter->lineno, (long)iter->id);
             }
         }

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-27 00:57:31 $
+*  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 19:35:59 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -463 +463 @@
                 }
 
-                fprintf(fd, "   %20s:%-4d %ld\n", iter->file, iter->lineno, iter->id);
+                fprintf(fd, "   %20s:%-4d %ld\n", iter->file, (int)iter->lineno, (long)iter->id);
             }
         }