Index: trunk/psLib/src/image/psImageExtraction.h
===================================================================
--- trunk/psLib/src/image/psImageExtraction.h	(revision 1404)
+++ trunk/psLib/src/image/psImageExtraction.h	(revision 1407)
@@ -1,2 +1,3 @@
+
 /** @file  psImageExtraction.h
 *
@@ -9,6 +10,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-08-06 21:50:13 $
+*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-08-07 00:06:06 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16,9 +17,9 @@
 
 #ifndef PSIMAGEEXTRACTION_H
-#define PSIMAGEEXTRACTION_H
+#    define PSIMAGEEXTRACTION_H
 
-#include "psImage.h"
-#include "psVector.h"
-#include "psStats.h"
+#    include "psImage.h"
+#    include "psVector.h"
+#    include "psStats.h"
 
 /// @addtogroup Image
@@ -40,12 +41,11 @@
 *
 */
-psImage *psImageSubset(
-    psImage *out,                         ///< Subimage to return, or NULL.
-    psImage *image,                       ///< Parent image.
-    unsigned int numCols,                 ///< Subimage width (<= image.nCols - col0).
-    unsigned int numRows,                 ///< Subimage height (<= image.nRows - row0).
-    unsigned int col0,                    ///< Subimage col-offset (0 <= col0 < nCol).
-    unsigned int row0                   ///< Subimage row-offset (0 <= row0 < nCol).
-);
+psImage *psImageSubset(psImage * out,   // /< Subimage to return, or NULL.
+                       psImage * image, // /< Parent image.
+                       unsigned int numCols,    // /< Subimage width (<= image.nCols - col0).
+                       unsigned int numRows,    // /< Subimage height (<= image.nRows - row0).
+                       unsigned int col0,       // /< Subimage col-offset (0 <= col0 < nCol).
+                       unsigned int row0        // /< Subimage row-offset (0 <= row0 < nCol).
+                      );
 
 /** Makes a copy of a psImage
@@ -55,52 +55,39 @@
  *
  */
-psImage *psImageCopy(
-    psImage* restrict output,
-    /**< if not NULL, a psImage that could be recycled.  If it can not be used,
-     *   it will be freed via psImageFree
-     */
-    const psImage *input,
-    /**< the psImage to copy */
-    psElemType type
-    /**< the desired datatype of the returned copy */
-);
+psImage *psImageCopy(psImage * restrict output,
 
-psVector* psImageSlice(
-    psVector* out,
-    psVector* slicePositions,
-    const psImage* restrict input,
-    const psImage* restrict mask,
-    unsigned int maskVal,
-    unsigned int col,
-    unsigned int row,
-    unsigned int numCols,
-    unsigned int numRows,
-    psImageCutDirection direction,
-    const psStats* stats
-);
+                     /**< if not NULL, a psImage that could be recycled.  If it can not be used,
+                      *   it will be freed via psImageFree
+                      */
+                     const psImage * input,
 
-psVector* psImageCut(
-    psVector* out,
-    const psImage* input,
-    const psImage* restrict mask,
-    unsigned int maskVal,
-    float startCol,
-    float startRow,
-    float endCol,
-    float endRow,
-    float width,
-    const psStats* stats
-);
+                     /**< the psImage to copy */
+                     psElemType type
 
-psVector* psImageRadialCut(
-    psVector* out,
-    const psImage* input,
-    const psImage* restrict mask,
-    unsigned int maskVal,
-    float centerCol,
-    float centerRow,
-    const psVector* radii,
-    const psStats* stats
-);
+                     /**< the desired datatype of the returned copy */
+                    );
+
+psVector *psImageSlice(psVector * out,
+                       psVector * slicePositions,
+                       const psImage * restrict input,
+                       const psImage * restrict mask,
+                       unsigned int maskVal,
+                       unsigned int col,
+                       unsigned int row,
+                       unsigned int numCols,
+                       unsigned int numRows, psImageCutDirection direction, const psStats * stats);
+
+psVector *psImageCut(psVector * out,
+                     const psImage * input,
+                     const psImage * restrict mask,
+                     unsigned int maskVal,
+                     float startCol,
+                     float startRow, float endCol, float endRow, float width, const psStats * stats);
+
+psVector *psImageRadialCut(psVector * out,
+                           const psImage * input,
+                           const psImage * restrict mask,
+                           unsigned int maskVal,
+                           float centerCol, float centerRow, const psVector * radii, const psStats * stats);
 
 /// @}