Index: trunk/psLib/src/imageops/psImageConvolve.h
===================================================================
--- trunk/psLib/src/imageops/psImageConvolve.h	(revision 4128)
+++ trunk/psLib/src/imageops/psImageConvolve.h	(revision 4162)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -41,24 +41,24 @@
 /** Allocates a convolution kernel of the given range
  *
- *  In order to perform a convolution, we need to define the convolution 
- *  kernel. We need a more general object than a psImage so that we can 
- *  incorporate the offset from the (0, 0) pixel to the (0, 0) value of the 
- *  kernel. It might be convenient to allow both positive and negative 
- *  indices to convey the positive and negative shifts. One might consider 
- *  setting the x0 and y0 members of a psImage to the appropriate offsets, 
- *  but this is not the purpose of these members, and doing so may affect the 
+ *  In order to perform a convolution, we need to define the convolution
+ *  kernel. We need a more general object than a psImage so that we can
+ *  incorporate the offset from the (0, 0) pixel to the (0, 0) value of the
+ *  kernel. It might be convenient to allow both positive and negative
+ *  indices to convey the positive and negative shifts. One might consider
+ *  setting the x0 and y0 members of a psImage to the appropriate offsets,
+ *  but this is not the purpose of these members, and doing so may affect the
  *  behavior of other psImage operations.
  *
- *  This construction allows the kernel member to use negative indices, while 
+ *  This construction allows the kernel member to use negative indices, while
  *  preserving the location of psMemBlocks relative to allocated memory.
  *
- *  The maximum extent of the kernel shifts shall be defined by the xMin, 
- *  xMax, yMin and yMax members. Note that xMin and yMin, under normal 
- *  circumstances, should be negative numbers. That is, 
- *  myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or 
+ *  The maximum extent of the kernel shifts shall be defined by the xMin,
+ *  xMax, yMin and yMax members. Note that xMin and yMin, under normal
+ *  circumstances, should be negative numbers. That is,
+ *  myKernel->kernel[-3][-2] may be defined if yMin and xMin are equal to or
  *  more negative than -3 and -2, respectively.
  *
- *  In the event that one of the minimum values is greater than the 
- *  corresponding maximum value, the function shall generate a warning, and 
+ *  In the event that one of the minimum values is greater than the
+ *  corresponding maximum value, the function shall generate a warning, and
  *  the offending values shall be exchanged.
  *
@@ -74,14 +74,14 @@
 /** Generates a kernel given a list of shift values
  *
- *  Given a list of values (e.g., shifts made in the course of OT guiding), 
- *  psKernelGenerate shall return the appropriate kernel.  The vectors xShifts 
- *  and yShifts, which are a list of shifts relative to some starting point, 
- *  will be supplied by the user. The elements of the vectors should be of an 
- *  integer type; otherwise the values shall be truncated to integers. The 
- *  output kernel shall be normalized such that the sum over the kernel is 
- *  unity. 
+ *  Given a list of values (e.g., shifts made in the course of OT guiding),
+ *  psKernelGenerate shall return the appropriate kernel.  The vectors xShifts
+ *  and yShifts, which are a list of shifts relative to some starting point,
+ *  will be supplied by the user. The elements of the vectors should be of an
+ *  integer type; otherwise the values shall be truncated to integers. The
+ *  output kernel shall be normalized such that the sum over the kernel is
+ *  unity.
  *
- *  If the vectors are not of the same number of elements, then the function 
- *  shall generate a warning shall be generated, following which, the longer 
+ *  If the vectors are not of the same number of elements, then the function
+ *  shall generate a warning shall be generated, following which, the longer
  *  vector trimmed to the length of the shorter, and the function shall continue.
  *
@@ -97,18 +97,18 @@
 /** convolve an image with a kernel
  *
- *  Given an input image and the convolution kernel, psImageConvolve shall 
- *  convolve the input image, in, with the kernel, kernel and return the 
+ *  Given an input image and the convolution kernel, psImageConvolve shall
+ *  convolve the input image, in, with the kernel, kernel and return the
  *  convolved image, out.
- * 
- *  Two methods shall be available for the convolution: if direct is true, 
- *  then the convolution shall be performed in real space (appropriate for 
- *  small kernels); otherwise, the convolution shall be performed using Fast 
- *  Fourier Transforms (FFTs; appropriate for larger kernels). The latter 
- *  option involves padding the input image, copying the kernel into an image 
- *  of the same size as the padded input image, performing an FFT on each, 
- *  multiplying the FFTs, and performing an inverse FFT before trimming the 
+ *
+ *  Two methods shall be available for the convolution: if direct is true,
+ *  then the convolution shall be performed in real space (appropriate for
+ *  small kernels); otherwise, the convolution shall be performed using Fast
+ *  Fourier Transforms (FFTs; appropriate for larger kernels). The latter
+ *  option involves padding the input image, copying the kernel into an image
+ *  of the same size as the padded input image, performing an FFT on each,
+ *  multiplying the FFTs, and performing an inverse FFT before trimming the
  *  image back to the original size.
  *
- *  @return psImage*  resulting image 
+ *  @return psImage*  resulting image
  */
 psImage* psImageConvolve(
@@ -119,3 +119,3 @@
 );
 
