IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 238


Ignore:
Timestamp:
Mar 12, 2004, 5:38:26 PM (22 years ago)
Author:
eugene
Message:

moved complex array functions inside psMath.h BinaryOp & UnaryOp
simplified BitMask operation function set

Location:
trunk/archive/pslib
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/archive/pslib/Makefile

    r229 r238  
    1 # $Id: Makefile,v 1.5 2004-03-13 01:17:57 rhl Exp $
     1# $Id: Makefile,v 1.6 2004-03-13 03:38:26 eugene Exp $
    22SHELL = /bin/sh
    33DIRS = src include
    … …  
    2626        (cd include; doxygen)
    2727
     28publish:
     29        rsync -e ssh -auv ./ poiserver0:PSLib/
     30
    2831clean:
    2932        $(RM) *~ core* TAGS

  • trunk/archive/pslib/include/psBitMask.h

    r213 r238  
    1 #if !defined (PS_BIT_MASK_H)
    2 #define PS_BIT_MASK_H
     1# if !defined (PS_BIT_MASK_H)
     2# define PS_BIT_MASK_H
    33
    44/** A bitmask of arbitrary length. */
    … …  
    2020/** Set a bit mask */
    2121psBitMask *
    22 psSetBitMask(psBitMask *outMask,        //!< Output bit mask or NULL
     22psBitMaskSet(psBitMask *outMask,        //!< Output bit mask or NULL
    2323             const psBitMask *myMask,   //!< Input bit mask
    2424             int bit                    //!< Bit to set
    … …  
    2727/** Check a bit mask.  Returns true or false */
    2828int
    29 psCheckBitMask(const psBitMask *checkMask, //!< Bit mask to check
    30                int bit                  //!< Bit to check
     29psBitMaskTest(const psBitMask *checkMask, //!< Bit mask to check
     30              int bit                   //!< Bit to check
    3131    );
    3232
    33 /** OR two bit masks */
     33/** apply the given operator to two bit masks */
    3434psBitMask *
    35 psOrBitMasks(psBitMask *outMask,        //!< Output bit mask or NULL
    36              const psBitMask *restrict inMask1, //!< Input bit mask 1
    37              const psBitMask *restrict inMask2 //!< Input bit mask 2
     35psBitMaskOp(psBitMask *outMask, //!< Output bit mask or NULL
     36            const psBitMask *restrict inMask1,  //!< Input bit mask 1
     37            char *operator,             ///< bit mask operator (AND, OR, XOR)
     38            const psBitMask *restrict inMask2 //!< Input bit mask 2
    3839    );
    3940
    40 /** AND two bit masks */
    41 psBitMask *
    42 psAndBitMasks(psBitMask *outMask,       //!< Output bit mask or NULL
    43              const psBitMask *restrict inMask1, //!< Input bit mask 1
    44              const psBitMask *restrict inMask2 //!< Input bit mask 2
    45     );
    46 
    47 #endif
     41#endif

  • trunk/archive/pslib/include/psImages.h

    r237 r238  
    272272
    273273# endif
    274 
    275 /** allowed operators for the different image functions
     274/* image overlay operations
    276275    PS_OVERLAY_EQUALS   = '=',
    277276    PS_OVERLAY_ADD      = '+',
    … …  
    279278    PS_OVERLAY_MULTIPLY = '*',
    280279    PS_OVERLAY_DIVIDE   = '/',
    281 
    282     PS_BINARY_ADD        = '+',
    283     PS_BINARY_SUBTRACT   = '-',
    284     PS_BINARY_MULTIPLY   = '*',
    285     PS_BINARY_DIVIDE     = '/',
    286     PS_BINARY_POWER      = '^',
    287     PS_BINARY_MIN,
    288     PS_BINARY_MAX,
    289     PS_BINARY_LESSTHAN   = '<',
    290     PS_BINARY_MORETHAN   = '>',
    291     PS_BINARY_ISEQUAL    = '==',
    292     PS_BINARY_NOTEQUAL   = '!=',
    293     PS_BINARY_LESSOREQ   = '<=',
    294     PS_BINARY_MOREOREQ   = '>=',
    295     PS_BINARY_AND        = '&&',
    296     PS_BINARY_OR         = '||',
    297     PS_BINARY_BITAND     = '&',
    298     PS_BINARY_BITOR      = '|',
    299     PS_BINARY_XOR        = '~',
    300     PS_BINARY_ATAN2      = 'atan2',
    301 
    302     PS_UNARY_IS     = '=',
    303     PS_UNARY_ABS,
    304     PS_UNARY_INT,
    305     PS_UNARY_EXP,
    306     PS_UNARY_TEN,
    307     PS_UNARY_LOG,
    308     PS_UNARY_LN,
    309     PS_UNARY_SQRT,
    310     PS_UNARY_SIN,
    311     PS_UNARY_COS,
    312     PS_UNARY_TAN,
    313     PS_UNARY_DSIN,
    314     PS_UNARY_DCOS,
    315     PS_UNARY_DTAN,
    316     PS_UNARY_ASIN,
    317     PS_UNARY_ACOS,
    318     PS_UNARY_ATAN,
    319     PS_UNARY_DASIN,
    320     PS_UNARY_DACOS,
    321     PS_UNARY_DATAN,
    322     PS_UNARY_RND,
    323     PS_UNARY_NOT,
    324     PS_UNARY_NEGATE = '-',
    325     PS_UNARY_INCR,
    326     PS_UNARY_DECR,
    327     PS_UNARY_ISINF,
    328     PS_UNARY_ISNAN
    329 **/
     280*/

  • trunk/archive/pslib/include/psMath.h

    r218 r238  
    6969
    7070#endif
     71
     72/** allowed operators for the different image functions
     73
     74    PS_BINARY_ADD        = "+",
     75    PS_BINARY_SUBTRACT   = "-",
     76    PS_BINARY_MULTIPLY   = "*",
     77    PS_BINARY_DIVIDE     = "/",
     78    PS_BINARY_POWER      = "^",
     79    PS_BINARY_MIN,
     80    PS_BINARY_MAX,
     81    PS_BINARY_LESSTHAN   = "<",
     82    PS_BINARY_MORETHAN   = ">",
     83    PS_BINARY_ISEQUAL    = "==",
     84    PS_BINARY_NOTEQUAL   = "!=",
     85    PS_BINARY_LESSOREQ   = "<=",
     86    PS_BINARY_MOREOREQ   = ">=",
     87    PS_BINARY_AND        = "&&",
     88    PS_BINARY_OR         = "||",
     89    PS_BINARY_BITAND     = "&",
     90    PS_BINARY_BITOR      = "|",
     91    PS_BINARY_XOR        = "~",
     92    PS_BINARY_ATAN2      = "atan2",
     93    PS_BINARY_MODULO     = "%"
     94
     95    -- all valid for complex types
     96
     97
     98    PS_UNARY_IS     = "=",
     99    PS_UNARY_ABS,
     100    PS_UNARY_INT,
     101    PS_UNARY_EXP,
     102    PS_UNARY_TEN,
     103    PS_UNARY_LOG,
     104    PS_UNARY_LN,
     105    PS_UNARY_SQRT,
     106    PS_UNARY_SIN,
     107    PS_UNARY_COS,
     108    PS_UNARY_TAN,
     109    PS_UNARY_DSIN,
     110    PS_UNARY_DCOS,
     111    PS_UNARY_DTAN,
     112    PS_UNARY_ASIN,
     113    PS_UNARY_ACOS,
     114    PS_UNARY_ATAN,
     115    PS_UNARY_DASIN,
     116    PS_UNARY_DACOS,
     117    PS_UNARY_DATAN,
     118    PS_UNARY_RND,
     119    PS_UNARY_NOT,
     120    PS_UNARY_NEGATE = "-",
     121    PS_UNARY_INCR,
     122    PS_UNARY_DECR,
     123    PS_UNARY_ISINF,
     124    PS_UNARY_ISNAN
     125    PS_UNARY_MOD,   // specific to complex data types
     126    PS_UNARY_CONJ,  // specific to complex data types
     127    PS_UNARY_ARG,   // specific to complex data types
     128**/
Note: See TracChangeset for help on using the changeset viewer.