Index: trunk/psLib/src/image/psImage.h
===================================================================
--- trunk/psLib/src/image/psImage.h	(revision 1441)
+++ trunk/psLib/src/image/psImage.h	(revision 1442)
@@ -12,6 +12,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-08-09 23:40:55 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-08-10 01:05:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -43,37 +43,31 @@
 typedef struct psImage
 {
-    const psType type;          ///< Image data type and dimension.
-    const unsigned int numCols; ///< Number of columns in image
-    const unsigned int numRows; ///< Number of rows in image.
-    const int col0;             ///< Column position relative to parent.
-    const int row0;             ///< Row position relative to parent.
+    const psType type;                 ///< Image data type and dimension.
+    const unsigned int numCols;        ///< Number of columns in image
+    const unsigned int numRows;        ///< Number of rows in image.
+    const int col0;                    ///< Column position relative to parent.
+    const int row0;                    ///< Row position relative to parent.
 
     union {
-        psU8* *U8;              ///< Unsigned 8-bit integer data.
-        psU16* *U16;            ///< Unsigned 16-bit integer data.
-        psU32* *U32;            ///< Unsigned 32-bit integer data.
-        psU64* *U64;            ///< Unsigned 64-bit integer data.
-        psS8* *S8;              ///< Signed 8-bit integer data.
-        psS16* *S16;            ///< Signed 16-bit integer data.
-        psS32* *S32;            ///< Signed 32-bit integer data.
-        psS64* *S64;            ///< Signed 64-bit integer data.
-        psF32* *F32;            ///< Single-precision float data.
-        psF64* *F64;            ///< Double-precision float data.
-        psC32* *C32;            ///< Single-precision complex data.
-        psC64* *C64;            ///< Double-precision complex data.
-        psPTR* *PTR;            ///< Void pointers.
-        psPTR* V;               ///< Pointer to data.
-    } data;                     ///< Union for data types.
-    const struct psImage* parent;       ///< Parent, if a subimage.
-    int nChildren;              ///< Number of subimages.
-    struct psImage* *children;  ///< Children of this region.
+        psU8* *U8;                     ///< Unsigned 8-bit integer data.
+        psU16* *U16;                   ///< Unsigned 16-bit integer data.
+        psU32* *U32;                   ///< Unsigned 32-bit integer data.
+        psU64* *U64;                   ///< Unsigned 64-bit integer data.
+        psS8* *S8;                     ///< Signed 8-bit integer data.
+        psS16* *S16;                   ///< Signed 16-bit integer data.
+        psS32* *S32;                   ///< Signed 32-bit integer data.
+        psS64* *S64;                   ///< Signed 64-bit integer data.
+        psF32* *F32;                   ///< Single-precision float data.
+        psF64* *F64;                   ///< Double-precision float data.
+        psC32* *C32;                   ///< Single-precision complex data.
+        psC64* *C64;                   ///< Double-precision complex data.
+        psPTR* *PTR;                   ///< Void pointers.
+        psPTR* V;                      ///< Pointer to data.
+    } data;                            ///< Union for data types.
+    const struct psImage* parent;      ///< Parent, if a subimage.
+    int nChildren;                     ///< Number of subimages.
+    struct psImage* *children;         ///< Children of this region.
 }
 psImage;
-
-/*****************************************************************************/
-
-/* FUNCTION PROTOTYPES                                                       */
-
-/*****************************************************************************/
 
 /** Create an image of the specified size and type.
@@ -85,8 +79,9 @@
  *
  */
-psImage* psImageAlloc(unsigned int numCols,     ///< Number of rows in image.
-                      unsigned int numRows,     ///< Number of columns in image.
-                      const psElemType type     ///< Type of data for image.
-                     );
+psImage* psImageAlloc(
+    unsigned int numCols,              ///< Number of rows in image.
+    unsigned int numRows,              ///< Number of columns in image.
+    const psElemType type              ///< Type of data for image.
+);
 
 /** Resize a given image to the given size/type.
@@ -95,9 +90,10 @@
  *
  */
-psImage* psImageRecycle(psImage* old,  ///< the psImage to recycle by resizing image buffer
-                        unsigned int numCols,   ///< the desired number of columns in image
-                        unsigned int numRows,   ///< the desired number of rows in image
-                        const psElemType type   ///< the desired datatype of the image
-                       );
+psImage* psImageRecycle(
+    psImage* old,                      ///< the psImage to recycle by resizing image buffer
+    unsigned int numCols,              ///< the desired number of columns in image
+    unsigned int numRows,              ///< the desired number of rows in image
+    const psElemType type              ///< the desired datatype of the image
+);
 
 /** Frees all children of a psImage.
@@ -106,11 +102,20 @@
  *
  */
-int psImageFreeChildren(psImage* image
+int psImageFreeChildren(
+    psImage* image                     ///< psImage in which all children shall be deallocated
+);
 
-                        /**< psImage in which all children shall be deallocated */
-                       );
-
-psF32 psImagePixelInterpolate(const psImage* input,
-                              float x, float y, psF32 unexposedValue, psImageInterpolateMode mode);
+/** Interpolate image pixel value given floating point coordinates.
+ *
+ *  @return psF32    Pixel value interpolated from image or unexposedValue if
+ *                   given x,y doesn't coorespond to a valid image location
+ */
+psF32 psImagePixelInterpolate(
+    const psImage* input,              ///< input image for interpolation
+    float x,                           ///< column location to derive value of
+    float y,                           ///< row location ot derive value of
+    psF32 unexposedValue,              ///< return value if x,y location is not in image.
+    psImageInterpolateMode mode        ///< interpolation mode
+);
 
 #define p_psImagePixelInterpolateFcns(TYPE) \