Index: trunk/psLib/src/image/psImage.c
===================================================================
--- trunk/psLib/src/image/psImage.c	(revision 2105)
+++ trunk/psLib/src/image/psImage.c	(revision 2204)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-14 01:22:59 $
+ *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29,11 +29,11 @@
 static void imageFree(psImage* image);
 
-psImage* psImageAlloc(unsigned int numCols,
-                      unsigned int numRows,
+psImage* psImageAlloc(psU32 numCols,
+                      psU32 numRows,
                       const psElemType type)
 {
-    int area = 0;
-    int elementSize = PSELEMTYPE_SIZEOF(type);  // element size in bytes
-    int rowSize = numCols * elementSize;        // row size in bytes.
+    psS32 area = 0;
+    psS32 elementSize = PSELEMTYPE_SIZEOF(type);  // element size in bytes
+    psS32 rowSize = numCols * elementSize;        // row size in bytes.
 
     area = numCols * numRows;
@@ -51,5 +51,5 @@
     p_psMemSetDeallocator(image, (psFreeFcn) imageFree);
 
-    image->data.V = psAlloc(sizeof(void *) * numRows);
+    image->data.V = psAlloc(sizeof(psPtr ) * numRows);
 
     image->rawDataBuffer = psAlloc(area * elementSize);
@@ -57,12 +57,12 @@
     // set the row pointers.
     image->data.V[0] = image->rawDataBuffer;
-    for (int i = 1; i < numRows; i++) {
-        image->data.V[i] = (void *)((int8_t *) image->data.V[i - 1] + rowSize);
-    }
-
-    *(int *)&image->col0 = 0;
-    *(int *)&image->row0 = 0;
-    *(unsigned int *)&image->numCols = numCols;
-    *(unsigned int *)&image->numRows = numRows;
+    for (psS32 i = 1; i < numRows; i++) {
+        image->data.V[i] = (psPtr )((int8_t *) image->data.V[i - 1] + rowSize);
+    }
+
+    *(psS32 *)&image->col0 = 0;
+    *(psS32 *)&image->row0 = 0;
+    *(psU32 *)&image->numCols = numCols;
+    *(psU32 *)&image->numRows = numRows;
     *(psDimen* ) & image->type.dimen = PS_DIMEN_IMAGE;
     *(psElemType* ) & image->type.type = type;
@@ -81,11 +81,11 @@
     if (image->type.type == PS_TYPE_PTR) {
         // 2-D array of pointers -- must dereference elements
-        unsigned int oldNumRows = image->numRows;
-        unsigned int oldNumCols = image->numCols;
-        psPTR* rowPtr;
-
-        for (unsigned int row = 0; row < oldNumRows; row++) {
+        psU32 oldNumRows = image->numRows;
+        psU32 oldNumCols = image->numCols;
+        psPtr* rowPtr;
+
+        for (psU32 row = 0; row < oldNumRows; row++) {
             rowPtr = image->data.PTR[row];
-            for (unsigned int col = 0; col < oldNumCols; col++) {
+            for (psU32 col = 0; col < oldNumCols; col++) {
                 psMemDecrRefCounter(rowPtr[col]);
             }
@@ -105,10 +105,10 @@
 
 psImage* psImageRecycle(psImage* old,
-                        unsigned int numCols,
-                        unsigned int numRows,
+                        psU32 numCols,
+                        psU32 numRows,
                         const psElemType type)
 {
-    int elementSize = PSELEMTYPE_SIZEOF(type);  // element size in bytes
-    int rowSize = numCols * elementSize;        // row size in bytes.
+    psS32 elementSize = PSELEMTYPE_SIZEOF(type);  // element size in bytes
+    psS32 rowSize = numCols * elementSize;        // row size in bytes.
 
     if (old == NULL) {
@@ -128,11 +128,11 @@
         // 2-D array of pointers -- must
         // dereference
-        unsigned int oldNumRows = old->numRows;
-        unsigned int oldNumCols = old->numCols;
-        psPTR* rowPtr;
-
-        for (unsigned int row = 0; row < oldNumRows; row++) {
+        psU32 oldNumRows = old->numRows;
+        psU32 oldNumCols = old->numCols;
+        psPtr* rowPtr;
+
+        for (psU32 row = 0; row < oldNumRows; row++) {
             rowPtr = old->data.PTR[row];
-            for (unsigned int col = 0; col < oldNumCols; col++) {
+            for (psU32 col = 0; col < oldNumCols; col++) {
                 psMemDecrRefCounter(rowPtr[col]);
                 rowPtr[col] = NULL;
@@ -149,14 +149,14 @@
     old->rawDataBuffer = psRealloc(old->data.V[0],
                                    numCols * numRows * elementSize);
-    old->data.V = (void **)psRealloc(old->data.V, numRows * sizeof(void *));
+    old->data.V = (psPtr *)psRealloc(old->data.V, numRows * sizeof(psPtr ));
 
     // recreate the row pointers
     old->data.V[0] = old->rawDataBuffer;
-    for (int i = 1; i < numRows; i++) {
-        old->data.V[i] = (void *)((int8_t *) old->data.V[i - 1] + rowSize);
-    }
-
-    *(unsigned int *)&old->numCols = numCols;
-    *(unsigned int *)&old->numRows = numRows;
+    for (psS32 i = 1; i < numRows; i++) {
+        old->data.V[i] = (psPtr )((int8_t *) old->data.V[i - 1] + rowSize);
+    }
+
+    *(psU32 *)&old->numCols = numCols;
+    *(psU32 *)&old->numRows = numRows;
     *(psElemType* ) & old->type.type = type;
 
@@ -169,8 +169,8 @@
 {
     psElemType inDatatype;
-    int elementSize;
-    int elements;
-    int numRows;
-    int numCols;
+    psS32 elementSize;
+    psS32 elements;
+    psS32 numRows;
+    psS32 numCols;
 
     if (input == NULL || input->data.V == NULL) {
@@ -218,5 +218,5 @@
     // datatype.
     if (type == inDatatype) {
-        for (int row=0;row<numRows;row++) {
+        for (psS32 row=0;row<numRows;row++) {
             memcpy(output->data.V[row], input->data.V[row], elementSize * numCols);
         }
@@ -227,8 +227,8 @@
         ps##INTYPE *in; \
         ps##OUTTYPE *out; \
-        for(int row=0;row<numRows;row++) { \
+        for(psS32 row=0;row<numRows;row++) { \
             in = IN->data.INTYPE[row]; \
             out = OUT->data.OUTTYPE[row]; \
-            for (int col=0;col<numCols;col++) { \
+            for (psS32 col=0;col<numCols;col++) { \
                 *(out++) = *(in++); \
             } \
@@ -331,7 +331,7 @@
 }
 
-int psImageFreeChildren(psImage* image)
+psS32 psImageFreeChildren(psImage* image)
 {
-    int numFreed = 0;
+    psS32 numFreed = 0;
 
     if (image == NULL) {
@@ -345,5 +345,5 @@
         // orphan the children first
         // (so psFree doesn't try to modify the parent's children array while I'm using it)
-        for (int i=0;i<numFreed;i++) {
+        for (psS32 i=0;i<numFreed;i++) {
             children[i]->parent = NULL;
         }
@@ -366,5 +366,5 @@
                               float y,
                               const psImage* mask,
-                              unsigned int maskVal,
+                              psU32 maskVal,
                               psC64 unexposedValue,
                               psImageInterpolateMode mode)
@@ -438,11 +438,11 @@
         float y, \
         const psImage* mask, \
-        unsigned int maskVal, \
+        psU32 maskVal, \
         psF64 unexposedValue) \
 { \
-    int intX = (int) round((psF64)(x) - 0.5 + FLT_EPSILON); \
-    int intY = (int) round((psF64)(y) - 0.5 + FLT_EPSILON); \
-    int lastX = input->numCols - 1; \
-    int lastY = input->numRows - 1; \
+    psS32 intX = (psS32) round((psF64)(x) - 0.5 + FLT_EPSILON); \
+    psS32 intY = (psS32) round((psF64)(y) - 0.5 + FLT_EPSILON); \
+    psS32 lastX = input->numCols - 1; \
+    psS32 lastY = input->numRows - 1; \
     \
     if ((intX < 0) || \
@@ -463,11 +463,11 @@
         float y, \
         const psImage* mask, \
-        unsigned int maskVal, \
+        psU32 maskVal, \
         psC64 unexposedValue) \
 { \
-    int intX = (int) round((psF64)(x) - 0.5); \
-    int intY = (int) round((psF64)(y) - 0.5); \
-    int lastX = input->numCols - 1; \
-    int lastY = input->numRows - 1; \
+    psS32 intX = (psS32) round((psF64)(x) - 0.5); \
+    psS32 intY = (psS32) round((psF64)(y) - 0.5); \
+    psS32 lastX = input->numCols - 1; \
+    psS32 lastY = input->numRows - 1; \
     \
     if ((intX < 0) || \
@@ -501,5 +501,5 @@
         float y, \
         const psImage* mask, \
-        unsigned int maskVal, \
+        psU32 maskVal, \
         psF64 unexposedValue) \
 { \
@@ -508,16 +508,16 @@
     psF64 fracX = x - 0.5 - floorX; \
     psF64 fracY = y - 0.5 - floorY; \
-    int intFloorX = (int) floorX; \
-    int intFloorY = (int) floorY; \
-    int lastX = input->numCols - 1; \
-    int lastY = input->numRows - 1; \
+    psS32 intFloorX = (psS32) floorX; \
+    psS32 intFloorY = (psS32) floorY; \
+    psS32 lastX = input->numCols - 1; \
+    psS32 lastY = input->numRows - 1; \
     ps##TYPE V00; \
     ps##TYPE V01; \
     ps##TYPE V10; \
     ps##TYPE V11; \
-    bool valid00 = false; \
-    bool valid01 = false; \
-    bool valid10 = false; \
-    bool valid11 = false; \
+    psBool valid00 = false; \
+    psBool valid01 = false; \
+    psBool valid10 = false; \
+    psBool valid11 = false; \
     \
     if (intFloorY >= 0 && intFloorY <= lastY) { \
@@ -556,5 +556,5 @@
     \
     psF64 V0; \
-    bool valid0 = true; \
+    psBool valid0 = true; \
     if (valid00 && valid10) { \
         V0 = V00*(1-fracX)+V10*fracX; \
@@ -568,5 +568,5 @@
     \
     psF64 V1; \
-    bool valid1 = true; \
+    psBool valid1 = true; \
     if (valid01 && valid11) { \
         V1 = V01*(1-fracX)+V11*fracX; \
@@ -595,5 +595,5 @@
         float y, \
         const psImage* mask, \
-        unsigned int maskVal, \
+        psU32 maskVal, \
         psC64 unexposedValue) \
 { \
@@ -602,16 +602,16 @@
     psF64 fracX = x - 0.5 - floorX; \
     psF64 fracY = y - 0.5 - floorY; \
-    int intFloorX = (int) floorX; \
-    int intFloorY = (int) floorY; \
-    int lastX = input->numCols - 1; \
-    int lastY = input->numRows - 1; \
+    psS32 intFloorX = (psS32) floorX; \
+    psS32 intFloorY = (psS32) floorY; \
+    psS32 lastX = input->numCols - 1; \
+    psS32 lastY = input->numRows - 1; \
     ps##TYPE V00; \
     ps##TYPE V01; \
     ps##TYPE V10; \
     ps##TYPE V11; \
-    bool valid00 = false; \
-    bool valid01 = false; \
-    bool valid10 = false; \
-    bool valid11 = false; \
+    psBool valid00 = false; \
+    psBool valid01 = false; \
+    psBool valid10 = false; \
+    psBool valid11 = false; \
     \
     if (intFloorY >= 0 && intFloorY <= lastY) { \
@@ -650,5 +650,5 @@
     \
     psC64 V0; \
-    bool valid0 = true; \
+    psBool valid0 = true; \
     if (valid00 && valid10) { \
         V0 = V00*(1-fracX)+V10*fracX; \
@@ -662,5 +662,5 @@
     \
     psC64 V1; \
-    bool valid1 = true; \
+    psBool valid1 = true; \
     if (valid01 && valid11) { \
         V0 = V01*(1-fracX)+V11*fracX; \