Changeset 43018

Timestamp:

May 11, 2026, 3:21:02 PM (2 months ago)

Author:

eugene

Message:

stiffle excess warnings; plug mem leaks; allow pmConfig to understand ​file:// (like pmConfigConvertFilename)

Location:

branches/eam_branches/ipp-pstamp-20260421/psModules/src

Files:

• config/pmConfig.c (modified) (1 diff)
• imcombine/pmStack.c (modified) (1 diff)
• objects/pmSourceFitModel.c (modified) (3 diffs)

branches/eam_branches/ipp-pstamp-20260421/psModules/src/config/pmConfig.c

@@ -1971 +1971 @@
 }
 
+// this function is similar to pmConfigConvertFilename, but that function requires the ipprc to have
+// already been read (since it translates path: entries)
+// XXX EAM : merge duplicate code here
 static psString resolveConfigFile(const char *nameArg)
 {
+    // strip file:// from front of name
+    if (!strncasecmp(nameArg, "file:", strlen("file:"))) {
+        psString newName = psStringCopy(nameArg);
+
+        char *point = newName + strlen("file:");
+        while (*point == '/') {
+            point ++;
+        }
+        char *tmpName = NULL;
+        psStringAppend (&tmpName, "/%s", point);
+        psFree (newName);
+        newName = tmpName;
+
+        if (!checkPath(newName, false, false)) {
+            // let checkPath()'s psError() call float up
+            psError(psErrorCodeLast(), false, "error from checkPath for file:// (%s)", newName);
+            psFree (newName);
+            return NULL;
+        }
+        return newName;
+    }
+
     // if config file name is nebulous path resolve it
     // otherwise just return a copy of the argument

branches/eam_branches/ipp-pstamp-20260421/psModules/src/imcombine/pmStack.c

@@ -1997 +1997 @@
     psFree(pixelMap);
     psFree(weights);
+    psFree(exps);
     psFree(buffer);
     psFree(addVariance);

branches/eam_branches/ipp-pstamp-20260421/psModules/src/objects/pmSourceFitModel.c

@@ -74 +74 @@
 }
 
+static int nWarn = 0;
+
 bool pmSourceFitModel (pmSource *source,
                        pmModel *model,
@@ -121 +123 @@
             // skip nan values in image
             if (!isfinite(source->pixels->data.F32[i][j])) {
-                fprintf (stderr, "WARNING: unmasked nan in image : %x vs %x\n", source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[i][j], maskVal);
+                if ((nWarn < 10) || (nWarn % 100 == 0)) {
+                    fprintf (stderr, "WARNING (# %d): unmasked nan in image : %x vs %x\n", nWarn, source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[i][j], maskVal);
+                }
+                nWarn ++;
                 continue;
             }
@@ -127 +132 @@
             // skip nan values in image
             if (!isfinite(vWgt[i][j])) {
-                fprintf (stderr, "WARNING: unmasked nan in variance : %x vs %x\n", source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[i][j], maskVal);
+                if ((nWarn < 10) || (nWarn % 100 == 0)) {
+                    fprintf (stderr, "WARNING: unmasked nan in variance : %x vs %x\n", source->maskObj->data.PS_TYPE_IMAGE_MASK_DATA[i][j], maskVal);
+                }
+                nWarn ++;
                 continue;
             }