Changeset 21225 for branches/pap_branch_20090128/pswarp/src/pswarpTransformTile.c

Timestamp:

Jan 29, 2009, 3:01:24 PM (17 years ago)

Author:

Paul Price

Message:

Convering 'weight' to 'variance' where appropriate. Mostly just propagating changes from psModules. Fixed some mask types as well.

File:

• branches/pap_branch_20090128/pswarp/src/pswarpTransformTile.c (modified) (2 diffs)

branches/pap_branch_20090128/pswarp/src/pswarpTransformTile.c

@@ -48 +48 @@
     // Dereference images for convenience
     psF32 **outImageData     = args->output->image->data.F32;
-    psF32 **outVarData       = (args->output->weight) ? args->output->weight->data.F32 : NULL;
+    psF32 **outVarData       = (args->output->variance) ? args->output->variance->data.F32 : NULL;
     psMaskType **outMaskData = (args->output->mask)   ? args->output->mask->data.PS_TYPE_MASK_DATA : NULL;
     psMaskType **inMaskData  = (args->input->mask)    ? args->input->mask->data.PS_TYPE_MASK_DATA : NULL;
@@ -82 +82 @@
             // psImagePixelInterpolate determines the value at pixel coordinate (x,y) in child coordinates
             double imageValue, varValue; // Value of image and variance map
-            psMaskType maskValue = inMaskData ? inMaskData[(int)yIn][(int)xIn] : 0; // Value of mask
+            psImageMaskType maskValue = inMaskData ? inMaskData[(int)yIn][(int)xIn] : 0; // Value of mask
             if (!psImageInterpolate(&imageValue, &varValue, &maskValue, xIn, yIn, args->interp)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");