Changeset 25027 for branches/pap/psModules/src/camera/pmReadoutStack.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmReadoutStack.c (modified) (2 diffs)

branches/pap/psModules/src/camera/pmReadoutStack.c

@@ -252 +252 @@
             continue;
         }
+        if (!readout->process) {
+            continue;
+        }
         if (!readout->image) {
             psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %ld has NULL image.\n", i);
@@ -260 +263 @@
         pmCell *cell = readout->parent; // The parent cell
         bool mdok = true;       // Status of MD lookup
-        psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section
+        psRegion *trimsec = cell ? psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC") : NULL; // Trim section
         if (!mdok || !trimsec || psRegionIsNaN(*trimsec)) {
-            psWarning("CELL.TRIMSEC is not set for readout %ld --- ignored.\n", i);
+            psWarning("CELL.TRIMSEC is not set for readout %ld --- attempting to use image size.\n", i);
+            xSize = PS_MAX(xSize, readout->image->numCols);
+            ySize = PS_MAX(ySize, readout->image->numRows);
+            xMin = PS_MIN(xMin, 0);
+            xMax = PS_MAX(xMax, readout->image->numCols - 1);
+            yMin = PS_MIN(yMin, 0);
+            yMax = PS_MAX(yMax, readout->image->numRows - 1);
         } else {
             xSize = PS_MAX(xSize, trimsec->x1 - trimsec->x0);