Changeset 4392 for trunk/psLib/src/math
- Timestamp:
- Jun 24, 2005, 4:02:05 PM (21 years ago)
- Location:
- trunk/psLib/src/math
- Files:
-
- 3 edited
-
psPolynomial.c (modified) (11 diffs)
-
psSpline.c (modified) (11 diffs)
-
psStats.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/math/psPolynomial.c
r4330 r4392 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.11 0$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-2 1 03:01:37$9 * @version $Revision: 1.111 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-25 02:02:05 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1078 1078 1079 1079 newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); 1080 psMemSetDeallocator(newPoly, (psFreeF cn) polynomial1DFree);1080 psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree); 1081 1081 1082 1082 newPoly->type = type; … … 1105 1105 1106 1106 newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); 1107 psMemSetDeallocator(newPoly, (psFreeF cn) polynomial2DFree);1107 psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree); 1108 1108 1109 1109 newPoly->type = type; … … 1143 1143 1144 1144 newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); 1145 psMemSetDeallocator(newPoly, (psFreeF cn) polynomial3DFree);1145 psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree); 1146 1146 1147 1147 newPoly->type = type; … … 1191 1191 1192 1192 newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); 1193 psMemSetDeallocator(newPoly, (psFreeF cn) polynomial4DFree);1193 psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree); 1194 1194 1195 1195 newPoly->type = type; … … 1440 1440 1441 1441 newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); 1442 psMemSetDeallocator(newPoly, (psFreeF cn) dPolynomial1DFree);1442 psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree); 1443 1443 1444 1444 newPoly->type = type; … … 1467 1467 1468 1468 newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); 1469 psMemSetDeallocator(newPoly, (psFreeF cn) dPolynomial2DFree);1469 psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree); 1470 1470 1471 1471 newPoly->type = type; … … 1505 1505 1506 1506 newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); 1507 psMemSetDeallocator(newPoly, (psFreeF cn) dPolynomial3DFree);1507 psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree); 1508 1508 1509 1509 newPoly->type = type; … … 1553 1553 1554 1554 newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); 1555 psMemSetDeallocator(newPoly, (psFreeF cn) dPolynomial4DFree);1555 psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree); 1556 1556 1557 1557 newPoly->type = type; … … 1858 1858 tmp->knots->data.F32[numSplines] = max; 1859 1859 1860 psMemSetDeallocator(tmp,(psFreeF cn)spline1DFree);1860 psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree); 1861 1861 return(tmp); 1862 1862 } … … 1901 1901 } 1902 1902 1903 psMemSetDeallocator(tmp,(psFreeF cn)spline1DFree);1903 psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree); 1904 1904 return(tmp); 1905 1905 } -
trunk/psLib/src/math/psSpline.c
r4330 r4392 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.11 0$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-06-2 1 03:01:37$9 * @version $Revision: 1.111 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-06-25 02:02:05 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1078 1078 1079 1079 newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); 1080 psMemSetDeallocator(newPoly, (psFreeF cn) polynomial1DFree);1080 psMemSetDeallocator(newPoly, (psFreeFunc) polynomial1DFree); 1081 1081 1082 1082 newPoly->type = type; … … 1105 1105 1106 1106 newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); 1107 psMemSetDeallocator(newPoly, (psFreeF cn) polynomial2DFree);1107 psMemSetDeallocator(newPoly, (psFreeFunc) polynomial2DFree); 1108 1108 1109 1109 newPoly->type = type; … … 1143 1143 1144 1144 newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); 1145 psMemSetDeallocator(newPoly, (psFreeF cn) polynomial3DFree);1145 psMemSetDeallocator(newPoly, (psFreeFunc) polynomial3DFree); 1146 1146 1147 1147 newPoly->type = type; … … 1191 1191 1192 1192 newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); 1193 psMemSetDeallocator(newPoly, (psFreeF cn) polynomial4DFree);1193 psMemSetDeallocator(newPoly, (psFreeFunc) polynomial4DFree); 1194 1194 1195 1195 newPoly->type = type; … … 1440 1440 1441 1441 newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); 1442 psMemSetDeallocator(newPoly, (psFreeF cn) dPolynomial1DFree);1442 psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial1DFree); 1443 1443 1444 1444 newPoly->type = type; … … 1467 1467 1468 1468 newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); 1469 psMemSetDeallocator(newPoly, (psFreeF cn) dPolynomial2DFree);1469 psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial2DFree); 1470 1470 1471 1471 newPoly->type = type; … … 1505 1505 1506 1506 newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); 1507 psMemSetDeallocator(newPoly, (psFreeF cn) dPolynomial3DFree);1507 psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial3DFree); 1508 1508 1509 1509 newPoly->type = type; … … 1553 1553 1554 1554 newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); 1555 psMemSetDeallocator(newPoly, (psFreeF cn) dPolynomial4DFree);1555 psMemSetDeallocator(newPoly, (psFreeFunc) dPolynomial4DFree); 1556 1556 1557 1557 newPoly->type = type; … … 1858 1858 tmp->knots->data.F32[numSplines] = max; 1859 1859 1860 psMemSetDeallocator(tmp,(psFreeF cn)spline1DFree);1860 psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree); 1861 1861 return(tmp); 1862 1862 } … … 1901 1901 } 1902 1902 1903 psMemSetDeallocator(tmp,(psFreeF cn)spline1DFree);1903 psMemSetDeallocator(tmp,(psFreeFunc)spline1DFree); 1904 1904 return(tmp); 1905 1905 } -
trunk/psLib/src/math/psStats.c
r4315 r4392 14 14 * stats->binsize 15 15 * 16 * @version $Revision: 1.13 4$ $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 $ 18 18 * 19 19 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 1810 1810 // bins, then there are N+1 bounds to those bins. 1811 1811 newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); 1812 psMemSetDeallocator(newHist, (psFreeF cn) histogramFree);1812 psMemSetDeallocator(newHist, (psFreeFunc) histogramFree); 1813 1813 newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32); 1814 1814 newHist->bounds->n = newHist->bounds->nalloc; … … 1857 1857 // Allocate memory for the new histogram structure. 1858 1858 newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); 1859 psMemSetDeallocator(newHist, (psFreeF cn) histogramFree);1859 psMemSetDeallocator(newHist, (psFreeFunc) histogramFree); 1860 1860 newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32); 1861 1861 newHist->bounds->n = newHist->bounds->nalloc;
Note:
See TracChangeset
for help on using the changeset viewer.
