Changeset 20307 for trunk/psModules/src/objects/pmModel.c

Timestamp:

Oct 21, 2008, 4:11:36 PM (18 years ago)

Author:

Paul Price

Message:

Propagating changes to psImageInterpolate.h

File:

• trunk/psModules/src/objects/pmModel.c (modified) (3 diffs)

trunk/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-01-02 20:36:36 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-10-22 02:11:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -222 +222 @@
     psImage *myRx = NULL;
     psImage *myRy = NULL;
-    psImageInterpolateOptions *Ro = NULL;
-    psImageInterpolateOptions *Rx = NULL;
-    psImageInterpolateOptions *Ry = NULL;
+    psImageInterpolation *Ro = NULL;
+    psImageInterpolation *Rx = NULL;
+    psImageInterpolation *Ry = NULL;
     if (model->residuals && (mode & (PM_MODEL_OP_RES0 | PM_MODEL_OP_RES1))) {
         // if the residual image and object image don't match,
@@ -274 +274 @@
         }
 
-        Ro = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR, myRo, NULL, mask, 0, 0.0, 0.0, 1, 0, 0.0);
-        Rx = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR, myRx, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0);
-        Ry = psImageInterpolateOptionsAlloc(PS_INTERPOLATE_BILINEAR, myRy, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0);
+        Ro = psImageInterpolationAlloc(PS_INTERPOLATE_BILINEAR, myRo, NULL, mask, 0, 0.0, 0.0, 1, 0, 0.0, 0);
+        Rx = psImageInterpolationAlloc(PS_INTERPOLATE_BILINEAR, myRx, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0, 0);
+        Ry = psImageInterpolationAlloc(PS_INTERPOLATE_BILINEAR, myRy, NULL, NULL, 0, 0.0, 0.0, 1, 0, 0.0, 0);
 
     }