-#endif
+#endif // #ifndef PS_IMAGE_CONVOLVE_H
Index: trunk/psLib/src/imageops/psImageGeomManip.h
===================================================================
--- trunk/psLib/src/imageops/psImageGeomManip.h	(revision 4128)
+++ trunk/psLib/src/imageops/psImageGeomManip.h	(revision 4162)
@@ -8,6 +8,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 02:08:21 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -155,3 +155,3 @@
 );
 
-#endif
+#endif // #ifndef PS_IMAGE_GEOM_MANIP_H
Index: trunk/psLib/src/imageops/psImagePixelExtract.h
===================================================================
--- trunk/psLib/src/imageops/psImagePixelExtract.h	(revision 4128)
+++ trunk/psLib/src/imageops/psImagePixelExtract.h	(revision 4162)
@@ -8,6 +8,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-05-19 02:08:21 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-08 23:40:45 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -130,3 +130,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PSIMAGE_PIXEL_EXTRACT_H
Index: trunk/psLib/src/imageops/psImagePixelManip.h
===================================================================
--- trunk/psLib/src/imageops/psImagePixelManip.h	(revision 4128)
+++ trunk/psLib/src/imageops/psImagePixelManip.h	(revision 4162)
@@ -8,6 +8,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 02:08:21 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-08 23:40:45 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -88,3 +88,3 @@
 );
 
-#endif
+#endif // #ifndef PS_IMAGE_PIXEL_MANIP_H
Index: trunk/psLib/src/imageops/psImageStats.h
===================================================================
--- trunk/psLib/src/imageops/psImageStats.h	(revision 4128)
+++ trunk/psLib/src/imageops/psImageStats.h	(revision 4162)
@@ -9,10 +9,10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-24 19:39:53 $
+*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-08 23:40:45 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
 */
-#if !defined(PS_IMAGE_STATS_H)
+#ifndef PS_IMAGE_STATS_H
 #define PS_IMAGE_STATS_H
 
@@ -28,8 +28,8 @@
 /** This routine must determine the various statistics for the image.
  *
- *  Determine statistics for image (or subimage). The statistics to be 
- *  determined are specified by stats. The mask allows pixels to be excluded 
- *  if their corresponding mask pixel value matches the value of maskVal. 
- *  This function must be defined for the following types: psS8, psU16, psF32, 
+ *  Determine statistics for image (or subimage). The statistics to be
+ *  determined are specified by stats. The mask allows pixels to be excluded
+ *  if their corresponding mask pixel value matches the value of maskVal.
+ *  This function must be defined for the following types: psS8, psU16, psF32,
  *  psF64.
  *
@@ -45,6 +45,6 @@
 /** Construct a histogram from an image (or subimage).
  *
- *  The histogram to generate is specified by psHistogram hist (see section 
- *  4.3.2 in SDRS). This function must be defined for the following types: 
+ *  The histogram to generate is specified by psHistogram hist (see section
+ *  4.3.2 in SDRS). This function must be defined for the following types:
  *  psS8, psU16, psF32, psF64.
  *
@@ -60,6 +60,6 @@
 /** Fit a 2-D polynomial surface to an image.
  *
- *  The input structure coeffs contains the desired order and terms of 
- *  interest. This function must be defined for the following types: psS8, 
+ *  The input structure coeffs contains the desired order and terms of
+ *  interest. This function must be defined for the following types: psS8,
  *  psU16, psF32, psF64.
  *
@@ -74,6 +74,6 @@
 /** Evaluate a 2-D polynomial surface for the image pixels.
  *
- *  Given the input polynomial coefficients, set the image pixel values on the 
- *  basis of the polynomial function. This function must be defined for the 
+ *  Given the input polynomial coefficients, set the image pixel values on the
+ *  basis of the polynomial function. This function must be defined for the
  *  following types: psS8, psU16, psF32, psF64.
  *
@@ -87,3 +87,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PS_IMAGE_STATS_H
Index: trunk/psLib/src/imageops/psImageStructManip.h
===================================================================
--- trunk/psLib/src/imageops/psImageStructManip.h	(revision 4128)
+++ trunk/psLib/src/imageops/psImageStructManip.h	(revision 4162)
@@ -8,6 +8,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-05-19 05:18:20 $
+*  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-08 23:40:45 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -82,3 +82,3 @@
 /// @}
 
-#endif
+#endif // #ifndef PSIMAGE_STRUCT_MANIP_H