Index: trunk/psLib/src/image/psImage.h
===================================================================
--- trunk/psLib/src/image/psImage.h	(revision 3442)
+++ trunk/psLib/src/image/psImage.h	(revision 3446)
@@ -11,6 +11,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-17 19:02:01 $
+ *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-18 02:35:14 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -191,54 +191,37 @@
 );
 
-#define p_psImagePixelInterpolateFcns(TYPE) \
-inline psF64 p_psImagePixelInterpolateFLAT_##TYPE( \
+#define PIXEL_INTERPOLATE_FCN_PROTOTYPE(SUFFIX, RETURNTYPE) \
+inline RETURNTYPE p_psImagePixelInterpolate##SUFFIX( \
         const psImage* input,          /**< input image for interpolation */ \
         float x,                       /**< column location to derive value of */ \
         float y,                       /**< row location ot derive value of */ \
         const psImage* mask,           /**< if not NULL, the mask of the input image */ \
-        psU32 maskVal,          /**< the mask value */ \
-        psF64 unexposedValue           /**< return value if x,y location is not in image. */ \
-                                                 ); \
-inline psF64 p_psImagePixelInterpolateBILINEAR_##TYPE( \
-        const psImage* input,          /**< input image for interpolation */ \
-        float x,                       /**< column location to derive value of */ \
-        float y,                       /**< row location ot derive value of */ \
-        const psImage* mask,           /**< if not NULL, the mask of the input image */ \
-        psU32 maskVal,          /**< the mask value */ \
-        psF64 unexposedValue           /**< return value if x,y location is not in image. */ \
-                                                     );
-
-#define p_psImagePixelInterpolateComplexFcns(TYPE) \
-inline psC64 p_psImagePixelInterpolateFLAT_##TYPE( \
-        const psImage* input,          /**< input image for interpolation */ \
-        float x,                       /**< column location to derive value of */ \
-        float y,                       /**< row location ot derive value of */ \
-        const psImage* mask,           /**< if not NULL, the mask of the input image */ \
-        psU32 maskVal,          /**< the mask value */ \
-        psC64 unexposedValue           /**< return value if x,y location is not in image. */ \
-                                                 ); \
-inline psC64 p_psImagePixelInterpolateBILINEAR_##TYPE( \
-        const psImage* input,          /**< input image for interpolation */ \
-        float x,                       /**< column location to derive value of */ \
-        float y,                       /**< row location ot derive value of */ \
-        const psImage* mask,           /**< if not NULL, the mask of the input image */ \
-        psU32 maskVal,          /**< the mask value */ \
-        psC64 unexposedValue           /**< return value if x,y location is not in image. */ \
-                                                     );
+        psU32 maskVal,                 /**< the mask value */ \
+        RETURNTYPE unexposedValue      /**< return value if x,y location is not in image. */ \
+                                                   );
+
+#define PIXEL_INTERPOLATE_FCNS(MODE) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_U8,psF64)  \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_U16,psF64) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_U32,psF64) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_U64,psF64) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_S8,psF64)  \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_S16,psF64) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_S32,psF64) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_S64,psF64) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_F32,psF64) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_F64,psF64) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_C32,psC64) \
+PIXEL_INTERPOLATE_FCN_PROTOTYPE(MODE##_C64,psC64)
+
 #ifndef SWIG
-p_psImagePixelInterpolateFcns(U8)
-p_psImagePixelInterpolateFcns(U16)
-p_psImagePixelInterpolateFcns(U32)
-p_psImagePixelInterpolateFcns(U64)
-p_psImagePixelInterpolateFcns(S8)
-p_psImagePixelInterpolateFcns(S16)
-p_psImagePixelInterpolateFcns(S32)
-p_psImagePixelInterpolateFcns(S64)
-p_psImagePixelInterpolateFcns(F32)
-p_psImagePixelInterpolateFcns(F64)
-p_psImagePixelInterpolateComplexFcns(C32)
-p_psImagePixelInterpolateComplexFcns(C64)
+PIXEL_INTERPOLATE_FCNS(FLAT)
+PIXEL_INTERPOLATE_FCNS(BILINEAR)
+PIXEL_INTERPOLATE_FCNS(BILINEAR_VARIANCE)
 #endif
 
+#undef PIXEL_INTERPOLATE_FCN_PROTOTYPE
+#undef PIXEL_INTERPOLATE_FCNS
+
 /// @}