Changeset 4028 for trunk/psModules/src/pmImageCombine.c

Timestamp:

May 25, 2005, 9:26:44 AM (21 years ago)

Author:

gusciora

Message:

...

File:

• trunk/psModules/src/pmImageCombine.c (modified) (7 diffs)

trunk/psModules/src/pmImageCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-11 00:33:44 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 19:26:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -226 +226 @@
         //
         // Loop over all pixels in all images, set the appropriate data, mask,
-        // error vectors, call psVectorStats(), and set the result in the combine
-        // image.
+        // error vectors, call psVectorStats(), and set the result in the
+        // combine image.
         //
         for (psS32 row = 0 ; row < numRows ; row++) {
@@ -318 +318 @@
 XXX: Use static variables.
 XXX: Optimization: we don't need to transform the entire mask image.
-XXX: The inToOut and outToIn transforms are confusing.  Verify that what I think
-     they mean syncs with PWP.
+XXX: The inToOut and outToIn transforms are confusing.  Verify that what
+     I think they mean syncs with PWP.
  *****************************************************************************/
 psArray *pmRejectPixels(const psArray *images,          ///< Array of input images
@@ -356 +356 @@
     psS32 numCols = ((psImage *) images->data[0])->numCols;
     psS32 numRows = ((psImage *) images->data[0])->numRows;
-    psRegion *myRegion = psRegionAlloc(0, numCols-1, 0, numRows-1);
+    psRegion myRegion = psRegionSet(0, numCols-1, 0, numRows-1);
     psU32 maskVal = 1;
 
@@ -368 +368 @@
         psPixels *pixelList = (psPixels *) errors->data[im];
         psImage *currImage = (psImage *) images->data[im];
-        myRegion->x0 = 0;
-        myRegion->x1 = currImage->numCols - 1;
-        myRegion->y0 = 0;
-        myRegion->y1 = currImage->numRows - 1;
+        myRegion.x0 = 0;
+        myRegion.x1 = currImage->numCols - 1;
+        myRegion.y0 = 0;
+        myRegion.y1 = currImage->numRows - 1;
         psPlaneTransform *myInToOut = (psPlaneTransform *) inToOut->data[im];
         psPlaneTransform *myOutToIn = (psPlaneTransform *) outToIn->data[im];
@@ -384 +384 @@
         // Transform that mask image into detector coordinate space
         //
-        psImage *transformedImage = psImageTransform(NULL, maskImage, NULL, 0, myOutToIn, NULL, 0);
+        // XXX: conform to new psImageTransform()
+        //        psImage *transformedImage = psImageTransform(NULL, maskImage, NULL, 0, myOutToIn, NULL, 0);
+        psImage *transformedImage = NULL;
 
         //
@@ -457 +459 @@
     }
 
-    psFree(myRegion);
+    //    psFree(myRegion);
     psFree(inCoords);
     psFree(outCoords);