Changeset 13766 for trunk/psModules/src/imcombine/pmReadoutCombine.c

Timestamp:

Jun 11, 2007, 3:34:12 PM (19 years ago)

Author:

magnier

Message:

fixing inconsistency between input and output image areas

File:

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

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -104 +104 @@
     int xSize = 0, ySize = 0;           // The size of the output image
 
+    int xMin = INT_MAX;
+    int yMin = INT_MAX;
+    int xMax = 0;
+    int yMax = 0;
+
     bool valid = false;                 // Do we have a single valid input?
     for (long i = 0; i < inputs->n; i++) {
@@ -113 +118 @@
         }
 
-// XXX the use of trimsec here to judge the output size is inconsistent with the values of
-// minInputRows,etc below
-# if (0)
+        // use the trimsec to define the max full range of the output pixels
         pmCell *cell = readout->parent; // The parent cell
         bool mdok = true;       // Status of MD lookup
@@ -124 +127 @@
             xSize = PS_MAX(xSize, trimsec->x1 - trimsec->x0);
             ySize = PS_MAX(ySize, trimsec->y1 - trimsec->y0);
-        }
-# endif
+            xMin  = PS_MIN(xMin,  trimsec->x0);
+            xMax  = PS_MAX(xMax,  trimsec->x1);
+            yMin  = PS_MIN(yMin,  trimsec->y0);
+            yMax  = PS_MAX(yMax,  trimsec->y1);
+        }
 
         if (params->weights && !readout->weight) {
@@ -136 +142 @@
 
         // Range of pixels on output image
-        minInputRows = PS_MIN(minInputRows, readout->row0);
-        maxInputRows = PS_MAX(maxInputRows, readout->row0 + readout->image->numRows);
-        minInputCols = PS_MIN(minInputCols, readout->col0);
-        maxInputCols = PS_MAX(maxInputCols, readout->col0 + readout->image->numCols);
+        minInputRows = PS_MAX (xMin, PS_MIN(minInputRows, readout->row0));
+        maxInputRows = PS_MIN (xMax, PS_MAX(maxInputRows, readout->row0 + readout->image->numRows));
+        minInputCols = PS_MAX (yMin, PS_MIN(minInputCols, readout->col0));
+        maxInputCols = PS_MIN (yMax, PS_MAX(maxInputCols, readout->col0 + readout->image->numCols));
         psTrace("psModules.imcombine", 7, "Readout %ld: offset %d,%d; size %dx%d\n", i,
                 readout->col0, readout->row0, readout->image->numCols, readout->image->numRows);
     }
-
-    // full size of the output image
-    xSize = maxInputCols - minInputCols;
-    ySize = maxInputRows - minInputRows;
 
     if (!valid) {