Changeset 30044 for trunk/psLib/src/imageops

Timestamp:

Dec 15, 2010, 11:25:46 AM (15 years ago)

Author:

bills

Message:

Fix checking of good fit. Changed name to pGoodFit to emphasize that it is a pointer.
Fix a segv in trace code by checking for null pointers

Location:

trunk/psLib/src/imageops

Files:

• psImageMapFit.c (modified) (12 diffs)
• psImageMapFit.h (modified) (4 diffs)

trunk/psLib/src/imageops/psImageMapFit.c

@@ -48 +48 @@
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit(bool *goodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
+bool psImageMapFit(bool *pGoodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                    const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
     // XXX Add Asserts
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -83 +83 @@
         map->map->data.F32[0][0]   = psStatsGetValue(map->stats, mean);
         map->error->data.F32[0][0] = psStatsGetValue(map->stats, stdev);
-        *goodFit = true;
+        *pGoodFit = true;
         return true;
     }
@@ -89 +89 @@
     if (Nx == 1) {
         bool status;
-        status = psImageMapFit1DinY (goodFit, map, mask, maskValue, x, y, f, df);
+        status = psImageMapFit1DinY (pGoodFit, map, mask, maskValue, x, y, f, df);
         return status;
     }
     if (Ny == 1) {
         bool status;
-        status = psImageMapFit1DinX (goodFit, map, mask, maskValue, x, y, f, df);
+        status = psImageMapFit1DinX (pGoodFit, map, mask, maskValue, x, y, f, df);
         return status;
     }
@@ -339 +339 @@
     psFree (Empty);
 
-    *goodFit = true;
+    *pGoodFit = true;
     return true;
 }
 
 // measure residuals on each pass and clip outliers based on stats
-bool psImageMapClipFit(bool *goodFit, psImageMap *map, psStats *stats, psVector *inMask, psVectorMaskType maskValue,
+bool psImageMapClipFit(bool *pGoodFit, psImageMap *map, psStats *stats, psVector *inMask, psVectorMaskType maskValue,
                        const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -354 +354 @@
     psAssert(f, "impossible");
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // the user supplies one of various stats option pairs,
@@ -398 +398 @@
         psTrace("psLib.imageops", 6, "Loop iteration %d.  Calling psImageMapFit()\n", N);
         psS32 Nkeep = 0;
-        if (!psImageMapFit(goodFit, map, mask, maskValue, x, y, f, df)) {
+        if (!psImageMapFit(pGoodFit, map, mask, maskValue, x, y, f, df)) {
             psError(PS_ERR_UNKNOWN, false, "Could not fit image map.\n");
             psFree(resid);
@@ -404 +404 @@
             return false;
         }
-        if (!goodFit) {
+        if (!*pGoodFit) {
             psWarning ("bad fit to image map, try something else");
             return true;
@@ -463 +463 @@
     psFree(resid);
     if (!inMask) psFree (mask);
-    *goodFit = true; // XXX probably don't need to set this (set by psImageMapFit)
+    *pGoodFit = true; // XXX probably don't need to set this (set by psImageMapFit)
     return true;
 }
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit1DinY(bool *goodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
+bool psImageMapFit1DinY(bool *pGoodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                         const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -474 +474 @@
     assert (map->binning->nXruff == 1);
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -613 +613 @@
     psFree (Empty);
 
-    *goodFit = true;
+    *pGoodFit = true;
     return true;
 }
 
 // map defines the output image dimensions and scaling.
-bool psImageMapFit1DinX(bool *goodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
+bool psImageMapFit1DinX(bool *pGoodFit, psImageMap *map, const psVector *mask, psVectorMaskType maskValue,
                         const psVector *x, const psVector *y, const psVector *f, const psVector *df)
 {
@@ -624 +624 @@
     assert (map->binning->nYruff == 1);
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -763 +763 @@
     psFree (Empty);
 
-    *goodFit = true;
+    *pGoodFit = true;
     return true;
 }

trunk/psLib/src/imageops/psImageMapFit.h

@@ -8 +8 @@
 
 // fit the image map to a set of points
-bool psImageMapFit(bool *goodFit, 
+bool psImageMapFit(bool *pGoodFit, 
                    psImageMap *map,
                    const psVector *mask,
@@ -19 +19 @@
 
 // fit the image map to a set of points
-bool psImageMapClipFit(bool *goodFit, 
+bool psImageMapClipFit(bool *pGoodFit, 
                        psImageMap *map,
                        psStats *stats,
@@ -30 +30 @@
     );
 
-bool psImageMapFit1DinY(bool *goodFit, 
+bool psImageMapFit1DinY(bool *pGoodFit, 
                         psImageMap *map,
                         const psVector *mask,
@@ -40 +40 @@
     );
 
-bool psImageMapFit1DinX(bool *goodFit, 
+bool psImageMapFit1DinX(bool *pGoodFit, 
                         psImageMap *map,
                         const psVector *mask,