Index: trunk/pswarp/src/pswarp.h
===================================================================
--- trunk/pswarp/src/pswarp.h	(revision 20289)
+++ trunk/pswarp/src/pswarp.h	(revision 20307)
@@ -43,5 +43,5 @@
     pmReadout *output;
     pswarpMapGrid *grid;
-    psImageInterpolateOptions *interp;
+    psImageInterpolation *interp;
     psImage *region;
 
Index: trunk/pswarp/src/pswarpTransformReadout.c
===================================================================
--- trunk/pswarp/src/pswarpTransformReadout.c	(revision 20289)
+++ trunk/pswarp/src/pswarpTransformReadout.c	(revision 20307)
@@ -64,7 +64,7 @@
 
     // Interpolation options : move these from the arguments to explicit assignments
-    psImageInterpolateOptions *interp = psImageInterpolateOptionsAlloc(interpolationMode, input->image,
-                                                                       input->weight, input->mask, maskIn,
-                                                                       NAN, NAN, maskBad, maskPoor, poorFrac);
+    psImageInterpolation *interp = psImageInterpolationAlloc(interpolationMode, input->image,
+                                                             input->weight, input->mask, maskIn,
+                                                             NAN, NAN, maskBad, maskPoor, poorFrac, 0);
 
     if (input->weight && !output->weight) {
@@ -143,5 +143,5 @@
         float varFactor = psImageInterpolateVarianceFactor(input->image->numCols / 2.0 + input->image->col0,
                                                            input->image->numRows / 2.0 + input->image->row0,
-                                                           interp);
+                                                           interp->mode);
         psMetadataItem *vfItem = psMetadataLookup(output->analysis, PSWARP_ANALYSIS_VARFACTOR);
         if (vfItem) {