Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 710) +++ /trunk/psLib/src/image/psImage.h (revision 711) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-15 02:10:27 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-05-17 20:59:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -44,13 +44,16 @@ union { - uint8_t **ui8; ///< unsigned 8-bit integer data. - uint16_t **ui16; ///< unsigned 16-bit integer data. - uint32_t **ui32; ///< unsigned 32-bit integer data. - int8_t **i8; ///< signed 8-bit integer data. - int16_t **i16; ///< signed 16-bit integer data. - int32_t **i32; ///< signed 32-bit integer data. - float **f32; ///< single-precision float data. - double **f64; ///< double-precision float data. - complex float **c32; ///< single-precision complex data. + psU8 **u8; ///< unsigned 8-bit integer data. + psU16 **u16; ///< unsigned 16-bit integer data. + psU32 **u32; ///< unsigned 32-bit integer data. + psU32 **u64; ///< unsigned 64-bit integer data. + psS8 **s8; ///< signed 8-bit integer data. + psS16 **s16; ///< signed 16-bit integer data. + psS32 **s32; ///< signed 32-bit integer data. + psS32 **s64; ///< signed 64-bit integer data. + psF32 **f32; ///< single-precision float data. + psF64 **f64; ///< double-precision float data. + psC32 **c32; ///< single-precision complex data. + psC32 **c64; ///< double-precision complex data. void **v; ///< void pointers to data } data; ///< Union for data types. Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 710) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 711) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-15 02:10:27 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-05-17 20:59:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -44,13 +44,16 @@ union { - uint8_t **ui8; ///< unsigned 8-bit integer data. - uint16_t **ui16; ///< unsigned 16-bit integer data. - uint32_t **ui32; ///< unsigned 32-bit integer data. - int8_t **i8; ///< signed 8-bit integer data. - int16_t **i16; ///< signed 16-bit integer data. - int32_t **i32; ///< signed 32-bit integer data. - float **f32; ///< single-precision float data. - double **f64; ///< double-precision float data. - complex float **c32; ///< single-precision complex data. + psU8 **u8; ///< unsigned 8-bit integer data. + psU16 **u16; ///< unsigned 16-bit integer data. + psU32 **u32; ///< unsigned 32-bit integer data. + psU32 **u64; ///< unsigned 64-bit integer data. + psS8 **s8; ///< signed 8-bit integer data. + psS16 **s16; ///< signed 16-bit integer data. + psS32 **s32; ///< signed 32-bit integer data. + psS32 **s64; ///< signed 64-bit integer data. + psF32 **f32; ///< single-precision float data. + psF64 **f64; ///< double-precision float data. + psC32 **c32; ///< single-precision complex data. + psC32 **c64; ///< double-precision complex data. void **v; ///< void pointers to data } data; ///< Union for data types. Index: /trunk/psLib/src/sys/psType.h =================================================================== --- /trunk/psLib/src/sys/psType.h (revision 710) +++ /trunk/psLib/src/sys/psType.h (revision 711) @@ -19,6 +19,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-15 00:14:56 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-05-17 20:59:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -41,18 +41,32 @@ * */ + +typedef uint8_t psU8; ///< 8-bit unsigned int +typedef uint16_t psU16; ///< 16-bit unsigned int +typedef uint32_t psU32; ///< 32-bit unsigned int +typedef uint64_t psU64; ///< 64-bit unsigned int +typedef int8_t psS8; ///< 8-bit signed int +typedef int16_t psS16; ///< 16-bit signed int +typedef int32_t psS32; ///< 32-bit signed int +typedef int64_t psS64; ///< 64-bit signed int +typedef float psF32; ///< 32-bit floating point +typedef double psF64; ///< 64-bit floating point +typedef complex float psC32; ///< complex with 32-bit floating point Real and Imagary numbers +typedef complex double psC64; ///< complex with 64-bit floating point Real and Imagary numbers + typedef enum { - PS_TYPE_INT8 = 0x101, ///< Character. - PS_TYPE_INT16 = 0x102, ///< Short integer. - PS_TYPE_INT32 = 0x104, ///< Integer. - PS_TYPE_INT64 = 0x108, ///< Long integer. - PS_TYPE_UINT8 = 0x301, ///< Unsigned character. - PS_TYPE_UINT16 = 0x302, ///< Unsigned short integer. - PS_TYPE_UINT32 = 0x304, ///< Unsigned integer. - PS_TYPE_UINT64 = 0x308, ///< Unsigned long integer. - PS_TYPE_FLOAT = 0x404, ///< Single-precision Floating point. - PS_TYPE_DOUBLE = 0x408, ///< Double-precision floating point. - PS_TYPE_COMPLEX_FLOAT = 0x808, ///< Complex numbers consisting of single-precision floating point. - PS_TYPE_COMPLEX_DOUBLE = 0x810, ///< Complex numbers consisting of double-precision floating point. - PS_TYPE_PTR = 0x00, ///< Something else that's not supported for arithmetic.} + PS_TYPE_INT8 = 0x101, ///< Character. + PS_TYPE_INT16 = 0x102, ///< Short integer. + PS_TYPE_INT32 = 0x104, ///< Integer. + PS_TYPE_INT64 = 0x108, ///< Long integer. + PS_TYPE_UINT8 = 0x301, ///< Unsigned character. + PS_TYPE_UINT16 = 0x302, ///< Unsigned short integer. + PS_TYPE_UINT32 = 0x304, ///< Unsigned integer. + PS_TYPE_UINT64 = 0x308, ///< Unsigned long integer. + PS_TYPE_FLOAT = 0x404, ///< Single-precision Floating point. + PS_TYPE_DOUBLE = 0x408, ///< Double-precision floating point. + PS_TYPE_COMPLEX_FLOAT = 0x808, ///< Complex numbers consisting of single-precision floating point. + PS_TYPE_COMPLEX_DOUBLE = 0x810, ///< Complex numbers consisting of double-precision floating point. + PS_TYPE_PTR = 0x000, ///< Something else that's not supported for arithmetic. } psElemType; @@ -61,9 +75,9 @@ #define IS_PSELEMTYPE_REAL(x) (x & 0x400 == 0x400) #define IS_PSELEMTYPE_COMPLEX(x) (x & 0x800 == 0x800) -#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) : (x & 0xFF) ) +#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) :(x & 0xFF) ) /** Dimensions of a data type. * - * The dimensions of containers used by psLib are defined within this enum. This enum is used by the psType + * The dimensions of containers used by psLib are defined within this enum. This enum is used by the psType struct. * */ Index: /trunk/psLib/src/sysUtils/psType.h =================================================================== --- /trunk/psLib/src/sysUtils/psType.h (revision 710) +++ /trunk/psLib/src/sysUtils/psType.h (revision 711) @@ -19,6 +19,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-15 00:14:56 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-05-17 20:59:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -41,18 +41,32 @@ * */ + +typedef uint8_t psU8; ///< 8-bit unsigned int +typedef uint16_t psU16; ///< 16-bit unsigned int +typedef uint32_t psU32; ///< 32-bit unsigned int +typedef uint64_t psU64; ///< 64-bit unsigned int +typedef int8_t psS8; ///< 8-bit signed int +typedef int16_t psS16; ///< 16-bit signed int +typedef int32_t psS32; ///< 32-bit signed int +typedef int64_t psS64; ///< 64-bit signed int +typedef float psF32; ///< 32-bit floating point +typedef double psF64; ///< 64-bit floating point +typedef complex float psC32; ///< complex with 32-bit floating point Real and Imagary numbers +typedef complex double psC64; ///< complex with 64-bit floating point Real and Imagary numbers + typedef enum { - PS_TYPE_INT8 = 0x101, ///< Character. - PS_TYPE_INT16 = 0x102, ///< Short integer. - PS_TYPE_INT32 = 0x104, ///< Integer. - PS_TYPE_INT64 = 0x108, ///< Long integer. - PS_TYPE_UINT8 = 0x301, ///< Unsigned character. - PS_TYPE_UINT16 = 0x302, ///< Unsigned short integer. - PS_TYPE_UINT32 = 0x304, ///< Unsigned integer. - PS_TYPE_UINT64 = 0x308, ///< Unsigned long integer. - PS_TYPE_FLOAT = 0x404, ///< Single-precision Floating point. - PS_TYPE_DOUBLE = 0x408, ///< Double-precision floating point. - PS_TYPE_COMPLEX_FLOAT = 0x808, ///< Complex numbers consisting of single-precision floating point. - PS_TYPE_COMPLEX_DOUBLE = 0x810, ///< Complex numbers consisting of double-precision floating point. - PS_TYPE_PTR = 0x00, ///< Something else that's not supported for arithmetic.} + PS_TYPE_INT8 = 0x101, ///< Character. + PS_TYPE_INT16 = 0x102, ///< Short integer. + PS_TYPE_INT32 = 0x104, ///< Integer. + PS_TYPE_INT64 = 0x108, ///< Long integer. + PS_TYPE_UINT8 = 0x301, ///< Unsigned character. + PS_TYPE_UINT16 = 0x302, ///< Unsigned short integer. + PS_TYPE_UINT32 = 0x304, ///< Unsigned integer. + PS_TYPE_UINT64 = 0x308, ///< Unsigned long integer. + PS_TYPE_FLOAT = 0x404, ///< Single-precision Floating point. + PS_TYPE_DOUBLE = 0x408, ///< Double-precision floating point. + PS_TYPE_COMPLEX_FLOAT = 0x808, ///< Complex numbers consisting of single-precision floating point. + PS_TYPE_COMPLEX_DOUBLE = 0x810, ///< Complex numbers consisting of double-precision floating point. + PS_TYPE_PTR = 0x000, ///< Something else that's not supported for arithmetic. } psElemType; @@ -61,9 +75,9 @@ #define IS_PSELEMTYPE_REAL(x) (x & 0x400 == 0x400) #define IS_PSELEMTYPE_COMPLEX(x) (x & 0x800 == 0x800) -#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) : (x & 0xFF) ) +#define PSELEMTYPE_SIZEOF(x) ( (x==PS_TYPE_PTR) ? sizeof(void*) :(x & 0xFF) ) /** Dimensions of a data type. * - * The dimensions of containers used by psLib are defined within this enum. This enum is used by the psType + * The dimensions of containers used by psLib are defined within this enum. This enum is used by the psType struct. * */