Index: trunk/psLib/src/image/psImageGeomManip.c
===================================================================
--- trunk/psLib/src/image/psImageGeomManip.c	(revision 4308)
+++ trunk/psLib/src/image/psImageGeomManip.c	(revision 4316)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:44:21 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 03:13:02 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -174,5 +174,5 @@
 psImage* psImageResample(psImage* out,
                          const psImage* in,
-                         psS32 scale,
+                         int scale,
                          psImageInterpolateMode mode)
 {
@@ -251,7 +251,7 @@
 
 psImage* psImageRoll(psImage* out,
-                     const psImage* in,
-                     psS32 dx,
-                     psS32 dy)
+                     const psImage* input,
+                     int dx,
+                     int dy)
 {
     psS32 outRows;
@@ -259,5 +259,5 @@
     psS32 elementSize;
 
-    if (in == NULL) {
+    if (input == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL, true,
                 PS_ERRORTEXT_psImage_IMAGE_NULL);
@@ -267,8 +267,8 @@
     // create an output image of the same size
     // and type
-    outRows = in->numRows;
-    outCols = in->numCols;
-    elementSize = PSELEMTYPE_SIZEOF(in->type.type);
-    out = psImageRecycle(out, outCols, outRows, in->type.type);
+    outRows = input->numRows;
+    outCols = input->numCols;
+    elementSize = PSELEMTYPE_SIZEOF(input->type.type);
+    out = psImageRecycle(out, outCols, outRows, input->type.type);
 
     // make dx and dy between 0 and outCols or
@@ -292,5 +292,5 @@
             inRowNumber -= outRows;
         }
-        psU8* inRow = in->data.U8[inRowNumber]; // use byte arithmetic for all types
+        psU8* inRow = input->data.U8[inRowNumber]; // use byte arithmetic for all types
         psU8* outRow = out->data.U8[row];