Index: trunk/psLib/src/imageops/psImageGeomManip.c
===================================================================
--- trunk/psLib/src/imageops/psImageGeomManip.c	(revision 20216)
+++ trunk/psLib/src/imageops/psImageGeomManip.c	(revision 20299)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-21 02:56:11 $
+ *  @version $Revision: 1.44 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-10-21 22:10:53 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -206,6 +206,5 @@
     invScale = 1.0f / (float)scale;
 
-    psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(mode, in, NULL, NULL, 0,
-                                                                       NAN, NAN, 0, 0, 0);
+    psImageInterpolation *interp = psImageInterpolationAlloc(mode, in, NULL, NULL, 0, NAN, NAN, 0, 0, 0, 0);
 
     #define PSIMAGE_RESAMPLE_CASE(TYPE) \
@@ -496,6 +495,6 @@
         float CenterYMinusminXTimesSinT = centerY - minX * sinT;
 
-        psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(mode, input, NULL, NULL, 0,
-                                                                           exposed, NAN, 0, 0, 0.0);
+        psImageInterpolation *interp = psImageInterpolationAlloc(mode, input, NULL, NULL, 0,
+                                                                 exposed, NAN, 0, 0, 0.0, 0);
 
         #define PSIMAGE_ROTATE_ARBITRARY_LOOP(TYPE)  \
@@ -594,6 +593,6 @@
     out = psImageRecycle(out, outCols, outRows, type);
 
-    psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(mode, input, NULL, NULL, 0,
-                                                                       exposed, NAN, 0, 0, 0.0);
+    psImageInterpolation *interp = psImageInterpolationAlloc(mode, input, NULL, NULL, 0,
+                                                             exposed, NAN, 0, 0, 0.0, 0);
 
     #define PSIMAGE_SHIFT_CASE(TYPE) \
@@ -679,7 +678,6 @@
     }
 
-    psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BICUBE, in, NULL,
-                                                                       inMask, maskVal, exposed, NAN, blank,
-                                                                       blank, 0.0);
+    psImageInterpolation *interp = psImageInterpolationAlloc(mode, in, NULL, inMask, maskVal, exposed, NAN,
+                                                             blank, blank, 0.0, 0);
 
     #define PSIMAGE_SHIFT_MASK_CASE(TYPE) \
@@ -851,6 +849,6 @@
     psPlane* inPosition = NULL;
 
-    psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(mode, input, NULL, inputMask,
-                                                                       inputMaskVal, NAN, NAN, 0, 0, 0.0);
+    psImageInterpolation *interp = psImageInterpolationAlloc(mode, input, NULL, inputMask,
+                                                             inputMaskVal, NAN, NAN, 0, 0, 0.0, 0);