Index: /trunk/archive/pslib/Makefile =================================================================== --- /trunk/archive/pslib/Makefile (revision 237) +++ /trunk/archive/pslib/Makefile (revision 238) @@ -1,3 +1,3 @@ -# $Id: Makefile,v 1.5 2004-03-13 01:17:57 rhl Exp $ +# $Id: Makefile,v 1.6 2004-03-13 03:38:26 eugene Exp $ SHELL = /bin/sh DIRS = src include @@ -26,4 +26,7 @@ (cd include; doxygen) +publish: + rsync -e ssh -auv ./ poiserver0:PSLib/ + clean: $(RM) *~ core* TAGS Index: /trunk/archive/pslib/include/psBitMask.h =================================================================== --- /trunk/archive/pslib/include/psBitMask.h (revision 237) +++ /trunk/archive/pslib/include/psBitMask.h (revision 238) @@ -1,4 +1,4 @@ -#if !defined (PS_BIT_MASK_H) -#define PS_BIT_MASK_H +# if !defined (PS_BIT_MASK_H) +# define PS_BIT_MASK_H /** A bitmask of arbitrary length. */ @@ -20,5 +20,5 @@ /** Set a bit mask */ psBitMask * -psSetBitMask(psBitMask *outMask, //!< Output bit mask or NULL +psBitMaskSet(psBitMask *outMask, //!< Output bit mask or NULL const psBitMask *myMask, //!< Input bit mask int bit //!< Bit to set @@ -27,21 +27,15 @@ /** Check a bit mask. Returns true or false */ int -psCheckBitMask(const psBitMask *checkMask, //!< Bit mask to check - int bit //!< Bit to check +psBitMaskTest(const psBitMask *checkMask, //!< Bit mask to check + int bit //!< Bit to check ); -/** OR two bit masks */ +/** apply the given operator to two bit masks */ psBitMask * -psOrBitMasks(psBitMask *outMask, //!< Output bit mask or NULL - const psBitMask *restrict inMask1, //!< Input bit mask 1 - const psBitMask *restrict inMask2 //!< Input bit mask 2 +psBitMaskOp(psBitMask *outMask, //!< Output bit mask or NULL + const psBitMask *restrict inMask1, //!< Input bit mask 1 + char *operator, ///< bit mask operator (AND, OR, XOR) + const psBitMask *restrict inMask2 //!< Input bit mask 2 ); -/** AND two bit masks */ -psBitMask * -psAndBitMasks(psBitMask *outMask, //!< Output bit mask or NULL - const psBitMask *restrict inMask1, //!< Input bit mask 1 - const psBitMask *restrict inMask2 //!< Input bit mask 2 - ); - -#endif +#endif Index: unk/archive/pslib/include/psComplexArrays.h =================================================================== --- /trunk/archive/pslib/include/psComplexArrays.h (revision 237) +++ (revision ) @@ -1,40 +1,0 @@ -#if !defined(PS_COMPLEX_ARRAYS_H) -#define PS_COMPLEX_ARRAYS_H - -#include "psStdArrays.h" - -/* Complex number arrays */ - -/** Multiplication of two complex number arrays. Purposely leave these NOT restrict-ed, so that the - * multiplication may be done in-place - */ -psComplexArray * -psComplexMultiply(psComplexArray *out, //!< Output array to be returned; may be NULL - const psComplexArray *complex1, //!< Input complex array 1 - const psComplexArray *complex2 //!< Input complex array 2 - ); - -/** Division of two complex number arrays. Purposely leave these NOT restrict-ed, so that the division - * may be done in-place - */ -psComplexArray * -psComplexDivide(psComplexArray *out, //!< Output array to be returned; may be NULL - const psComplexArray *complex1, //!< Input complex array 1 - const psComplexArray *complex2 //!< Input complex array 2 - ); - -/** Complex conjugates for a complex number array. Purposely leave these NOT restrict-ed, so that the - * operation may be done in-place - */ -psComplexArray * -psComplexConjugate(psComplexArray *out, //!< Output array to be returned; may be NULL - const psComplexArray *myComplexNumbers //!< Input complex number array - ); - -/** Moduli for a complex number array */ -psFloatArray * -psComplexModulus(const psComplex *restrict myComplexNumbers //!< Input complex number array - ); - - -#endif Index: /trunk/archive/pslib/include/psImages.h =================================================================== --- /trunk/archive/pslib/include/psImages.h (revision 237) +++ /trunk/archive/pslib/include/psImages.h (revision 238) @@ -272,6 +272,5 @@ # endif - -/** allowed operators for the different image functions +/* image overlay operations PS_OVERLAY_EQUALS = '=', PS_OVERLAY_ADD = '+', @@ -279,51 +278,3 @@ PS_OVERLAY_MULTIPLY = '*', PS_OVERLAY_DIVIDE = '/', - - PS_BINARY_ADD = '+', - PS_BINARY_SUBTRACT = '-', - PS_BINARY_MULTIPLY = '*', - PS_BINARY_DIVIDE = '/', - PS_BINARY_POWER = '^', - PS_BINARY_MIN, - PS_BINARY_MAX, - PS_BINARY_LESSTHAN = '<', - PS_BINARY_MORETHAN = '>', - PS_BINARY_ISEQUAL = '==', - PS_BINARY_NOTEQUAL = '!=', - PS_BINARY_LESSOREQ = '<=', - PS_BINARY_MOREOREQ = '>=', - PS_BINARY_AND = '&&', - PS_BINARY_OR = '||', - PS_BINARY_BITAND = '&', - PS_BINARY_BITOR = '|', - PS_BINARY_XOR = '~', - PS_BINARY_ATAN2 = 'atan2', - - PS_UNARY_IS = '=', - PS_UNARY_ABS, - PS_UNARY_INT, - PS_UNARY_EXP, - PS_UNARY_TEN, - PS_UNARY_LOG, - PS_UNARY_LN, - PS_UNARY_SQRT, - PS_UNARY_SIN, - PS_UNARY_COS, - PS_UNARY_TAN, - PS_UNARY_DSIN, - PS_UNARY_DCOS, - PS_UNARY_DTAN, - PS_UNARY_ASIN, - PS_UNARY_ACOS, - PS_UNARY_ATAN, - PS_UNARY_DASIN, - PS_UNARY_DACOS, - PS_UNARY_DATAN, - PS_UNARY_RND, - PS_UNARY_NOT, - PS_UNARY_NEGATE = '-', - PS_UNARY_INCR, - PS_UNARY_DECR, - PS_UNARY_ISINF, - PS_UNARY_ISNAN -**/ +*/ Index: /trunk/archive/pslib/include/psMath.h =================================================================== --- /trunk/archive/pslib/include/psMath.h (revision 237) +++ /trunk/archive/pslib/include/psMath.h (revision 238) @@ -69,2 +69,60 @@ #endif + +/** allowed operators for the different image functions + + PS_BINARY_ADD = "+", + PS_BINARY_SUBTRACT = "-", + PS_BINARY_MULTIPLY = "*", + PS_BINARY_DIVIDE = "/", + PS_BINARY_POWER = "^", + PS_BINARY_MIN, + PS_BINARY_MAX, + PS_BINARY_LESSTHAN = "<", + PS_BINARY_MORETHAN = ">", + PS_BINARY_ISEQUAL = "==", + PS_BINARY_NOTEQUAL = "!=", + PS_BINARY_LESSOREQ = "<=", + PS_BINARY_MOREOREQ = ">=", + PS_BINARY_AND = "&&", + PS_BINARY_OR = "||", + PS_BINARY_BITAND = "&", + PS_BINARY_BITOR = "|", + PS_BINARY_XOR = "~", + PS_BINARY_ATAN2 = "atan2", + PS_BINARY_MODULO = "%" + + -- all valid for complex types + + + PS_UNARY_IS = "=", + PS_UNARY_ABS, + PS_UNARY_INT, + PS_UNARY_EXP, + PS_UNARY_TEN, + PS_UNARY_LOG, + PS_UNARY_LN, + PS_UNARY_SQRT, + PS_UNARY_SIN, + PS_UNARY_COS, + PS_UNARY_TAN, + PS_UNARY_DSIN, + PS_UNARY_DCOS, + PS_UNARY_DTAN, + PS_UNARY_ASIN, + PS_UNARY_ACOS, + PS_UNARY_ATAN, + PS_UNARY_DASIN, + PS_UNARY_DACOS, + PS_UNARY_DATAN, + PS_UNARY_RND, + PS_UNARY_NOT, + PS_UNARY_NEGATE = "-", + PS_UNARY_INCR, + PS_UNARY_DECR, + PS_UNARY_ISINF, + PS_UNARY_ISNAN + PS_UNARY_MOD, // specific to complex data types + PS_UNARY_CONJ, // specific to complex data types + PS_UNARY_ARG, // specific to complex data types +**/