Changeset 13756

Timestamp:

Jun 11, 2007, 1:13:31 PM (19 years ago)

Author:

magnier

Message:

fixed inconsistency in output sizes

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.c (modified) (5 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -107 +107 @@
     for (long i = 0; i < inputs->n; i++) {
         pmReadout *readout = inputs->data[i]; // Readout of interest
-        pmCell *cell = readout->parent; // The parent cell
 
         if (!readout || !readout->image) {
@@ -114 +113 @@
         }
 
+// XXX the use of trimsec here to judge the output size is inconsistent with the values of
+// minInputRows,etc below
+# if (0)
+        pmCell *cell = readout->parent; // The parent cell
         bool mdok = true;       // Status of MD lookup
         psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section
@@ -122 +125 @@
             ySize = PS_MAX(ySize, trimsec->y1 - trimsec->y0);
         }
+# endif
 
         if (params->weights && !readout->weight) {
@@ -139 +143 @@
                 readout->col0, readout->row0, readout->image->numCols, readout->image->numRows);
     }
+
+    // full size of the output image
+    xSize = maxInputCols - minInputCols;
+    ySize = maxInputRows - minInputRows;
+
     if (!valid) {
         psError(PS_ERR_IO, true, "No valid inputs.\n");
@@ -145 +154 @@
 
     // Update the origin
+    // XXX EAM : use a macro (see psImage.h for PS_IMAGE_SET_ROW0, etc)
     if (output->image) {
         *(psS32 *) &(output->col0) = PS_MIN(minInputCols, output->col0);