Index: /trunk/psLib/src/image/psImage.c
===================================================================
--- /trunk/psLib/src/image/psImage.c	(revision 3441)
+++ /trunk/psLib/src/image/psImage.c	(revision 3442)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-17 19:02:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -413,12 +413,4 @@
 }
 
-/*****************************************************************************
-XXX: update function description.
- 
-p_psImagePixelInterpolation(image, x, y): this routine takes as input an
-image and coordinates (x, y) and produces as output the corresponding pixel
-value at the those coordinates.  For fractional corrdinates (x, y), 2-D
-linear interpolation is performed on the image.
- *****************************************************************************/
 psC64 psImagePixelInterpolate(const psImage* input,
                               float x,
Index: /trunk/psLib/src/image/psImage.h
===================================================================
--- /trunk/psLib/src/image/psImage.h	(revision 3441)
+++ /trunk/psLib/src/image/psImage.h	(revision 3442)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-17 19:02:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31,9 +31,14 @@
  */
 typedef enum {
-    PS_INTERPOLATE_FLAT = 1,           ///< 'flat' interpolation (nearest pixel)
+    PS_INTERPOLATE_FLAT,               ///< 'flat' interpolation (nearest pixel)
     PS_INTERPOLATE_BILINEAR,           ///< bi-linear interpolation
-    PS_INTERPOLATE_BICUBIC,            ///< bi-cubic interpolation
-    PS_INTERPOLATE_SINC,               ///< sinc interpolation
-    PS_INTERPOLATE_NUM_MODES           ///< end-marker of list of modes; not a valid interpolation mode
+    PS_INTERPOLATE_LANCZOS2,           ///< Sinc interpolation with 4x4 pixel kernel
+    PS_INTERPOLATE_LANCZOS3,           ///< Sinc interpolation with 6x6 pixel kernel
+    PS_INTERPOLATE_LANCZOS4,           ///< Sinc interpolation with 8x8 pixel kernel
+    PS_INTERPOLATE_BILINEAR_VARIANCE,  ///< Variance version of PS_INTERPOLATE_BILINEAR
+    PS_INTERPOLATE_LANCZOS2_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS2
+    PS_INTERPOLATE_LANCZOS3_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS3
+    PS_INTERPOLATE_LANCZOS4_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS4
+    PS_INTERPOLATE_NUM_MODES           ///< enum end-marker; does not coorespond to a interpolation mode
 } psImageInterpolateMode;
 
@@ -47,8 +52,8 @@
 {
     const psType type;                 ///< Image data type and dimension.
-    const psU32 numCols;        ///< Number of columns in image
-    const psU32 numRows;        ///< Number of rows in image.
-    const psS32 col0;                    ///< Column position relative to parent.
-    const psS32 row0;                    ///< Row position relative to parent.
+    const psU32 numCols;               ///< Number of columns in image
+    const psU32 numRows;               ///< Number of rows in image.
+    const psS32 col0;                  ///< Column position relative to parent.
+    const psS32 row0;                  ///< Row position relative to parent.
 
     union {
Index: /trunk/psLib/src/mathtypes/psImage.c
===================================================================
--- /trunk/psLib/src/mathtypes/psImage.c	(revision 3441)
+++ /trunk/psLib/src/mathtypes/psImage.c	(revision 3442)
@@ -9,6 +9,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-17 19:02:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -413,12 +413,4 @@
 }
 
-/*****************************************************************************
-XXX: update function description.
- 
-p_psImagePixelInterpolation(image, x, y): this routine takes as input an
-image and coordinates (x, y) and produces as output the corresponding pixel
-value at the those coordinates.  For fractional corrdinates (x, y), 2-D
-linear interpolation is performed on the image.
- *****************************************************************************/
 psC64 psImagePixelInterpolate(const psImage* input,
                               float x,
Index: /trunk/psLib/src/mathtypes/psImage.h
===================================================================
--- /trunk/psLib/src/mathtypes/psImage.h	(revision 3441)
+++ /trunk/psLib/src/mathtypes/psImage.h	(revision 3442)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-02-17 19:26:24 $
+ *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-17 19:02:01 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31,9 +31,14 @@
  */
 typedef enum {
-    PS_INTERPOLATE_FLAT = 1,           ///< 'flat' interpolation (nearest pixel)
+    PS_INTERPOLATE_FLAT,               ///< 'flat' interpolation (nearest pixel)
     PS_INTERPOLATE_BILINEAR,           ///< bi-linear interpolation
-    PS_INTERPOLATE_BICUBIC,            ///< bi-cubic interpolation
-    PS_INTERPOLATE_SINC,               ///< sinc interpolation
-    PS_INTERPOLATE_NUM_MODES           ///< end-marker of list of modes; not a valid interpolation mode
+    PS_INTERPOLATE_LANCZOS2,           ///< Sinc interpolation with 4x4 pixel kernel
+    PS_INTERPOLATE_LANCZOS3,           ///< Sinc interpolation with 6x6 pixel kernel
+    PS_INTERPOLATE_LANCZOS4,           ///< Sinc interpolation with 8x8 pixel kernel
+    PS_INTERPOLATE_BILINEAR_VARIANCE,  ///< Variance version of PS_INTERPOLATE_BILINEAR
+    PS_INTERPOLATE_LANCZOS2_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS2
+    PS_INTERPOLATE_LANCZOS3_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS3
+    PS_INTERPOLATE_LANCZOS4_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS4
+    PS_INTERPOLATE_NUM_MODES           ///< enum end-marker; does not coorespond to a interpolation mode
 } psImageInterpolateMode;
 
@@ -47,8 +52,8 @@
 {
     const psType type;                 ///< Image data type and dimension.
-    const psU32 numCols;        ///< Number of columns in image
-    const psU32 numRows;        ///< Number of rows in image.
-    const psS32 col0;                    ///< Column position relative to parent.
-    const psS32 row0;                    ///< Row position relative to parent.
+    const psU32 numCols;               ///< Number of columns in image
+    const psU32 numRows;               ///< Number of rows in image.
+    const psS32 col0;                  ///< Column position relative to parent.
+    const psS32 row0;                  ///< Row position relative to parent.
 
     union {