Index: trunk/psLib/src/image/psImageManip.h =================================================================== --- trunk/psLib/src/image/psImageManip.h (revision 1263) +++ trunk/psLib/src/image/psImageManip.h (revision 1407) @@ -1,2 +1,3 @@ + /** @file psImageManip.h * @@ -10,13 +11,13 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-22 20:42:22 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-07 00:06:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ #ifndef PS_IMAGE_MANIP_H -#define PS_IMAGE_MANIP_H +# define PS_IMAGE_MANIP_H -#include "psImage.h" +# include "psImage.h" /// @addtogroup Image @@ -31,11 +32,10 @@ * @return int The number of clipped pixels */ -int psImageClip( - psImage* input, ///< the image to clip - psF64 min, ///< the minimum image value allowed - psF64 vmin, ///< the value pixels < min are set to - psF64 max, ///< the maximum image value allowed - psF64 vmax ///< the value pixels > max are set to -); +int psImageClip(psImage * input, // /< the image to clip + psF64 min, // /< the minimum image value allowed + psF64 vmin, // /< the value pixels < min are set to + psF64 max, // /< the maximum image value allowed + psF64 vmax // /< the value pixels > max are set to + ); /** Clip image values outside of a specified complex region @@ -48,11 +48,10 @@ * @return int The number of clipped pixels */ -int psImageClipComplexRegion( - psImage* input, ///< the image to clip - psC64 min, ///< the minimum image value allowed - psC64 vmin, ///< the value pixels < min are set to - psC64 max, ///< the maximum image value allowed - psC64 vmax ///< the value pixels > max are set to -); +int psImageClipComplexRegion(psImage * input, // /< the image to clip + psC64 min, // /< the minimum image value allowed + psC64 vmin, // /< the value pixels < min are set to + psC64 max, // /< the maximum image value allowed + psC64 vmax // /< the value pixels > max are set to + ); /** Clip NaN image pixels to given value. @@ -63,8 +62,7 @@ * @return int The number of clipped pixels */ -int psImageClipNaN( - psImage* input, ///< the image to clip - psF64 value ///< the value to set all NaN/Inf values to -); +int psImageClipNaN(psImage * input, // /< the image to clip + psF64 value // /< the value to set all NaN/Inf values to + ); /** Overlay subregion of image with another image @@ -79,11 +77,10 @@ * @return int 0 if success, non-zero if failed. */ -int psImageOverlaySection( - psImage* image, ///< target image - const psImage* overlay, ///< the overlay image - int col0, ///< the column to start overlay - int row0, ///< the row to start overlay - const char* op ///< the operation to perform for overlay -); +int psImageOverlaySection(psImage * image, // /< target image + const psImage * overlay, // /< the overlay image + int col0, // /< the column to start overlay + int row0, // /< the row to start overlay + const char *op // /< the operation to perform for overlay + ); /** Rebin image to new scale. @@ -97,34 +94,22 @@ * @return psImage new image formed by rebinning input image. */ -psImage* psImageRebin( - psImage* out, ///< an psImage to recycle. If NULL, a new image is created - const psImage* in, ///< input image - unsigned int scale, ///< the scale to rebin for each dimension - const psStats* stats ///< the statistic to perform when rebinning. Only one method should be set. -); +psImage *psImageRebin(psImage * out, // /< an psImage to recycle. If NULL, a new image is created + const psImage * in, // /< input image + unsigned int scale, // /< the scale to rebin for each dimension + const psStats * stats // /< the statistic to perform when rebinning. Only one + // method should be set. + ); -psImage* psImageResample( - psImage* out, ///< an psImage to recycle. If NULL, a new image is created - const psImage* in, ///< input image - int scale, - psImageInterpolateMode mode -); +psImage *psImageResample(psImage * out, // /< an psImage to recycle. If NULL, a new image is created + const psImage * in, // /< input image + int scale, psImageInterpolateMode mode); -psImage* psImageRotate( - psImage* out, ///< an psImage to recycle. If NULL, a new image is created - const psImage* in, ///< input image - float angle, - float unexposedValue, - psImageInterpolateMode mode -); +psImage *psImageRotate(psImage * out, // /< an psImage to recycle. If NULL, a new image is created + const psImage * in, // /< input image + float angle, float unexposedValue, psImageInterpolateMode mode); -psImage* psImageShift( - psImage* out, ///< an psImage to recycle. If NULL, a new image is created - const psImage* in, ///< input image - float dx, - float dy, - float unexposedValue, - psImageInterpolateMode mode -); +psImage *psImageShift(psImage * out, // /< an psImage to recycle. If NULL, a new image is created + const psImage * in, // /< input image + float dx, float dy, float unexposedValue, psImageInterpolateMode mode); /** Roll image by an integer number of pixels in either direction. @@ -136,11 +121,9 @@ * @return psImage* the rolled version of the input image. */ -psImage* psImageRoll( - psImage* out, ///< an psImage to recycle. If NULL, a new image is created - const psImage* in, ///< input image - int dx, ///< number of pixels to roll in the x-dimension - int dy ///< number of pixels to roll in the y-dimension -); +psImage *psImageRoll(psImage * out, // /< an psImage to recycle. If NULL, a new image is created + const psImage * in, // /< input image + int dx, // /< number of pixels to roll in the x-dimension + int dy // /< number of pixels to roll in the y-dimension + ); #endif -