Changeset 19136

Timestamp:

Aug 20, 2008, 11:45:09 AM (18 years ago)

Author:

Paul Price

Message:

Reworked version of psImageInterpolate doesn't set the mask value to 0
if everything's good (it just leaves it unchanged; it ORs when
something is bad). This meant that the output mask was maintained at
previous values, so an entire tile was wiped out by a single bad
pixel! Now I have the mask value initially set to that of the closest
pixel in the input mask image. This allows us to propagate not just
whether the mask is good/poor/bad, but also why.

File:

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

trunk/pswarp/src/pswarpTransformTile.c

@@ -41 +41 @@
     pswarpMapGridCoordRange (args->grid, args->gridX, args->gridY, &minPt, &maxPt);
 
-    psF32 **outImageData     = (args->output->image)  ? args->output->image->data.F32  : NULL;
+    psF32 **outImageData     = (args->output->image)  ? args->output->image->data.F32 : NULL;
     psF32 **outVarData       = (args->output->weight) ? args->output->weight->data.F32 : NULL;
-    psMaskType **outMaskData = (args->output->mask)   ? args->output->mask->data.U8    : 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;
 
     pswarpMap *map = args->grid->maps[args->gridX][args->gridY];
@@ -86 +87 @@
 
             // psImagePixelInterpolate determines the value at pixel coordinate (x,y) in child coordinates
+            maskValue = inMaskData ? inMaskData[(int)round(yIn)][(int)round(xIn)] : 0;
             if (!psImageInterpolate(&imageValue, &varValue, &maskValue, xIn, yIn, args->interp)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");