IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4392 for trunk/psLib/src/math


Ignore:
Timestamp:
Jun 24, 2005, 4:02:05 PM (21 years ago)
Author:
drobbin
Message:

changed psFreeFcn to psFreeFunc

Location:
trunk/psLib/src/math
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/psLib/src/math/psPolynomial.c

    r4330 r4392  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-21 03:01:37 $
     9 *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-25 02:02:05 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
     
    10781078
    10791079    newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
    1080     psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
     1080    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree);
    10811081
    10821082    newPoly->type = type;
     
    11051105
    11061106    newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
    1107     psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
     1107    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree);
    11081108
    11091109    newPoly->type = type;
     
    11431143
    11441144    newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
    1145     psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
     1145    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree);
    11461146
    11471147    newPoly->type = type;
     
    11911191
    11921192    newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
    1193     psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
     1193    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree);
    11941194
    11951195    newPoly->type = type;
     
    14401440
    14411441    newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
    1442     psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
     1442    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree);
    14431443
    14441444    newPoly->type = type;
     
    14671467
    14681468    newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
    1469     psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
     1469    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree);
    14701470
    14711471    newPoly->type = type;
     
    15051505
    15061506    newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
    1507     psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
     1507    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree);
    15081508
    15091509    newPoly->type = type;
     
    15531553
    15541554    newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
    1555     psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
     1555    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree);
    15561556
    15571557    newPoly->type = type;
     
    18581858    tmp->knots->data.F32[numSplines] = max;
    18591859
    1860     psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     1860    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
    18611861    return(tmp);
    18621862}
     
    19011901    }
    19021902
    1903     psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     1903    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
    19041904    return(tmp);
    19051905}
  • trunk/psLib/src/math/psSpline.c

    r4330 r4392  
    77 *  polynomials.  It also contains a Gaussian functions.
    88 *
    9  *  @version $Revision: 1.110 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-21 03:01:37 $
     9 *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-25 02:02:05 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
     
    10781078
    10791079    newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D));
    1080     psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);
     1080    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree);
    10811081
    10821082    newPoly->type = type;
     
    11051105
    11061106    newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D));
    1107     psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);
     1107    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree);
    11081108
    11091109    newPoly->type = type;
     
    11431143
    11441144    newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D));
    1145     psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);
     1145    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree);
    11461146
    11471147    newPoly->type = type;
     
    11911191
    11921192    newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D));
    1193     psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);
     1193    psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree);
    11941194
    11951195    newPoly->type = type;
     
    14401440
    14411441    newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D));
    1442     psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);
     1442    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree);
    14431443
    14441444    newPoly->type = type;
     
    14671467
    14681468    newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D));
    1469     psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);
     1469    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree);
    14701470
    14711471    newPoly->type = type;
     
    15051505
    15061506    newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D));
    1507     psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);
     1507    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree);
    15081508
    15091509    newPoly->type = type;
     
    15531553
    15541554    newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D));
    1555     psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);
     1555    psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree);
    15561556
    15571557    newPoly->type = type;
     
    18581858    tmp->knots->data.F32[numSplines] = max;
    18591859
    1860     psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     1860    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
    18611861    return(tmp);
    18621862}
     
    19011901    }
    19021902
    1903     psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);
     1903    psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree);
    19041904    return(tmp);
    19051905}
  • trunk/psLib/src/math/psStats.c

    r4315 r4392  
    1414 *      stats->binsize
    1515 *
    16  *  @version $Revision: 1.134 $ $Name: not supported by cvs2svn $
    17  *  @date $Date: 2005-06-18 02:30:49 $
     16 *  @version $Revision: 1.135 $ $Name: not supported by cvs2svn $
     17 *  @date $Date: 2005-06-25 02:02:05 $
    1818 *
    1919 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     
    18101810    // bins, then there are N+1 bounds to those bins.
    18111811    newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
    1812     psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
     1812    psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
    18131813    newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32);
    18141814    newHist->bounds->n = newHist->bounds->nalloc;
     
    18571857    // Allocate memory for the new histogram structure.
    18581858    newHist = (psHistogram* ) psAlloc(sizeof(psHistogram));
    1859     psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);
     1859    psMemSetDeallocator(newHist, (psFreeFunc) histogramFree);
    18601860    newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32);
    18611861    newHist->bounds->n = newHist->bounds->nalloc;
Note: See TracChangeset for help on using the changeset viewer.