IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 11697


Ignore:
Timestamp:
Feb 7, 2007, 4:42:46 PM (19 years ago)
Author:
jhoblitt
Message:

update authors
change psScalarAlloc() & psScalarCopy() into wrappers so file/lineo/func can be recorded in the memBlock

Location:
trunk/psLib/src/mathtypes
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/mathtypes/psScalar.c

    r10999 r11697  
    88 *  @author Ross Harman, MHPCC
    99 *
    10  *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2007-01-09 22:38:53 $
     10 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2007-02-08 02:42:46 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3131}
    3232
    33 psScalar* psScalarAlloc(double complex value, psElemType type)
     33psScalar* p_psScalarAlloc(const char *file,
     34                          unsigned int lineno,
     35                          const char *func,
     36                          double complex value,
     37                          psElemType type)
    3438{
    3539    psScalar* scalar = NULL;
    3640
    3741    // Create scalar
    38     scalar = (psScalar* ) psAlloc(sizeof(psScalar));
     42    scalar = (psScalar* ) p_psAlloc(file, lineno, func, sizeof(psScalar));
    3943    psMemSetDeallocator(scalar, (psFreeFunc)scalarFree);
    4044    scalar->type.dimen = PS_DIMEN_SCALAR;
    … …  
    98102
    99103
    100 psScalar* psScalarCopy(const psScalar *value)
     104psScalar* p_psScalarCopy(const char *file,
     105                       unsigned int lineno,
     106                       const char *func,
     107                       const psScalar *value)
    101108{
    102109    psElemType dataType;
    … …  
    112119    switch (dataType) {
    113120    case PS_TYPE_S8:
    114         newScalar =  psScalarAlloc(value->data.S8, dataType);
     121        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.S8, dataType);
    115122        break;
    116123    case PS_TYPE_U8:
    117         newScalar =  psScalarAlloc(value->data.U8, dataType);
     124        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.U8, dataType);
    118125        break;
    119126    case PS_TYPE_S16:
    120         newScalar =  psScalarAlloc(value->data.S16, dataType);
     127        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.S16, dataType);
    121128        break;
    122129    case PS_TYPE_U16:
    123         newScalar =  psScalarAlloc(value->data.U16, dataType);
     130        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.U16, dataType);
    124131        break;
    125132    case PS_TYPE_S32:
    126         newScalar =  psScalarAlloc(value->data.S32, dataType);
     133        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.S32, dataType);
    127134        break;
    128135    case PS_TYPE_U32:
    129         newScalar =  psScalarAlloc(value->data.U32, dataType);
     136        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.U32, dataType);
    130137        break;
    131138    case PS_TYPE_S64:
    132         newScalar =  psScalarAlloc(value->data.S64, dataType);
     139        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.S64, dataType);
    133140        break;
    134141    case PS_TYPE_U64:
    135         newScalar =  psScalarAlloc(value->data.U64, dataType);
     142        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.U64, dataType);
    136143        break;
    137144    case PS_TYPE_F32:
    138         newScalar =  psScalarAlloc(value->data.F32, dataType);
     145        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.F32, dataType);
    139146        break;
    140147    case PS_TYPE_F64:
    141         newScalar =  psScalarAlloc(value->data.F64, dataType);
     148        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.F64, dataType);
    142149        break;
    143150    case PS_TYPE_C32:
    144         newScalar =  psScalarAlloc(value->data.C32, dataType);
     151        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.C32, dataType);
    145152        break;
    146153    case PS_TYPE_C64:
    147         newScalar =  psScalarAlloc(value->data.C64, dataType);
     154        newScalar =  p_psScalarAlloc(file, lineno, func, value->data.C64, dataType);
    148155        break;
    149156    default:

  • trunk/psLib/src/mathtypes/psScalar.h

    r11248 r11697  
    66 *
    77 * @author Ross Harman, MHPCC
     8 * @author Joshua Hoblitt, University of Hawaii
    89 *
    9  * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
    10  * @date $Date: 2007-01-23 22:47:23 $
     10 * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
     11 * @date $Date: 2007-02-08 02:42:46 $
    1112 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1213 */
    … …  
    6061 * @return psScalar*   Pointer to a new psScalar.
    6162 */
     63#ifdef DOXYGEN
    6264psScalar* psScalarAlloc(
    63     double complex value,              ///< Data to be put into psScalar.
    64     psElemType type                    ///< Type of data to be held by psScalar.
     65    double complex value,               ///< Data to be put into psScalar
     66    psElemType type                     ///< Type of data to be held by psScalar
    6567);
     68#else // ifdef DOXYGEN
     69psScalar* p_psScalarAlloc(
     70    const char *file,                   ///< File of caller
     71    unsigned int lineno,                ///< Line number of caller
     72    const char *func,                   ///< Function name of caller
     73    double complex value,               ///< Data to be put into psScalar
     74    psElemType type                     ///< Type of data to be held by psScalar
     75);
     76#define psScalarAlloc(value, type) \
     77      p_psScalarAlloc(__FILE__, __LINE__, __func__, value, type)
     78#endif // ifdef DOXYGEN
    6679
    6780
    … …  
    8396 * @return psScalar*    A copy of the input scalar
    8497 */
     98#ifdef DOXYGEN
    8599psScalar* psScalarCopy(
    86     const psScalar *value              ///< Scalar to copy.
     100    const psScalar *value               ///< Scalar to copy
    87101);
     102#else // ifdef DOXYGEN
     103psScalar* p_psScalarCopy(
     104    const char *file,                   ///< File of caller
     105    unsigned int lineno,                ///< Line number of caller
     106    const char *func,                   ///< Function name of caller
     107    const psScalar *value               ///< Scalar to copy.
     108);
     109#define psScalarCopy(value) \
     110      p_psScalarCopy(__FILE__, __LINE__, __func__, value)
     111#endif // ifdef DOXYGEN
     112
    88113
    89114/// @}

  • trunk/psLib/src/mathtypes/psVector.c

    r11696 r11697  
    88*  @author Ross Harman, MHPCC
    99*  @author Robert DeSonia, MHPCC
     10*  @author Joshua Hoblitt, University of Hawaii
    1011*
    11 *  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2007-02-08 02:31:59 $
     12*  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2007-02-08 02:42:46 $
    1314*
    1415*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii

  • trunk/psLib/src/mathtypes/psVector.h

    r11696 r11697  
    88 * @author Robert DeSonia, MHPCC
    99 * @author Ross Harman, MHPCC
    10  *
    11  * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
    12  * @date $Date: 2007-02-08 02:31:59 $
     10 * @author Joshua Hoblitt, University of Hawaii
     11 *
     12 * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
     13 * @date $Date: 2007-02-08 02:42:46 $
    1314 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    1415 */
Note: See TracChangeset for help on using the changeset viewer.