Changeset 12299 for trunk/psModules/src/camera/pmFPAfile.c

Timestamp:

Mar 7, 2007, 2:41:32 PM (19 years ago)

Author:

Paul Price

Message:

pmFPAfilenameFromRule: Adding const. Changing return type to psString to indicate that the result needs to be returned.

File:

• trunk/psModules/src/camera/pmFPAfile.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAfile.c

@@ -51 +51 @@
     psFree (file->extxtra);
 
+    psFree(file->detrend);
+
     psFree (file->filename);
     psFree (file->extname);
@@ -91 +93 @@
     file->state = PM_FPA_STATE_CLOSED;
 
+    file->detrend = NULL;
+
     file->xBin = 1;
     file->yBin = 1;
@@ -173 +177 @@
 
 // select the rule from the camera configuration, perform substitutions as needed
-char *pmFPAfileNameFromRule (char *rule, pmFPAfile *file, const pmFPAview *view)
+psString pmFPAfileNameFromRule(const char *rule, const pmFPAfile *file, const pmFPAview *view)
 {
     PS_ASSERT_PTR_NON_NULL(rule, NULL);