Index: trunk/doc/pslib/psLibSDRS.tex =================================================================== --- trunk/doc/pslib/psLibSDRS.tex (revision 4357) +++ trunk/doc/pslib/psLibSDRS.tex (revision 4362) @@ -1,3 +1,3 @@ -%%% $Id: psLibSDRS.tex,v 1.292 2005-06-23 01:10:24 price Exp $ +%%% $Id: psLibSDRS.tex,v 1.293 2005-06-23 02:10:51 price Exp $ \documentclass[panstarrs,spec]{panstarrs} @@ -1611,6 +1611,6 @@ \begin{datatype} typedef struct { - const unsigned long n; ///< size of array - const unsigned long nalloc; ///< allocated data block + const long n; ///< size of array + const long nalloc; ///< allocated data block psPtr *data; ///< pointer to data block void *lock; ///< Optional lock for thread safety @@ -1625,6 +1625,6 @@ % \begin{prototype} -psArray *psArrayAlloc(unsigned long nalloc); -psArray *psArrayRealloc(psArray *array, unsigned long nalloc); +psArray *psArrayAlloc(long nalloc); +psArray *psArrayRealloc(psArray *array, long nalloc); \end{prototype} % @@ -3915,5 +3915,5 @@ \begin{datatype} -typedef psU8 psMask; +typedef psU8 psMaskType; \end{datatype} @@ -3952,5 +3952,5 @@ const psVector *errors, const psVector *mask, - psMask maskVal + psMaskType maskVal ); \end{prototype} @@ -3981,5 +3981,5 @@ clipped statistics are modified according to the ADD; the robust median and quartiles are modified as specified in the ADD. The mask -must be of type \code{psMask}. +must be of type \code{psMaskType}. The \code{psStats} structure is defined with entries for each of the @@ -4096,5 +4096,5 @@ const psVector *errors, const psVector *mask, - psMask maskVal); + psMaskType maskVal); \end{prototype} The \code{values} vector may be of types \code{psU8, psU16, psF32, @@ -4408,5 +4408,5 @@ identical. -\code{paramMask} must be of type \code{psMask}, while \code{params} +\code{paramMask} must be of type \code{psMaskType}, while \code{params} must be of type \code{psF32}. The \code{func} function must be valid only for types \code{psF32}, \code{psF64}. @@ -4518,18 +4518,18 @@ psPolynomial1D *psVectorFitPolynomial1D(psPolynomial1D *poly, const psVector *mask, - psMask maskValue + psMaskType maskValue const psVector *f, const psVector *fErr const psVector *x); -psPolynomial2D *psVectorFitPolynomial2D(psPolynomial1D *poly, +psPolynomial2D *psVectorFitPolynomial2D(psPolynomial2D *poly, const psVector *mask, - psMask maskValue + psMaskType maskValue const psVector *f, const psVector *fErr const psVector *x, const psVector *y); -psPolynomial3D *psVectorFitPolynomial3D(psPolynomial1D *poly, +psPolynomial3D *psVectorFitPolynomial3D(psPolynomial3D *poly, const psVector *mask, - psMask maskValue + psMaskType maskValue const psVector *f, const psVector *fErr @@ -4537,7 +4537,7 @@ const psVector *y, const psVector *z); -psPolynomial4D *psVectorFitPolynomial4D(psPolynomial1D *poly, +psPolynomial4D *psVectorFitPolynomial4D(psPolynomial4D *poly, const psVector *mask, - psMask maskValue + psMaskType maskValue const psVector *f, const psVector *fErr @@ -4565,20 +4565,20 @@ psStats *stats, const psVector *mask, - psMask maskValue + psMaskType maskValue const psVector *f, const psVector *fErr const psVector *x); -psPolynomial2D *psVectorClipFitPolynomial2D(psPolynomial1D *poly, +psPolynomial2D *psVectorClipFitPolynomial2D(psPolynomial2D *poly, psStats *stats, const psVector *mask, - psMask maskValue + psMaskType maskValue const psVector *f, const psVector *fErr const psVector *x, const psVector *y); -psPolynomial3D *psVectorClipFitPolynomial3D(psPolynomial1D *poly, +psPolynomial3D *psVectorClipFitPolynomial3D(psPolynomial3D *poly, psStats *stats, const psVector *mask, - psMask maskValue + psMaskType maskValue const psVector *f, const psVector *fErr @@ -4586,8 +4586,8 @@ const psVector *y, const psVector *z); -psPolynomial4D *psVectorClipFitPolynomial4D(psPolynomial1D *poly, +psPolynomial4D *psVectorClipFitPolynomial4D(psPolynomial4D *poly, psStats *stats, const psVector *mask, - psMask maskValue + psMaskType maskValue const psVector *f, const psVector *fErr @@ -4696,5 +4696,5 @@ const psImage *input, const psImage *mask, - psMask maskVal, + psMaskType maskVal, psRegion region, psImageCutDirection direction, @@ -4731,5 +4731,5 @@ const psImage *input, const psImage *mask, - psMask maskVal, + psMaskType maskVal, psRegion region, unsigned int nSamples, @@ -4751,5 +4751,5 @@ const psImage *input, const psImage *mask, - psMask maskVal, + psMaskType maskVal, float x, float y, @@ -4802,5 +4802,5 @@ psImage *psImageRebin(psImage *out, const psImage *in, const psImage *mask, - psMask maskVal, + psMaskType maskVal, int scale, const psStats *stats); \end{prototype} @@ -4876,5 +4876,5 @@ const psImage *input, const psImage *inputMask, - psMask inputMaskVal, + psMaskType inputMaskVal, const psPlaneTransform *outToIn, psRegion region, @@ -4891,5 +4891,5 @@ If the \code{inputMask} is non-\code{NULL}, those pixels in the \code{inputMask} matching \code{inputMaskVal} are to be ignored in the -transformation. The \code{inputMask} must be of type \code{psMask}, and +transformation. The \code{inputMask} must be of type \code{psMaskType}, and of the same size as the \code{input}, otherwise the function shall generate an error and return \code{NULL}. The transformation @@ -4917,5 +4917,5 @@ const psImage *in, const psImage *mask, - psMask maskVal); + psMaskType maskVal); \end{prototype} Determine statistics for image (or subimage). The statistics to be @@ -4930,5 +4930,5 @@ const psImage *in, const psImage *mask, - psMask maskVal); + psMaskType maskVal); \end{prototype} Construct a histogram from an image (or subimage). The histogram to @@ -4958,5 +4958,5 @@ \begin{prototype} complex double psImagePixelInterpolate(const psImage *input, float x, float y, - const psImage *mask, psMask maskVal, + const psImage *mask, psMaskType maskVal, complex double unexposedValue, psImageInterpolateMode mode); \end{prototype} @@ -5056,14 +5056,14 @@ image set to the \code{growValue}. The function must be defined for the following types: \code{psU8}, \code{psU16}. Note that -\code{maskVal} and \code{growVal} are not of type \code{psMask}, but +\code{maskVal} and \code{growVal} are not of type \code{psMaskType}, but \code{psU16} so that they match the maximum required type for the \code{in} image. \begin{prototype} -psImage *psPixelsToMask(psImage *out, const psPixels *pixels, psRegion region, psMask maskVal); -psPixels *psPixelsFromMask(psPixels *out, const psImage *mask, psMask maskVal); -\end{prototype} - -\code{psPixelsToMask} shall return an image of type \code{psMask} with +psImage *psPixelsToMask(psImage *out, const psPixels *pixels, psRegion region, psMaskType maskVal); +psPixels *psPixelsFromMask(psPixels *out, const psImage *mask, psMaskType maskVal); +\end{prototype} + +\code{psPixelsToMask} shall return an image of type \code{psMaskType} with the \code{pixels} lying within the specified \code{region} set to the \code{maskVal}. The \code{out} image shall be modified if supplied, @@ -5083,6 +5083,6 @@ \begin{prototype} -void psImageMaskRegion(psImage *image, psRegion region, const char *op, psMask maskValue); -void psImageKeepRegion(psImage *image, psRegion region, const char *op, psMask maskValue); +void psImageMaskRegion(psImage *image, psRegion region, const char *op, psMaskType maskValue); +void psImageKeepRegion(psImage *image, psRegion region, const char *op, psMaskType maskValue); \end{prototype} @@ -5099,7 +5099,7 @@ \begin{prototype} void psImageMaskCircle(psImage *image, double x, double y, double radius, const char *op, - psMask maskValue); + psMaskType maskValue); void psImageKeepCircle(psImage *image, double x, double y, double radius, const char *op, - psMask maskValue); + psMaskType maskValue); \end{prototype}