Changeset 27746

Timestamp:

Apr 23, 2010, 11:27:26 AM (16 years ago)

Author:

Paul Price

Message:

Don't care if there's already an HDU there, so long as it has one.

File:

• trunk/psModules/src/camera/pmFPAConstruct.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -133 +133 @@
     assert(hdu);
 
-    if (fpa->hdu) {
-        // Something's already here
-        if (fpa->hdu != hdu) {
-            psError(PS_ERR_IO, true, "Unable to add HDU since FPA already has one.\n");
-        }
-        return false;
-    }
-    fpa->hdu = psMemIncrRefCounter(hdu);
+    if (!fpa->hdu) {
+        fpa->hdu = psMemIncrRefCounter(hdu);
+    }
     pmFPASetFileStatus(fpa, true);
 
@@ -155 +150 @@
 
     if (chip->hdu) {
-        // Something's already here
-        if (chip->hdu != hdu) {
-            psError(PS_ERR_IO, true, "Unable to add HDU since chip already has one.\n");
-        }
-        return false;
-    }
-    chip->hdu = psMemIncrRefCounter(hdu);
+        chip->hdu = psMemIncrRefCounter(hdu);
+    }
     pmChipSetFileStatus(chip, true);
 
@@ -176 +166 @@
 
     if (cell->hdu) {
-        // Something's already here
-        if (cell->hdu != hdu) {
-            psError(PS_ERR_IO, true, "Unable to add HDU since cell already has one.\n");
-        }
-        return false;
-    }
-    cell->hdu = psMemIncrRefCounter(hdu);
+        cell->hdu = psMemIncrRefCounter(hdu);
+    }
     pmCellSetFileStatus(cell, true);