Changeset 23275

Timestamp:

Mar 11, 2009, 3:01:54 PM (17 years ago)

Author:

Paul Price

Message:

Move snippet that reads the mask bits to where the PHU is definitely defined.

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -522 +522 @@
     file->filesrc = psStringCopy("{CHIP.NAME}.{CELL.NAME}");
 
-    if (file->type == PM_FPA_FILE_MASK) {
-        if (!pmConfigMaskReadHeader(config, phu)) {
-            psError(PS_ERR_IO, false, "Error reading mask bits");
-            psFree(phu);
-            return NULL;
-        }
-    }
-
     // Examine the list of input files and validate their cameras
     // Associate each filename with an element of the FPA
@@ -555 +547 @@
             }
             psFree(realName);
+        }
+
+        if (i == 0 && file->type == PM_FPA_FILE_MASK) {
+            if (!pmConfigMaskReadHeader(config, phu)) {
+                psError(PS_ERR_IO, false, "Error reading mask bits");
+                psFree(phu);
+                return NULL;
+            }
         }