IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 22, 2005, 11:52:49 AM (21 years ago)
Author:
desonia
Message:

* empty log message *

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

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/dataManip/psConstants.h

    r3313 r3476  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-02-24 00:19:51 $
     8 *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2005-03-22 21:52:49 $
    1010 *
    1111 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    191191#define PS_VECTOR_CHECK_NULL(NAME, RVAL) PS_VECTOR_CHECK_NULL_GENERAL(NAME, return RVAL)
    192192#define PS_VECTOR_CHECK_NULL_GENERAL(NAME, CLEANUP) \
    193 if (NAME == NULL || NAME->data.V == NULL) { \
     193if (NAME == NULL || NAME->data.U8 == NULL) { \
    194194    psError(PS_ERR_BAD_PARAMETER_NULL, true, \
    195195            "Unallowable operation: psVector %s or its data is NULL.", \
    … …  
    272272    NEW_STATIC32 = psVectorRecycle(NEW_STATIC32, OLD->n, PS_TYPE_F32); \
    273273    p_psMemSetPersistent(NEW_STATIC32, true); \
    274     p_psMemSetPersistent(NEW_STATIC32->data.V, true); \
     274    p_psMemSetPersistent(NEW_STATIC32->data.U8, true); \
    275275    for (i=0; i < OLD->n ; i++) { \
    276276        NEW_STATIC32->data.F32[i] = (float) OLD->data.F64[i]; \
    … …  
    285285    NEW_STATIC64 = psVectorRecycle(NEW_STATIC64, OLD->n, PS_TYPE_F64); \
    286286    p_psMemSetPersistent(NEW_STATIC64, true); \
    287     p_psMemSetPersistent(NEW_STATIC64->data.V, true); \
     287    p_psMemSetPersistent(NEW_STATIC64->data.U8, true); \
    288288    for (i=0; i < OLD->n ; i++) { \
    289289        NEW_STATIC64->data.F64[i] = (double) OLD->data.F32[i]; \
    … …  
    295295VEC = psVectorRecycle(VEC, N, PS_TYPE_F32); \
    296296p_psMemSetPersistent(VEC, true); \
    297 p_psMemSetPersistent(VEC->data.V, true); \
     297p_psMemSetPersistent(VEC->data.U8, true); \
    298298for (int i=0;i<N;i++) { \
    299299    VEC->data.F32[i] = 1.0; \
    … …  
    303303VEC = psVectorRecycle(VEC, N, PS_TYPE_F64); \
    304304p_psMemSetPersistent(VEC, true); \
    305 p_psMemSetPersistent(VEC->data.V, true); \
     305p_psMemSetPersistent(VEC->data.U8, true); \
    306306for (int i=0;i<N;i++) { \
    307307    VEC->data.F64[i] = 1.0; \
    … …  
    311311VEC = psVectorRecycle(VEC, N, PS_TYPE_F32); \
    312312p_psMemSetPersistent(VEC, true); \
    313 p_psMemSetPersistent(VEC->data.V, true); \
     313p_psMemSetPersistent(VEC->data.U8, true); \
    314314for (int i=0;i<N;i++) { \
    315315    VEC->data.F32[i] = (float) i; \
    … …  
    319319VEC = psVectorRecycle(VEC, N, PS_TYPE_F64); \
    320320p_psMemSetPersistent(VEC, true); \
    321 p_psMemSetPersistent(VEC->data.V, true); \
     321p_psMemSetPersistent(VEC->data.U8, true); \
    322322for (int i=0;i<N;i++) { \
    323323    VEC->data.F64[i] = (float) i; \
    … …  
    328328NAME = psVectorRecycle(NAME, SIZE, TYPE); \
    329329p_psMemSetPersistent(NAME, true); \
    330 p_psMemSetPersistent(NAME->data.V, true); \
     330p_psMemSetPersistent(NAME->data.U8, true); \
    331331
    332332#define PS_VECTOR_DECLARE_ALLOC_STATIC(NAME, SIZE, TYPE) \

  • trunk/psLib/src/dataManip/psMatrix.c

    r3341 r3476  
    2121 *  @author Robert DeSonia, MHPCC
    2222 *
    23  *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
    24  *  @date $Date: 2005-02-28 23:34:10 $
     23 *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
     24 *  @date $Date: 2005-03-22 21:52:49 $
    2525 *
    2626 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    216216
    217217    (*outPerm)->n = numCols;
    218     perm.data = (*outPerm)->data.V;
     218    perm.data = (psPtr)((*outPerm)->data.U8);
    219219    lu = gsl_matrix_alloc(numRows, numCols);
    220220
    … …  
    273273    outVector->n = numCols;
    274274    perm.size = inPerm->n;
    275     perm.data = inPerm->data.V;
     275    perm.data = (psPtr)(inPerm->data.U8);
    276276
    277277    // Solve for {x} in equation: {b} = [A]{x}
    … …  
    580580    }
    581581
    582     memcpy(outVector->data.V, inImage->data.V[0], size);
     582    memcpy(outVector->data.U8, inImage->data.U8[0], size);
    583583
    584584    return outVector;
    … …  
    637637    PS_CHECK_DIMEN_AND_TYPE(outImage, PS_DIMEN_IMAGE, VECTORTOMATRIX_CLEANUP);
    638638
    639     memcpy(outImage->data.V[0], inVector->data.V, size);
     639    memcpy(outImage->data.U8[0], inVector->data.U8, size);
    640640
    641641    return outImage;

  • trunk/psLib/src/dataManip/psMinimize.c

    r3264 r3476  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-02-17 19:26:23 $
     11 *  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-03-22 21:52:49 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    16081608        myParamMask = psVectorRecycle(myParamMask, params->n, PS_TYPE_U8);
    16091609        p_psMemSetPersistent(myParamMask, true);
    1610         p_psMemSetPersistent(myParamMask->data.V, true);
     1610        p_psMemSetPersistent(myParamMask->data.U8, true);
    16111611        for (i=0;i<myParamMask->n;i++) {
    16121612            myParamMask->data.U8[i] = 0;

  • trunk/psLib/src/dataManip/psVectorFFT.c

    r3264 r3476  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-02-17 19:26:23 $
     7 *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-03-22 21:52:49 $
    99 *
    1010 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    8787        }
    8888        out->type.type = PS_TYPE_F32;
    89         out->data.V = psRealloc(out->data.V,PSELEMTYPE_SIZEOF(PS_TYPE_F32)*out->nalloc);
     89        out->data.U8 = psRealloc(out->data.U8,PSELEMTYPE_SIZEOF(PS_TYPE_F32)*out->nalloc);
    9090    }
    9191
    … …  
    113113        out = psVectorRecycle(out, numElements, type);
    114114        out->n = numElements;
    115         memcpy(out->data.V, in->data.V, numElements * PSELEMTYPE_SIZEOF(type));
     115        memcpy(out->data.U8, in->data.U8, numElements * PSELEMTYPE_SIZEOF(type));
    116116        return out;
    117117    }
    … …  
    172172        out = psVectorRecycle(out, numElements, type);
    173173        out->n = numElements;
    174         memset(out->data.V, 0, PSELEMTYPE_SIZEOF(type) * numElements);
     174        memset(out->data.U8, 0, PSELEMTYPE_SIZEOF(type) * numElements);
    175175        return out;
    176176    }
    … …  
    298298        out = psVectorRecycle(out, numElements, type);
    299299        out->n = numElements;
    300         memcpy(out->data.V, in->data.V, PSELEMTYPE_SIZEOF(type) * numElements);
     300        memcpy(out->data.U8, in->data.U8, PSELEMTYPE_SIZEOF(type) * numElements);
    301301        return out;
    302302    }
Note: See TracChangeset for help on using the changeset viewer.