Changeset 7311 for trunk/psModules/src/camera/pmReadout.c

Timestamp:

Jun 2, 2006, 3:02:08 PM (20 years ago)

Author:

Paul Price

Message:

Applying RHL patch. Generally improves the error handling and traceback. pmConcepts.c and pmConceptsRead.c done by PAP (RHL did this also, but I had already done them). Resolved conflicts, except for pmFPAfile.c, which uses psAbort in some instances where RHL's patch had psError; leave this for Gene to decide.

File:

• trunk/psModules/src/camera/pmReadout.c (modified) (1 diff)

trunk/psModules/src/camera/pmReadout.c

@@ -76 +76 @@
             readout->mask = psMemIncrRefCounter(psImageSubset(masks->data[i], *trimsec));
         }
+        if (readout->weight == NULL || readout->mask == NULL) {
+            psError(PS_ERR_UNKNOWN, false, "Trimming readout %d", i);
+            return false;
+        }
 
         // Set up the mask