Changeset 18516

Timestamp:

Jul 14, 2008, 2:46:22 PM (18 years ago)

Author:

eugene

Message:

call pmConfigMaskReadHeader when reading a new mask phu

File:

• branches/eam_branch_20080706/psModules/src/camera/pmFPAfileDefine.c (modified) (4 diffs)

branches/eam_branch_20080706/psModules/src/camera/pmFPAfileDefine.c

@@ -489 +489 @@
         psFree(realName);
         return NULL;
+    }
+
+    if (file->type == PM_FPA_FILE_MASK) {
+        if (!pmConfigMaskReadHeader (config, phu)) {
+            psError(PS_ERR_IO, false, "error in mask bits");
+            return NULL;
+        }
     }
 
@@ -660 +667 @@
     file->fileLevel = input->fileLevel;
 
+
     // define the rule to identify these files in the file->names data
     psFree (file->filerule);
@@ -735 +743 @@
         psMetadataAddStr (file->names, PS_LIST_TAIL, name, 0, "", infiles->data[i]);
 
+        if ((i == 0) && (file->type == PM_FPA_FILE_MASK)) {
+            if (!pmConfigMaskReadHeader (config, phu)) {
+                psError(PS_ERR_IO, false, "error in mask bits");
+                return NULL;
+            }
+        }
+
         psFree(view);
         psFree(name);
@@ -806 +821 @@
         psFree(formatName);
         return NULL;
+    }
+
+    if (file->type == PM_FPA_FILE_MASK) {
+        if (!pmConfigMaskReadHeader (config, phu)) {
+            psError(PS_ERR_IO, false, "error in mask bits");
+            return NULL;
+        }
     }