Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPAfile.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmFPAfile.c (modified) (4 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/camera/pmFPAfile.c

@@ -20 +20 @@
 #include "pmConceptsCopy.h"
 
+static int fileNum = 0;                 // Number of file
+
 static void pmFPAfileFree(pmFPAfile *file)
 {
@@ -56 +58 @@
 }
 
-pmFPAfile *pmFPAfileAlloc()
+pmFPAfile *pmFPAfileAlloc(void)
 {
     pmFPAfile *file = psAlloc(sizeof(pmFPAfile));
@@ -100 +102 @@
 
     file->save = false;
+
+    file->index = fileNum++;
 
     file->imageId = 0;
@@ -350 +354 @@
             psStringSubstitute(&newRule, name, "{OUTPUT}");
         }
+    }
+
+    if (strstr(newRule, "{FILE.INDEX}")) {
+        // Number of the file in list
+        psString num = NULL;            // Number to use
+        psStringAppend(&num, "%d", file->index);
+        psStringSubstitute(&newRule, num, "{FILE.INDEX}");
+        psFree(num);
     }