Index: /trunk/archive/pslib/include/psImage.h =================================================================== --- /trunk/archive/pslib/include/psImage.h (revision 679) +++ /trunk/archive/pslib/include/psImage.h (revision 680) @@ -10,17 +10,19 @@ typedef struct psImage { psType type; ///< image data type and dimension - const int nx, ny; ///< size of image + const int ncols, nrows; ///< size of image const int x0, y0; ///< data region relative to parent union { - float **rows; ///< Pointers to floating-point data (default) - short int **rows_si; ///< Pointers to short-integer data - int **rows_i; ///< Pointers to integer data - long int **rows_li; ///< Pointers to long-integer data - unsigned short int **rows_usi; ///< Pointers to unsigned-short-integer data - unsigned int **rows_ui; ///< Pointers to unsigned-integer data - unsigned long int **rows_uli; ///< Pointers to unsigned-long-integer data - float **rows_f; ///< Pointers to floating-point data - double **rows_d; ///< Pointers to double-precision data - complex float **rows_complex; ///< Pointers to complex floating-point data + psF32 **rows; ///< Pointers to floating-point data (default) + psS8 **rows_S8; ///< Pointers to char data + psS16 **rows_S16; ///< Pointers to short-integer data + psS32 **rows_S32; ///< Pointers to integer data + psS64 **rows_S64; ///< Pointers to long-integer data + psU8 **rows_U8; ///< Pointers to unsigned-char data + psU16 **rows_U16; ///< Pointers to unsigned-short-integer data + psU32 **rows_U32; ///< Pointers to unsigned-integer data + psU64 **rows_U64; ///< Pointers to unsigned-long-integer data + psF32 **rows_F32; ///< Pointers to floating-point data + psF64 **rows_F64; ///< Pointers to double-precision data + psC32 **rows_C32; ///< Pointers to complex floating-point data } rows; const struct psImage *parent; ///< parent, if a subimage @@ -38,6 +40,6 @@ /// Create an image of the specified size and type. psImage * -psImageAlloc (int nx, ///< image width - int ny, ///< image height +psImageAlloc (int width, ///< image width (ncols) + int height, ///< image height (nrows) psElemType type) ///< image data type ; @@ -46,8 +48,8 @@ psImage * psImageSubset(const psImage *image, ///< parent image - int nx, ///< subimage width (<= image.nx - x0) - int ny, ///< subimage width (<= image.ny - y0) - int x0, ///< subimage x-offset (0 <= x0 < nx) - int y0) ///< subimage y-offset (0 <= y0 < ny) + int width, ///< subimage width (<= image.ncols - col0) + int height, ///< subimage height (<= image.nrows - row0) + int x0, ///< subimage starting col (0 <= col0 < ncols) + int y0) ///< subimage starting row (0 <= row0 < nrows) ; @@ -77,6 +79,6 @@ int x, ///< starting x coord of region to slice int y, ///< starting y coord of region to slice - int nx, ///< width of region in x - int ny, ///< width of region in y + int nx, ///< length of region in x + int ny, ///< length of region in y int direction, ///< direction of vector along slice const psStats *stats) ///< defines statistics used to find output values Index: /trunk/archive/pslib/include/psType.h =================================================================== --- /trunk/archive/pslib/include/psType.h (revision 679) +++ /trunk/archive/pslib/include/psType.h (revision 680) @@ -9,15 +9,15 @@ /** Types of the elements of vectors, images, etc. */ typedef enum { - PS_TYPE_CHAR, ///< Character - PS_TYPE_SHORT, ///< Short integer - PS_TYPE_INT, ///< Integer - PS_TYPE_LONG, ///< Long integer - PS_TYPE_UCHAR, ///< Unsigned character - PS_TYPE_USHORT, ///< Unsigned short integer - PS_TYPE_UINT, ///< Unsigned integer - PS_TYPE_ULONG, ///< Unsigned long integer - PS_TYPE_FLOAT, ///< Floating point - PS_TYPE_DOUBLE, ///< Double-precision floating point - PS_TYPE_COMPLEX, ///< Complex numbers consisting of floating point + PS_TYPE_S8, ///< Character + PS_TYPE_S16, ///< Short integer + PS_TYPE_S32, ///< Integer + PS_TYPE_S64, ///< Long integer + PS_TYPE_U8, ///< Unsigned character + PS_TYPE_U16, ///< Unsigned short integer + PS_TYPE_U32, ///< Unsigned integer + PS_TYPE_U64, ///< Unsigned long integer + PS_TYPE_F32, ///< Floating point + PS_TYPE_F64, ///< Double-precision floating point + PS_TYPE_C32, ///< Complex numbers consisting of floating point PS_TYPE_OTHER, ///< Something else that's not supported for arithmetic } psElemType; @@ -44,10 +44,7 @@ * guaranteed, or for use in macros to preserve the standard naming conventions. */ -typedef float psFloat; ///< BITPIX -32 (float) typedef float psF32; ///< BITPIX -32 (float) -typedef double psDouble; typedef double psF64; ///< BITPIX -64 (double) - -typedef complex float psComplex; +typedef complex float psC32; typedef int8_t psS8; @@ -55,16 +52,8 @@ typedef int32_t psS32; typedef int64_t psS64; -typedef int8_t psChar; -typedef int16_t psShort; -typedef int32_t psInt; -typedef int64_t psLong; -typedef uint8_t psU8; ///< BITPIX 8 -typedef uint16_t psU16; ///< BITPIX 16 -typedef uint32_t psU32; ///< BITPIX 32 +typedef uint8_t psU8; ///< equivalent to BITPIX 8 +typedef uint16_t psU16; ///< equivalent to BITPIX 16 +typedef uint32_t psU32; ///< equivalent to BITPIX 32 typedef uint64_t psU64; -typedef uint8_t psUchar; ///< BITPIX 8 -typedef uint16_t psUshort; ///< BITPIX 16 -typedef uint32_t psUint; ///< BITPIX 32 -typedef uint64_t psUlong; Index: /trunk/archive/pslib/include/psVector.h =================================================================== --- /trunk/archive/pslib/include/psVector.h (revision 679) +++ /trunk/archive/pslib/include/psVector.h (revision 680) @@ -13,14 +13,16 @@ const int nalloc; ///< data region relative to parent union { - float *arr; ///< Pointers to floating-point data (default) - short int *arr_si; ///< Pointers to short-integer data - int *arr_i; ///< Pointers to integer data - long int *arr_li; ///< Pointers to long-integer data - unsigned short int *arr_usi; ///< Pointers to unsigned-short-integer data - unsigned int *arr_ui; ///< Pointers to unsigned-integer data - unsigned long int *arr_uli; ///< Pointers to unsigned-long-integer data - float *arr_f; ///< Pointers to floating-point data - double *arr_d; ///< Pointers to double-precision data - complex float *arr_complex; ///< Pointers to complex floating-point data + psF32 *arr; ///< Pointers to floating-point data (default) + psS8 *arr_S8; ///< Pointers to short-integer data + psS16 *arr_S16; ///< Pointers to short-integer data + psS32 *arr_S32; ///< Pointers to integer data + psS64 *arr_S64; ///< Pointers to long-integer data + psU8 *arr_U18; ///< Pointers to unsigned-short-integer data + psU16 *arr_U16; ///< Pointers to unsigned-short-integer data + psU32 *arr_U32; ///< Pointers to unsigned-integer data + psU64 *arr_U64; ///< Pointers to unsigned-long-integer data + psF32 *arr_F32; ///< Pointers to floating-point data + psF64 *arr_F64; ///< Pointers to double-precision data + psF32 *arr_C32; ///< Pointers to complex floating-point data void **arr_v; } arr; @@ -37,12 +39,12 @@ psVector * psVectorAlloc (int nalloc, ///< vector length - psElemType type ///< vector data type - ); + psElemType type) ///< vector data type +; /// Extend a vector psVector * -psVectorRealloc (int nalloc, ///< vector length - psElemType type ///< vector data type - ); +psVectorRealloc (const psVector *vector, ///< vector to reallocate + int nalloc) ///< required length +; /// Create a subvector of the specified range. @@ -50,6 +52,6 @@ psVectorSubset(const psVector *vector, ///< parent vector int start, ///< subvector range start - int end ///< subvector range end - ); + int end) ///< subvector range end +; /// Destroy the specified vector