Changeset 6891 for trunk/pois/src/poisCalculateDeviations.c

Timestamp:

Apr 18, 2006, 12:42:12 PM (20 years ago)

Author:

Paul Price

Message:

Updating to psLib rel11. Most changes are setting the 'n' element of the vector or array upon allocation. Needed to change the way the image subsets are done: not sure why we switched back to the old method of trim regions, but it seems we did.

File:

• trunk/pois/src/poisCalculateDeviations.c (modified) (2 diffs)

trunk/pois/src/poisCalculateDeviations.c

@@ -33 +33 @@
     if (!deviations) {
         deviations = psVectorAlloc(stamps->n, PS_TYPE_F32);
+        deviations->n = stamps->n;
     }
 
@@ -64 +65 @@
             psRegion stampTrim = { config->xKernel, config->xKernel + 2 * footprint, config->yKernel,
                                    config->yKernel + 2 * footprint };
+#if 0
             psRegion maskTrim = { x - xSize + config->xKernel, x + xSize - config->xKernel,
                                   y - ySize + config->yKernel, y + ySize - config->yKernel };
-
+            psImage *maskStampTrim = psImageSubset(maskStamp, maskTrim);
+#else
+            psImage *maskStampTrim = psImageSubset(maskStamp, stampTrim);
+#endif
             psImage *subStampTrim = psImageSubset(subStamp, stampTrim);
-            psImage *maskStampTrim = psImageSubset(maskStamp, maskTrim);
             (void)psImageStats(stats, subStampTrim, maskStampTrim, POIS_MASK_BAD | POIS_MASK_NEAR_BAD);