IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 1, 2005, 12:01:17 PM (21 years ago)
Author:
drobbin
Message:

revised psPoly struct/fxns, psMemProblem, according to psLib SDRS rev. 15

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r4426 r4447  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.114 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-29 03:23:19 $
     9 *  @version $Revision: 1.115 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-07-01 22:01:17 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    10841084    newPoly->coeff = (psF32 *)psAlloc(n * sizeof(psF32));
    10851085    newPoly->coeffErr = (psF32 *)psAlloc(n * sizeof(psF32));
    1086     newPoly->mask = (psU8 *)psAlloc(n * sizeof(psU8));
     1086    newPoly->mask = (char *)psAlloc(n * sizeof(char));
    10871087    for (i = 0; i < n; i++) {
    10881088        newPoly->coeff[i] = 0.0;
    … …  
    11131113    newPoly->coeff = (psF32 **)psAlloc(nX * sizeof(psF32 *));
    11141114    newPoly->coeffErr = (psF32 **)psAlloc(nX * sizeof(psF32 *));
    1115     newPoly->mask = (psU8 **)psAlloc(nX * sizeof(psU8 *));
     1115    newPoly->mask = (char **)psAlloc(nX * sizeof(char *));
    11161116    for (x = 0; x < nX; x++) {
    11171117        newPoly->coeff[x] = (psF32 *)psAlloc(nY * sizeof(psF32));
    11181118        newPoly->coeffErr[x] = (psF32 *)psAlloc(nY * sizeof(psF32));
    1119         newPoly->mask[x] = (psU8 *)psAlloc(nY * sizeof(psU8));
     1119        newPoly->mask[x] = (char *)psAlloc(nY * sizeof(char));
    11201120    }
    11211121    for (x = 0; x < nX; x++) {
    … …  
    11521152    newPoly->coeff = (psF32 ***)psAlloc(nX * sizeof(psF32 **));
    11531153    newPoly->coeffErr = (psF32 ***)psAlloc(nX * sizeof(psF32 **));
    1154     newPoly->mask = (psU8 ***)psAlloc(nX * sizeof(psU8 **));
     1154    newPoly->mask = (char ***)psAlloc(nX * sizeof(char **));
    11551155    for (x = 0; x < nX; x++) {
    11561156        newPoly->coeff[x] = (psF32 **)psAlloc(nY * sizeof(psF32 *));
    11571157        newPoly->coeffErr[x] = (psF32 **)psAlloc(nY * sizeof(psF32 *));
    1158         newPoly->mask[x] = (psU8 **)psAlloc(nY * sizeof(psU8 *));
     1158        newPoly->mask[x] = (char **)psAlloc(nY * sizeof(char *));
    11591159        for (y = 0; y < nY; y++) {
    11601160            newPoly->coeff[x][y] = (psF32 *)psAlloc(nZ * sizeof(psF32));
    11611161            newPoly->coeffErr[x][y] = (psF32 *)psAlloc(nZ * sizeof(psF32));
    1162             newPoly->mask[x][y] = (psU8 *)psAlloc(nZ * sizeof(psU8));
     1162            newPoly->mask[x][y] = (char *)psAlloc(nZ * sizeof(char));
    11631163        }
    11641164    }
    … …  
    12011201    newPoly->coeff = (psF32 ****)psAlloc(nX * sizeof(psF32 ***));
    12021202    newPoly->coeffErr = (psF32 ****)psAlloc(nX * sizeof(psF32 ***));
    1203     newPoly->mask = (psU8 ****)psAlloc(nX * sizeof(psU8 ***));
     1203    newPoly->mask = (char ****)psAlloc(nX * sizeof(char ***));
    12041204    for (x = 0; x < nX; x++) {
    12051205        newPoly->coeff[x] = (psF32 ***)psAlloc(nY * sizeof(psF32 **));
    12061206        newPoly->coeffErr[x] = (psF32 ***)psAlloc(nY * sizeof(psF32 **));
    1207         newPoly->mask[x] = (psU8 ***)psAlloc(nY * sizeof(psU8 **));
     1207        newPoly->mask[x] = (char ***)psAlloc(nY * sizeof(char **));
    12081208        for (y = 0; y < nY; y++) {
    12091209            newPoly->coeff[x][y] = (psF32 **)psAlloc(nZ * sizeof(psF32 *));
    12101210            newPoly->coeffErr[x][y] = (psF32 **)psAlloc(nZ * sizeof(psF32 *));
    1211             newPoly->mask[x][y] = (psU8 **)psAlloc(nZ * sizeof(psU8 *));
     1211            newPoly->mask[x][y] = (char **)psAlloc(nZ * sizeof(char *));
    12121212            for (z = 0; z < nZ; z++) {
    12131213                newPoly->coeff[x][y][z] = (psF32 *)psAlloc(nT * sizeof(psF32));
    12141214                newPoly->coeffErr[x][y][z] = (psF32 *)psAlloc(nT * sizeof(psF32));
    1215                 newPoly->mask[x][y][z] = (psU8 *)psAlloc(nT * sizeof(psU8));
     1215                newPoly->mask[x][y][z] = (char *)psAlloc(nT * sizeof(char));
    12161216            }
    12171217        }
    … …  
    14461446    newPoly->coeff = (psF64 *)psAlloc(n * sizeof(psF64));
    14471447    newPoly->coeffErr = (psF64 *)psAlloc(n * sizeof(psF64));
    1448     newPoly->mask = (psU8 *)psAlloc(n * sizeof(psU8));
     1448    newPoly->mask = (char *)psAlloc(n * sizeof(char));
    14491449    for (i = 0; i < n; i++) {
    14501450        newPoly->coeff[i] = 0.0;
    … …  
    14751475    newPoly->coeff = (psF64 **)psAlloc(nX * sizeof(psF64 *));
    14761476    newPoly->coeffErr = (psF64 **)psAlloc(nX * sizeof(psF64 *));
    1477     newPoly->mask = (psU8 **)psAlloc(nX * sizeof(psU8 *));
     1477    newPoly->mask = (char **)psAlloc(nX * sizeof(char *));
    14781478    for (x = 0; x < nX; x++) {
    14791479        newPoly->coeff[x] = (psF64 *)psAlloc(nY * sizeof(psF64));
    14801480        newPoly->coeffErr[x] = (psF64 *)psAlloc(nY * sizeof(psF64));
    1481         newPoly->mask[x] = (psU8 *)psAlloc(nY * sizeof(psU8));
     1481        newPoly->mask[x] = (char *)psAlloc(nY * sizeof(char));
    14821482    }
    14831483    for (x = 0; x < nX; x++) {
    … …  
    15141514    newPoly->coeff = (psF64 ***)psAlloc(nX * sizeof(psF64 **));
    15151515    newPoly->coeffErr = (psF64 ***)psAlloc(nX * sizeof(psF64 **));
    1516     newPoly->mask = (psU8 ***)psAlloc(nX * sizeof(psU8 **));
     1516    newPoly->mask = (char ***)psAlloc(nX * sizeof(char **));
    15171517    for (x = 0; x < nX; x++) {
    15181518        newPoly->coeff[x] = (psF64 **)psAlloc(nY * sizeof(psF64 *));
    15191519        newPoly->coeffErr[x] = (psF64 **)psAlloc(nY * sizeof(psF64 *));
    1520         newPoly->mask[x] = (psU8 **)psAlloc(nY * sizeof(psU8 *));
     1520        newPoly->mask[x] = (char **)psAlloc(nY * sizeof(char *));
    15211521        for (y = 0; y < nY; y++) {
    15221522            newPoly->coeff[x][y] = (psF64 *)psAlloc(nZ * sizeof(psF64));
    15231523            newPoly->coeffErr[x][y] = (psF64 *)psAlloc(nZ * sizeof(psF64));
    1524             newPoly->mask[x][y] = (psU8 *)psAlloc(nZ * sizeof(psU8));
     1524            newPoly->mask[x][y] = (char *)psAlloc(nZ * sizeof(char));
    15251525        }
    15261526    }
    … …  
    15631563    newPoly->coeff = (psF64 ****)psAlloc(nX * sizeof(psF64 ***));
    15641564    newPoly->coeffErr = (psF64 ****)psAlloc(nX * sizeof(psF64 ***));
    1565     newPoly->mask = (psU8 ****)psAlloc(nX * sizeof(psU8 ***));
     1565    newPoly->mask = (char ****)psAlloc(nX * sizeof(char ***));
    15661566    for (x = 0; x < nX; x++) {
    15671567        newPoly->coeff[x] = (psF64 ***)psAlloc(nY * sizeof(psF64 **));
    15681568        newPoly->coeffErr[x] = (psF64 ***)psAlloc(nY * sizeof(psF64 **));
    1569         newPoly->mask[x] = (psU8 ***)psAlloc(nY * sizeof(psU8 **));
     1569        newPoly->mask[x] = (char ***)psAlloc(nY * sizeof(char **));
    15701570        for (y = 0; y < nY; y++) {
    15711571            newPoly->coeff[x][y] = (psF64 **)psAlloc(nZ * sizeof(psF64 *));
    15721572            newPoly->coeffErr[x][y] = (psF64 **)psAlloc(nZ * sizeof(psF64 *));
    1573             newPoly->mask[x][y] = (psU8 **)psAlloc(nZ * sizeof(psU8 *));
     1573            newPoly->mask[x][y] = (char **)psAlloc(nZ * sizeof(char *));
    15741574            for (z = 0; z < nZ; z++) {
    15751575                newPoly->coeff[x][y][z] = (psF64 *)psAlloc(nT * sizeof(psF64));
    15761576                newPoly->coeffErr[x][y][z] = (psF64 *)psAlloc(nT * sizeof(psF64));
    1577                 newPoly->mask[x][y][z] = (psU8 *)psAlloc(nT * sizeof(psU8));
     1577                newPoly->mask[x][y][z] = (char *)psAlloc(nT * sizeof(char));
    15781578            }
    15791579        }
    … …  
    18221822XXX: What should be the defualty type for knots be?  psF32 is assumed.
    18231823 *****************************************************************************/
    1824 psSpline1D *psSpline1DAlloc(int numSplines,
    1825                             int order,
     1824psSpline1D *psSpline1DAlloc(unsigned int numSplines,
     1825                            unsigned int order,
    18261826                            float min,
    18271827                            float max)
    … …  
    18671867 *****************************************************************************/
    18681868psSpline1D *psSpline1DAllocGeneric(const psVector *bounds,
    1869                                    int order)
     1869                                   unsigned int order)
    18701870{
    18711871    PS_ASSERT_VECTOR_NON_NULL(bounds, NULL);
    … …  
    18741874
    18751875    psSpline1D *tmp = NULL;
    1876     psS32 i;
    1877     psS32 numSplines;
     1876    unsigned int i;
     1877    unsigned int numSplines;
    18781878
    18791879    tmp = (psSpline1D *) psAlloc(sizeof(psSpline1D));
    … …  
    20452045psScalar *p_psVectorInterpolate(psVector *domain,
    20462046                                psVector *range,
    2047                                 psS32 order,
     2047                                unsigned int order,
    20482048                                psScalar *x)
    20492049{
    … …  
    21342134    PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NAN);
    21352135
    2136     psS32 binNum;
    2137     psS32 n;
     2136    unsigned int binNum;
     2137    unsigned int n;
    21382138
    21392139    n = spline->n;
    … …  
    21712171    PS_ASSERT_VECTOR_TYPE(spline->knots, PS_TYPE_F32, NULL);
    21722172
    2173     psS32 i;
     2173    unsigned int i;
    21742174    psVector *tmpVector;
    21752175
Note: See TracChangeset for help on using the changeset viewer.