Changeset 31156 for trunk/ppSub/src/ppSubDefineOutput.c

Timestamp:

Apr 4, 2011, 1:13:59 PM (15 years ago)

Author:

eugene

Message:

minor fixes from eam branch

Location:

trunk/ppSub

Files:

• . (modified) (1 prop)
• src/ppSubDefineOutput.c (modified) (1 diff)

trunk/ppSub

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM

trunk/ppSub/src/ppSubDefineOutput.c

@@ -73 +73 @@
     pmFPAfile *inFile = psMetadataLookupPtr(NULL, config->files, "PPSUB.INPUT"); // Input file
 
-    // We should be using the GNU version of basename() which doesn't modify its argument, but just in case,
-    // we'll copy the string.
-    psString refName = psStringCopy(refFile->filename); // Filename of reference
-    const char *refBase = basename(refName);            // Basename of reference
-    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.REFERENCE", 0,
-                     "Subtraction reference", refBase);
-    psFree(refName);
-    psString inName = psStringCopy(inFile->filename);   // Filename of input
-    const char *inBase = basename(inName);              // Basename of input
-    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.INPUT", 0,
-                     "Subtraction input", inBase);
-    psFree(inName);
+    // save the names of the input and reference image in the header
+    psString refBase = psStringFileBasename(refFile->origname);            // Basename of reference
+    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.REFERENCE", 0, "Subtraction reference", refBase);
+    psFree(refBase);
+
+    psString inBase = psStringFileBasename(inFile->origname);              // Basename of input
+    psMetadataAddStr(outHDU->header, PS_LIST_TAIL, "PPSUB.INPUT", 0, "Subtraction input", inBase);
+    psFree(inBase);
 
     ppSubVersionHeader(outHDU->header);

@@ -17 +17 @@
 test
 Doxyfile
+a.out.dSYM