Changeset 23351 for branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPAfileDefine.h

Timestamp:

Mar 17, 2009, 12:07:42 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmFPAfileDefine.h (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPAfileDefine.h

@@ -53 +53 @@
 // Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only
 // reference count is held by the config->files metadata.
-pmFPAfile *pmFPAfileDefineFromArgs (bool *found, pmConfig *config, const char *filename, const char *argname);
+pmFPAfile *pmFPAfileDefineFromArgs(bool *found, pmConfig *config, const char *filename, const char *argname);
 
 // look for the given argname on the argument list; bind the associated files to the specified
@@ -59 +59 @@
 // Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only
 // reference count is held by the config->files metadata.
-pmFPAfile *pmFPAfileBindFromArgs (bool *found, pmFPAfile *input, pmConfig *config, const char *filename, const char *argname);
+pmFPAfile *pmFPAfileBindFromArgs(bool *found, pmFPAfile *input, pmConfig *config, const char *filename, const char *argname);
+
+/// Define a file based on the filenames in the RUN metadata in the configuration
+///
+/// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only
+/// reference count is held by the config->files metadata.
+pmFPAfile *pmFPAfileDefineFromRun(
+    bool *found,                        ///< Found files?
+    pmConfig *config,                   ///< Configuration
+    const char *filename                ///< Name of file
+    );
+
 
 // look for the given argname on the argument list.  find the give filename from the file rules