Changeset 8879 for trunk/psModules/src/camera/pmFPAfileIO.c

Timestamp:

Sep 21, 2006, 5:20:08 PM (20 years ago)

Author:

Paul Price

Message:

Fixing pmFPAfileDefineFromConf to allow interpolation on filenames. Most of the code wasn't required, since it is in pmFPAfileOpen (I think Gene said pmFPAfileDefineFromConf was coded early on, before everything got settled) --- just had to set found to true, and return a pmFPAfile. To get this change to work, added a check in pmFPAfileRead to see if the file is open (it doesn't know the file level a-priori).

File:

• trunk/psModules/src/camera/pmFPAfileIO.c (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfileIO.c

@@ -247 +247 @@
     }
 
+    // We need to read it --- double-check it's open!
+    if (file->state == PM_FPA_STATE_CLOSED) {
+        file->fileLevel = level;
+        if (!pmFPAfileOpen (file, view, config)) {
+            psError(PS_ERR_IO, false, "failed to open file %s when attempting to read", file->name);
+            return false;
+        }
+    }
+
     switch (file->type) {
     case PM_FPA_FILE_IMAGE: