Index: trunk/psLib/src/astronomy/psAstrometry.c
===================================================================
--- trunk/psLib/src/astronomy/psAstrometry.c	(revision 2137)
+++ trunk/psLib/src/astronomy/psAstrometry.c	(revision 2204)
@@ -8,6 +8,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-14 23:45:53 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:30 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -33,7 +33,7 @@
 psImage.
  *****************************************************************************/
-static int checkValidImageCoords(double x,
-                                 double y,
-                                 psImage* tmpImage)
+static psS32 checkValidImageCoords(double x,
+                                   double y,
+                                   psImage* tmpImage)
 {
     if (tmpImage == NULL) {
@@ -56,7 +56,7 @@
 cooefficients of order 2 are higher are non-zero, then it is not linear.
  *****************************************************************************/
-static int isProjectionLinear(psPlaneTransform *transform)
-{
-    int i = 0;
+static psS32 isProjectionLinear(psPlaneTransform *transform)
+{
+    psS32 i = 0;
     PS_CHECK_NULL_PTR_RETURN_ZERO(transform);
 
@@ -178,5 +178,5 @@
 {
     if (obs != NULL) {
-        psFree((void*)obs->name);
+        psFree((psPtr)obs->name);
     }
 }
@@ -185,8 +185,8 @@
 {
     if (exp != NULL) {
-        psFree((void*)exp->time);
-        psFree((void*)exp->observatory);
-        psFree((void*)exp->cameraName);
-        psFree((void*)exp->telescopeName);
+        psFree((psPtr)exp->time);
+        psFree((psPtr)exp->observatory);
+        psFree((psPtr)exp->cameraName);
+        psFree((psPtr)exp->telescopeName);
     }
 }
@@ -195,9 +195,9 @@
 {
     if (fp != NULL) {
-        for (int i = 0; i < fp->p_ps_xRows; i++) {
+        for (psS32 i = 0; i < fp->p_ps_xRows; i++) {
             psFree(fp->x[i]);
         }
 
-        for (int j = 0; j < fp->p_ps_yRows; j++) {
+        for (psS32 j = 0; j < fp->p_ps_yRows; j++) {
             psFree(fp->y[j]);
         }
@@ -226,6 +226,6 @@
 {
     psFixedPattern *tmp;
-    int i;
-    int j;
+    psS32 i;
+    psS32 j;
 
     PS_CHECK_NULL_IMAGE_RETURN_NULL(x);
@@ -301,6 +301,6 @@
     *(float *)&exp->wavelength = wavelength;
 
-    exp->time = psMemIncrRefCounter((void*)time);
-    exp->observatory = psMemIncrRefCounter((void*)observatory);
+    exp->time = psMemIncrRefCounter((psPtr)time);
+    exp->observatory = psMemIncrRefCounter((psPtr)observatory);
 
     // XXX: how is these value derived?
@@ -343,5 +343,5 @@
 }
 
-psFPA* psFPAAlloc(int nChips,
+psFPA* psFPAAlloc(psS32 nChips,
                   const psExposure* exp)
 {
@@ -350,6 +350,6 @@
     // create array of NULL chips of the size nChips
     newFPA->chips = psArrayAlloc(nChips);
-    void** chips = newFPA->chips->data;
-    for (int i=0;i<nChips;i++) {
+    psPtr* chips = newFPA->chips->data;
+    for (psS32 i=0;i<nChips;i++) {
         chips[i] = NULL;
     }
@@ -384,5 +384,5 @@
  * psChip constructor
  */
-psChip* psChipAlloc(int nCells,
+psChip* psChipAlloc(psS32 nCells,
                     psFPA *parentFPA)
 {
@@ -391,6 +391,6 @@
     // create array of NULL psCells
     chip->cells = psArrayAlloc(nCells);
-    void** cells = chip->cells->data;
-    for (int i=0;i<nCells;i++) {
+    psPtr* cells = chip->cells->data;
+    for (psS32 i=0;i<nCells;i++) {
         cells[i] = NULL;
     }
@@ -412,5 +412,5 @@
  * psCell constructor
  */
-psCell* psCellAlloc(int nReadouts,
+psCell* psCellAlloc(psS32 nReadouts,
                     psChip* parentChip)
 {
@@ -419,6 +419,6 @@
     // create array of NULL psReadouts
     cell->readouts = psArrayAlloc(nReadouts);
-    void** readouts = cell->readouts->data;
-    for (int i=0;i<nReadouts;i++) {
+    psPtr* readouts = cell->readouts->data;
+    for (psS32 i=0;i<nReadouts;i++) {
         readouts[i] = NULL;
     }
@@ -440,14 +440,14 @@
 }
 
-psReadout* psReadoutAlloc(int col0,
-                          int row0,
+psReadout* psReadoutAlloc(psS32 col0,
+                          psS32 row0,
                           const psImage* image)
 {
     psReadout* readout = psAlloc(sizeof(psReadout));
 
-    *(unsigned int*)&readout->colBins = 1;
-    *(unsigned int*)&readout->rowBins = 1;
-    *(int*)&readout->col0 = col0;
-    *(int*)&readout->row0 = row0;
+    *(psU32*)&readout->colBins = 1;
+    *(psU32*)&readout->rowBins = 1;
+    *(psS32*)&readout->col0 = col0;
+    *(psS32*)&readout->row0 = row0;
 
     readout->image = (psImage*)image;
@@ -521,5 +521,5 @@
     PS_CHECK_NULL_PTR_RETURN_NULL(FPA->chips);
     psArray* chips = FPA->chips;
-    int nChips = chips->n;
+    psS32 nChips = chips->n;
     psPlane chipCoord;
     psCell *tmpCell = NULL;
@@ -529,5 +529,5 @@
     // cells in that chip contain those chip coordinates.
 
-    for (int i = 0; i < nChips; i++) {
+    for (psS32 i = 0; i < nChips; i++) {
         psChip* tmpChip = chips->data[i];
         psPlaneTransformApply(&chipCoord, tmpChip->fromFPA, fpaCoord);
@@ -560,10 +560,10 @@
     // If so, then we return that cell.
 
-    for (int i = 0; i < cells->n; i++) {
+    for (psS32 i = 0; i < cells->n; i++) {
         psCell* tmpCell = (psCell* ) cells->data[i];
         psArray* readouts = tmpCell->readouts;
 
         if (readouts != NULL) {
-            for (int j = 0; j < readouts->n; j++) {
+            for (psS32 j = 0; j < readouts->n; j++) {
                 psReadout* tmpReadout = readouts->data[j];