Index: trunk/psLib/src/imageops/psImageMapFit.c
===================================================================
--- trunk/psLib/src/imageops/psImageMapFit.c	(revision 30031)
+++ trunk/psLib/src/imageops/psImageMapFit.c	(revision 30044)
@@ -48,10 +48,10 @@
 
 // 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,5 +83,5 @@
         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,10 +89,10 @@
     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,10 +339,10 @@
     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,5 +354,5 @@
     psAssert(f, "impossible");
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // the user supplies one of various stats option pairs,
@@ -398,5 +398,5 @@
         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,5 +404,5 @@
             return false;
         }
-	if (!goodFit) {
+	if (!*pGoodFit) {
 	    psWarning ("bad fit to image map, try something else");
 	    return true;
@@ -463,10 +463,10 @@
     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,5 +474,5 @@
     assert (map->binning->nXruff == 1);
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -613,10 +613,10 @@
     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,5 +624,5 @@
     assert (map->binning->nYruff == 1);
 
-    *goodFit = false;
+    *pGoodFit = false;
 
     // dimensions of the output map image
@@ -763,5 +763,5 @@
     psFree (Empty);
 
-    *goodFit = true;
+    *pGoodFit = true;
     return true;
 }
Index: trunk/psLib/src/imageops/psImageMapFit.h
===================================================================
--- trunk/psLib/src/imageops/psImageMapFit.h	(revision 30031)
+++ trunk/psLib/src/imageops/psImageMapFit.h	(revision 30044)
@@ -8,5 +8,5 @@
 
 // fit the image map to a set of points
-bool psImageMapFit(bool *goodFit, 
+bool psImageMapFit(bool *pGoodFit, 
 		   psImageMap *map,
                    const psVector *mask,
@@ -19,5 +19,5 @@
 
 // fit the image map to a set of points
-bool psImageMapClipFit(bool *goodFit, 
+bool psImageMapClipFit(bool *pGoodFit, 
 		       psImageMap *map,
                        psStats *stats,
@@ -30,5 +30,5 @@
     );
 
-bool psImageMapFit1DinY(bool *goodFit, 
+bool psImageMapFit1DinY(bool *pGoodFit, 
 			psImageMap *map,
                         const psVector *mask,
@@ -40,5 +40,5 @@
     );
 
-bool psImageMapFit1DinX(bool *goodFit, 
+bool psImageMapFit1DinX(bool *pGoodFit, 
 			psImageMap *map,
                         const psVector *mask,