Changeset 5768 for branches/rel9/psModules/src/imcombine/pmImageCombine.c

Timestamp:

Dec 12, 2005, 11:52:24 AM (21 years ago)

Author:

desonia

Message:

merged post-release fixes from CVS main.

File:

• branches/rel9/psModules/src/imcombine/pmImageCombine.c (modified) (2 diffs)

branches/rel9/psModules/src/imcombine/pmImageCombine.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-28 20:43:52 $
+ *  @version $Revision: 1.1.10.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-12-12 21:52:20 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -35 +35 @@
 XXX: Allocate a dummy psStats structure so that we don't destroy away its data.
  *****************************************************************************/
-psImage *pmCombineImages(psImage *combine,              ///< Combined image (output)
-                         psArray **questionablePixels,  ///< Array of rejection masks
-                         const psArray *images,         ///< Array of input images
-                         const psArray *errors,         ///< Array of input error images
-                         const psArray *masks,          ///< Array of input masks
-                         psU32 maskVal,                 ///< Mask value
-                         const psPixels *pixels,        ///< Pixels to combine
-                         psS32 numIter,                 ///< Number of rejection iterations
-                         psF32 sigmaClip,               ///< Number of standard deviations at which to reject
-                         const psStats *stats           ///< Statistics to use in the combination
-                        )
+psImage *pmCombineImages(
+    psImage *combine,                   ///< Combined image (output)
+    psArray **questionablePixels,       ///< Array of rejection masks
+    const psArray *images,              ///< Array of input images
+    const psArray *errors,              ///< Array of input error images
+    const psArray *masks,               ///< Array of input masks
+    psU32 maskVal,                      ///< Mask value
+    const psPixels *pixels,             ///< Pixels to combine
+    psS32 numIter,                      ///< Number of rejection iterations
+    psF32 sigmaClip,                    ///< Number of standard deviations at which to reject
+    const psStats *stats)               ///< Statistics to use in the combination
 {