Changeset 27517 for branches/eam_branches/20100225/psModules/src/camera/pmFPAfile.c

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

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

branches/eam_branches/20100225/psModules/src/camera/pmFPAfile.c

@@ -22 +22 @@
 static int fileNum = 0;                 // Number of file
 
+static bool fpaFileFreeStrict = true;   // Strict checking when file has been freed?
+
+bool pmFPAfileFreeSetStrict(bool new)
+{
+    bool old = fpaFileFreeStrict;       // Old value, to return
+    fpaFileFreeStrict = new;
+    return old;
+}
+
 static void pmFPAfileFree(pmFPAfile *file)
 {
@@ -28 +37 @@
     }
 
-    psAssert(file->fits == NULL, "File %s wasn't closed.", file->name);
+    psAssert(!fpaFileFreeStrict || file->fits == NULL, "File %s wasn't closed.", file->name);
 
     psTrace ("pmFPAfileFree", 5, "freeing %s\n", file->name);