Changeset 13769

Timestamp:

Jun 12, 2007, 2:33:56 PM (19 years ago)

Author:

eugene

Message:

modified pmReadoutReadNext API to return an error status

File:

• trunk/ppMerge/src/ppMergeCombine.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeCombine.c

@@ -162 +162 @@
 
                     // Only reading and writing the first readout in each cell (plane 0)
-                    if (pmReadoutReadNext(stack->data[i], fits, 0, options->rows)) {
+                    bool readOK;
+                    if (pmReadoutReadNext(&readOK, stack->data[i], fits, 0, options->rows)) {
+                        if (!readOK) {
+                            psError(PS_ERR_IO, false, "Failed to read concepts for cell.\n");
+                            psErrorStackPrint(stderr, "trouble reading data!\n");
+                            exit (1);
+                        }
                         // If we're creating a bias or a dark, we don't want to generate a mask
                         if ((options->zero || options->scale || options->shutter || options->mask) &&