Changeset 27762 for trunk/psModules/src/camera/pmFPAConstruct.c

Timestamp:

Apr 23, 2010, 2:48:49 PM (16 years ago)

Author:

Paul Price

Message:

Reverting undesirable change.

File:

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

trunk/psModules/src/camera/pmFPAConstruct.c

@@ -133 +133 @@
     assert(hdu);
 
-    if (!fpa->hdu) {
-        fpa->hdu = psMemIncrRefCounter(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);
     pmFPASetFileStatus(fpa, true);
 
@@ -150 +155 @@
 
     if (chip->hdu) {
-        chip->hdu = psMemIncrRefCounter(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);
     pmChipSetFileStatus(chip, true);
 
@@ -166 +176 @@
 
     if (cell->hdu) {
-        cell->hdu = psMemIncrRefCounter(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);
     pmCellSetFileStatus(cell, true);