Changeset 18567 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Jul 15, 2008, 12:39:28 PM (18 years ago)

Author:

eugene

Message:

move test for mask to after file is created

File:

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

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -492 +492 @@
     }
 
-    if (file->type == PM_FPA_FILE_MASK) {
-        if (!pmConfigMaskReadHeader (config, phu)) {
-            psError(PS_ERR_IO, false, "error in mask bits");
-            return NULL;
-        }
-    }
-
     // build the template fpa, set up the basic view
     // XXX do we want this to be the baseCamera name or the metaCamera name?
@@ -538 +531 @@
         psFree(fpa);
         return NULL;
+    }
+
+    if (file->type == PM_FPA_FILE_MASK) {
+        if (!pmConfigMaskReadHeader (config, phu)) {
+            psError(PS_ERR_IO, false, "error in mask bits");
+            return NULL;
+        }
     }
 
@@ -824 +824 @@
     }
 
-    if (file->type == PM_FPA_FILE_MASK) {
-        if (!pmConfigMaskReadHeader (config, phu)) {
-            psError(PS_ERR_IO, false, "error in mask bits");
-            return NULL;
-        }
-    }
-
     // build the template fpa, set up the basic view
     fpa = pmFPAConstruct (camera, config->cameraName);
@@ -867 +860 @@
         psFree(fpa);
         return NULL;
+    }
+
+    if (file->type == PM_FPA_FILE_MASK) {
+        if (!pmConfigMaskReadHeader (config, phu)) {
+            psError(PS_ERR_IO, false, "error in mask bits");
+            return NULL;
+        }
     }