Index: trunk/archive/pslib/include/psImages.h
===================================================================
--- trunk/archive/pslib/include/psImages.h	(revision 151)
+++ trunk/archive/pslib/include/psImages.h	(revision 157)
@@ -44,5 +44,5 @@
 /// Create an image of the specified size and type.
 psImage *
-psAllocImage (int nx,			///< image width 
+psImageAlloc (int nx,			///< image width 
 	      int ny,			///< image height 
 	      PS_IMAGE_DEPTH depth	///< image depth 
@@ -51,5 +51,5 @@
 /// Create a subimage of the specified area.
 psImage *
-psSubsetImage (psImage *image,		///< parent image 
+psImageSubset (psImage *image,		///< parent image 
 	       int nx,			///< subimage width (<= image.nx - x0)  
 	       int ny,			///< subimage width (<= image.ny - y0)  
@@ -60,15 +60,15 @@
 /// Destroy the specified image (destroy children if they exist).
 void 
-psFreeImage (psImage *image		///< free this image
+psImageFree (psImage *image		///< free this image
 );
 
 /// Destroy the children of the specified image.
 int 
-psFreeImageChildren (psImage *image	///< free children of this image
+psImageFreeChildren (psImage *image	///< free children of this image
 );
 
 /// Create a copy of the specified image.
 psImage *
-psCopyImage (psImage *output, 		///< target structure for output image data
+psImageCopy (psImage *output, 		///< target structure for output image data
 	     psImage *input		///< copy this image 
 );
@@ -77,5 +77,5 @@
 /// Extract pixels from rectlinear region to a vector.
 psFloatArray *
-psSliceImage (psImage *input, 		///< extract slice from this image
+psImageSlice (psImage *input, 		///< extract slice from this image
 	      int x, 			///< starting x coord of region to slice
 	      int y, 			///< starting y coord of region to slice
@@ -88,5 +88,5 @@
 /// Extract pixels along a line to a vector.
 psFloatArray *
-psCutImage (psImage *input, 		///< extract cut from this image
+psImageCut (psImage *input, 		///< extract cut from this image
 	    float xs, 			///< starting x coord of cut
 	    float ys, 			///< starting y coord of cut
@@ -99,5 +99,5 @@
 /// Extract radial annulii data to a vector.
 psFloatArray *
-psRadialCutImage (psImage *input, 	///< extract profile from this image
+psImageRadialCut (psImage *input, 	///< extract profile from this image
 		  float x, 		///< center x coord of annulii
 		  float y, 		///< center y coord of annulii
@@ -109,5 +109,5 @@
 /// Extract a 2-d contour from an image at the given threshold.
 psFloatArrayArray *
-psContourImage (psImage *input, 	///< create contour for this image
+psImageContour (psImage *input, 	///< create contour for this image
 		float threshold,	///< contour image at this threshold
 		int binning		///< bin image by this value for contour calculation
@@ -116,5 +116,5 @@
 /// Extract a 2-d contour from an image at the given threshold.
 psSpanArray *
-psContourImage (psImage *input, 	///< create contour for this image
+psImageContour (psImage *input, 	///< create contour for this image
 		float threshold		///<  image at this threshold
 );
@@ -123,5 +123,5 @@
 /// Rebin image to new scale.
 psImage *
-psRebinImage (psImage *input, 		///< rebin this image
+psImageRebin (psImage *input, 		///< rebin this image
 	      float scale, 		///< rebinning scale: doutput = scale*dinput
 	      enum statmode		///< statistic used in performing interpolation / summing
@@ -130,5 +130,5 @@
 /// Rotate image by given angle.
 psImage *
-psRotateImage (psImage *input, 		///< rotate this image
+psImageRotate (psImage *input, 		///< rotate this image
 	       float angle		///< rotate by this amount (degrees)
 );
@@ -137,5 +137,5 @@
 /// Drop edge pixels, and set newly exposed pixels to 'exposed'.
 psImage *
-psShiftImage (psImage *input, 		///< shift this image
+psImageShift (psImage *input, 		///< shift this image
 	      float dx, 		///< shift by this amount in x
 	      float dy, 		///< shift by this amount in y
@@ -146,5 +146,5 @@
 /// Edge pixels wrap to the other side (no values are lost).
 psImage *
-psRollImage (psImage *input, 		///< roll this image
+psImageRoll (psImage *input, 		///< roll this image
 	     int dx, 			///< roll this amount in x
 	     int dy			///< roll this amount in y
@@ -155,9 +155,9 @@
 /// How to represent the output values?
 void
-psStatImage (psImage *input, enum statmode);
+psImageGetStats (psImage *input, enum statmode);
 
 /// Construct a histogram from an image (or subimage).
 psHistogram *
-psHistogramImage (psHistogram,		///< input histogram description & target
+psImageHistogram (psHistogram,		///< input histogram description & target
 		  psImage *input,	///< determine histogram of this image
 );
@@ -165,5 +165,5 @@
 /// Fit a 2-D polynomial surface to an image.
 psFloatArrayArray *
-psFitPolynomialImage (psImage *input, 	///< image to fit
+psImageFitPolynomial (psImage *input, 	///< image to fit
 		      int xorder	///< order of polynomial in x-dir
 		      int yorder	///< order of polynomial in y-dir
@@ -173,5 +173,5 @@
 /// Read an image or subimage from a named file.
 psImage *
-psReadImageSection (psImage *output, 	///< place data in this structure for output 
+psImageReadSection (psImage *output, 	///< place data in this structure for output 
 		    int x, 		///< starting x coord of region
 		    int y, 		///< starting y coord of region
@@ -185,5 +185,5 @@
 /// Read an image or subimage from file descriptor.
 psImage *
-psFReadImageSection (psImage *output,	///< place data in this structure for output 
+psImageFReadSection (psImage *output,	///< place data in this structure for output 
 		     int x,		///< starting x coord of region		   
 		     int y,		///< starting y coord of region		   
@@ -197,5 +197,5 @@
 /// Write an image section to named file (which may exist).
 psImage *
-psWriteImageSection (psImage *input,    ///< image to write out
+psImageWriteSection (psImage *input,    ///< image to write out
 		     int x, 		///< starting x coord of region		   
 		     int y, 		///< starting y coord of region		   
@@ -207,5 +207,5 @@
 /// Write an image section to named file (which may exist).
 psImage *
-psFWriteImageSection (psImage *input,	///< image to write out
+psImageFWriteSection (psImage *input,	///< image to write out
 		      int x, 		///< starting x coord of region		   
 		      int y, 		///< starting y coord of region		   
@@ -217,5 +217,5 @@
 /// Read only header from image file.
 psMetadata *
-psReadImageHeader (psMetadata *output, 	///< read data to this structure
+psImageReadHeader (psMetadata *output, 	///< read data to this structure
 		   char *extname, 	///< MEF extension name ("PHU" for primary header)
 		   char *filename	///< file to read from
@@ -224,5 +224,5 @@
 /// Read only header from image file descriptor.
 psMetadata *
-psReadImageHeader (psMetadata *output, 	///< read data to this structure
+psImageFReadHeader (psMetadata *output, 	///< read data to this structure
 		   char *extname, 	///< MEF extension name ("PHU" for primary header)
 		   FILE *f		///< file descriptor to read from
@@ -232,5 +232,5 @@
 /// Perform an FFT on the image.
 psImage *
-psFFTImage (psImage *input, 		///< image to FFT
+psImageFFT (psImage *input, 		///< image to FFT
 	    enum direction		///< FFT direction 
 );
@@ -239,5 +239,5 @@
 /// Clip image values outside of range to given values.
 int
-psClipImage (psImage *input, 		///< clip this image
+psImageClip (psImage *input, 		///< clip this image
 	     float min, 		///< clip pixels with values < min
 	     float vmin, 		///< set min-clipped pixels to vmin
@@ -248,5 +248,5 @@
 /// Clip NaN image pixels to given value.
 int
-psClipNaNImage (psImage *input, 	///< clip this image
+psImageClipNaN (psImage *input, 	///< clip this image
 		float value		///< set nan pixels to this value
 );
@@ -270,5 +270,5 @@
 /// Overlay subregion of image with another image.
 int 
-psOverlayImage (psImage *image,		///< input image 
+psImageOverlaySection (psImage *image,		///< input image 
 		psImage *overlay,	///< image to overlay 
 		int x0,			///< x offset of overlay subimage