Changeset 3682 for trunk/psLib/src
- Timestamp:
- Apr 7, 2005, 10:27:42 AM (21 years ago)
- Location:
- trunk/psLib/src
- Files:
-
- 1 added
- 44 edited
-
Makefile.am (modified) (1 diff)
-
astro/psCoord.c (modified) (6 diffs)
-
astronomy/psAstrometry.c (modified) (8 diffs)
-
astronomy/psCoord.c (modified) (6 diffs)
-
astronomy/psMetadata.c (modified) (4 diffs)
-
collections/psArray.c (modified) (2 diffs)
-
collections/psBitSet.c (modified) (2 diffs)
-
collections/psHash.c (modified) (3 diffs)
-
collections/psList.c (modified) (4 diffs)
-
collections/psMetadata.c (modified) (4 diffs)
-
collections/psVector.c (modified) (2 diffs)
-
dataIO/psFits.c (modified) (2 diffs)
-
dataIO/psLookupTable.c (modified) (2 diffs)
-
dataManip/psFunctions.c (modified) (11 diffs)
-
dataManip/psStats.c (modified) (3 diffs)
-
fileUtils/psFits.c (modified) (2 diffs)
-
fileUtils/psLookupTable.c (modified) (2 diffs)
-
fits/psFits.c (modified) (2 diffs)
-
image/psImage.c (modified) (2 diffs)
-
image/psImageConvolve.c (modified) (2 diffs)
-
image/psImageExtraction.c (modified) (2 diffs)
-
imageops/psImageConvolve.c (modified) (2 diffs)
-
math/psPolynomial.c (modified) (11 diffs)
-
math/psSpline.c (modified) (11 diffs)
-
math/psStats.c (modified) (3 diffs)
-
mathtypes/psImage.c (modified) (2 diffs)
-
mathtypes/psVector.c (modified) (2 diffs)
-
pslib.h (modified) (3 diffs)
-
pslib_strict.h (added)
-
sys/psError.c (modified) (2 diffs)
-
sys/psErrorCodes.c (modified) (2 diffs)
-
sys/psMemory.c (modified) (3 diffs)
-
sys/psMemory.h (modified) (3 diffs)
-
sys/psTrace.c (modified) (2 diffs)
-
sysUtils/psError.c (modified) (2 diffs)
-
sysUtils/psErrorCodes.c (modified) (2 diffs)
-
sysUtils/psMemory.c (modified) (3 diffs)
-
sysUtils/psMemory.h (modified) (3 diffs)
-
sysUtils/psTrace.c (modified) (2 diffs)
-
types/psArray.c (modified) (2 diffs)
-
types/psBitSet.c (modified) (2 diffs)
-
types/psHash.c (modified) (3 diffs)
-
types/psList.c (modified) (4 diffs)
-
types/psLookupTable.c (modified) (2 diffs)
-
types/psMetadata.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/Makefile.am
r3240 r3682 28 28 pslibinclude_HEADERS = \ 29 29 psTest.h \ 30 pslib.h 30 pslib.h \ 31 pslib_strict.h 31 32 32 33 install-exec-hook: libpslib.la -
trunk/psLib/src/astro/psCoord.c
r3598 r3682 10 10 * @author GLG, MHPCC 11 11 * 12 * @version $Revision: 1.6 1$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 3-31 23:01:46$12 * @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-04-07 20:27:41 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 214 214 psPlane *p = psAlloc(sizeof(psPlane)); 215 215 216 p _psMemSetDeallocator(p, (psFreeFcn) planeFree);216 psMemSetDeallocator(p, (psFreeFcn) planeFree); 217 217 return(p); 218 218 } … … 228 228 psSphere *s = psAlloc(sizeof(psSphere)); 229 229 230 p _psMemSetDeallocator(s, (psFreeFcn) sphereFree);230 psMemSetDeallocator(s, (psFreeFcn) sphereFree); 231 231 return(s); 232 232 } … … 247 247 pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD); 248 248 249 p _psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);249 psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree); 250 250 return(pt); 251 251 } … … 293 293 pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD); 294 294 295 p _psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);295 psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree); 296 296 return(pt); 297 297 } … … 508 508 p->type = type; 509 509 510 p _psMemSetDeallocator(p, (psFreeFcn) projectionFree);510 psMemSetDeallocator(p, (psFreeFcn) projectionFree); 511 511 return(p); 512 512 } -
trunk/psLib/src/astronomy/psAstrometry.c
r3598 r3682 8 8 * @author GLG, MHPCC 9 9 * 10 * @version $Revision: 1.6 3$ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 3-31 23:01:46$10 * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-04-07 20:27:41 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 191 191 } 192 192 193 p _psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree);193 psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree); 194 194 195 195 return(tmp); … … 238 238 exp->telescopeName = NULL; 239 239 240 p _psMemSetDeallocator(exp,(psFreeFcn)exposureFree);240 psMemSetDeallocator(exp,(psFreeFcn)exposureFree); 241 241 242 242 return exp; … … 263 263 *(double *)&obs->tlr = tlr; 264 264 265 p _psMemSetDeallocator(obs,(psFreeFcn)observatoryFree);265 psMemSetDeallocator(obs,(psFreeFcn)observatoryFree); 266 266 267 267 return obs; … … 304 304 newFPA->chi2 = 0.0f; 305 305 306 p _psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree);306 psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree); 307 307 308 308 return newFPA; … … 338 338 chip->parent = parentFPA; 339 339 340 p _psMemSetDeallocator(chip,(psFreeFcn)chipFree);340 psMemSetDeallocator(chip,(psFreeFcn)chipFree); 341 341 342 342 return chip; … … 376 376 cell->parent = parentChip; 377 377 378 p _psMemSetDeallocator(cell,(psFreeFcn)cellFree);378 psMemSetDeallocator(cell,(psFreeFcn)cellFree); 379 379 380 380 return cell; … … 399 399 readout->metadata = NULL; 400 400 401 p _psMemSetDeallocator(readout,(psFreeFcn)readoutFree);401 psMemSetDeallocator(readout,(psFreeFcn)readoutFree); 402 402 403 403 return readout; -
trunk/psLib/src/astronomy/psCoord.c
r3598 r3682 10 10 * @author GLG, MHPCC 11 11 * 12 * @version $Revision: 1.6 1$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 3-31 23:01:46$12 * @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-04-07 20:27:41 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 214 214 psPlane *p = psAlloc(sizeof(psPlane)); 215 215 216 p _psMemSetDeallocator(p, (psFreeFcn) planeFree);216 psMemSetDeallocator(p, (psFreeFcn) planeFree); 217 217 return(p); 218 218 } … … 228 228 psSphere *s = psAlloc(sizeof(psSphere)); 229 229 230 p _psMemSetDeallocator(s, (psFreeFcn) sphereFree);230 psMemSetDeallocator(s, (psFreeFcn) sphereFree); 231 231 return(s); 232 232 } … … 247 247 pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD); 248 248 249 p _psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree);249 psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree); 250 250 return(pt); 251 251 } … … 293 293 pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD); 294 294 295 p _psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree);295 psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree); 296 296 return(pt); 297 297 } … … 508 508 p->type = type; 509 509 510 p _psMemSetDeallocator(p, (psFreeFcn) projectionFree);510 psMemSetDeallocator(p, (psFreeFcn) projectionFree); 511 511 return(p); 512 512 } -
trunk/psLib/src/astronomy/psMetadata.c
r3541 r3682 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.5 7$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 3-29 21:31:54$14 * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-04-07 20:27:41 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 183 183 184 184 // Set deallocator 185 p _psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);185 psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); 186 186 187 187 // Allocate and set metadata item comment … … 252 252 metadata = (psMetadata*) psAlloc(sizeof(psMetadata)); 253 253 // Set deallocator 254 p _psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);254 psMemSetDeallocator(metadata, (psFreeFcn) metadataFree); 255 255 256 256 // Allocate metadata's internal containers … … 598 598 599 599 // Set deallocator 600 p _psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);600 psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree); 601 601 602 602 if (regex == NULL) { -
trunk/psLib/src/collections/psArray.c
r3286 r3682 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.2 6$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 2-18 22:17:20$11 * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 55 55 // Create vector struct 56 56 psArr = (psArray* ) psAlloc(sizeof(psArray)); 57 p _psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);57 psMemSetDeallocator(psArr, (psFreeFcn) arrayFree); 58 58 59 59 psArr->nalloc = nalloc; -
trunk/psLib/src/collections/psBitSet.c
r3298 r3682 11 11 * @author Robert DeSonia, MHPCC 12 12 * 13 * @version $Revision: 1.2 3$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 2-22 19:25:52$13 * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-04-07 20:27:41 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 80 80 numBytes = ceil(n / 8.0); 81 81 newObj = psAlloc(sizeof(psBitSet)); 82 p _psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);82 psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree); 83 83 newObj->n = numBytes; 84 84 -
trunk/psLib/src/collections/psHash.c
r3286 r3682 12 12 * @author Robert DeSonia, MHPCC 13 13 * 14 * @version $Revision: 1.1 3$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 2-18 22:17:20$14 * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-04-07 20:27:41 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 90 90 psHashBucket* bucket = psAlloc(sizeof(psHashBucket)); 91 91 92 p _psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);92 psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree); 93 93 94 94 // Initialize the bucket. … … 141 141 psHash* table = psAlloc(sizeof(psHash)); 142 142 143 p _psMemSetDeallocator(table, (psFreeFcn) hashFree);143 psMemSetDeallocator(table, (psFreeFcn) hashFree); 144 144 145 145 // Allocate memory for the buckets. -
trunk/psLib/src/collections/psList.c
r3264 r3682 6 6 * @author Robert Daniel DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1.3 4$ $Name: not supported by cvs2svn $9 * @date $Date: 2005-0 2-17 19:26:23$8 * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2005-04-07 20:27:41 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 45 45 psArray* iterators = list->iterators; 46 46 for (int i = 0; i < iterators->n; i++) { 47 p _psMemSetDeallocator(iterators->data[i], NULL);47 psMemSetDeallocator(iterators->data[i], NULL); 48 48 } 49 49 … … 129 129 psList* list = psAlloc(sizeof(psList)); 130 130 131 p _psMemSetDeallocator(list, (psFreeFcn) listFree);131 psMemSetDeallocator(list, (psFreeFcn) listFree); 132 132 133 133 list->size = 0; … … 153 153 psListIterator* iter = psAlloc(sizeof(psListIterator)); 154 154 155 p _psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);155 psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree); 156 156 157 157 // initialize the attributes -
trunk/psLib/src/collections/psMetadata.c
r3541 r3682 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.5 7$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 3-29 21:31:54$14 * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-04-07 20:27:41 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 183 183 184 184 // Set deallocator 185 p _psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);185 psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); 186 186 187 187 // Allocate and set metadata item comment … … 252 252 metadata = (psMetadata*) psAlloc(sizeof(psMetadata)); 253 253 // Set deallocator 254 p _psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);254 psMemSetDeallocator(metadata, (psFreeFcn) metadataFree); 255 255 256 256 // Allocate metadata's internal containers … … 598 598 599 599 // Set deallocator 600 p _psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);600 psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree); 601 601 602 602 if (regex == NULL) { -
trunk/psLib/src/collections/psVector.c
r3476 r3682 9 9 * @author Robert DeSonia, MHPCC 10 10 * 11 * @version $Revision: 1.3 6$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 3-22 21:52:49$11 * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 51 51 // Create vector struct 52 52 psVec = (psVector* ) psAlloc(sizeof(psVector)); 53 p _psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);53 psMemSetDeallocator(psVec, (psFreeFcn) vectorFree); 54 54 55 55 psVec->type.dimen = PS_DIMEN_VECTOR; -
trunk/psLib/src/dataIO/psFits.c
r3671 r3682 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.2 6$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-04-0 6 01:12:58$9 * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 249 249 fits->p_fd = fptr; 250 250 strcpy((char*)fits->filename,name); 251 p _psMemSetDeallocator(fits,(psFreeFcn)fitsFree);251 psMemSetDeallocator(fits,(psFreeFcn)fitsFree); 252 252 253 253 return fits; -
trunk/psLib/src/dataIO/psLookupTable.c
r3586 r3682 7 7 * @author Ross Harman, MHPCC 8 8 * 9 * @version $Revision: 1.1 1$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-0 3-31 02:33:17$9 * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii … … 421 421 422 422 // Set deallocator 423 p _psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);423 psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree); 424 424 425 425 // Allocate and set metadata item comment -
trunk/psLib/src/dataManip/psFunctions.c
r3671 r3682 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.9 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-04-0 6 01:12:58$9 * @version $Revision: 1.96 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1048 1048 1049 1049 newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); 1050 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);1050 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); 1051 1051 1052 1052 newPoly->type = type; … … 1075 1075 1076 1076 newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); 1077 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);1077 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); 1078 1078 1079 1079 newPoly->type = type; … … 1113 1113 1114 1114 newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); 1115 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);1115 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); 1116 1116 1117 1117 newPoly->type = type; … … 1161 1161 1162 1162 newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); 1163 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);1163 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); 1164 1164 1165 1165 newPoly->type = type; … … 1410 1410 1411 1411 newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); 1412 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);1412 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); 1413 1413 1414 1414 newPoly->type = type; … … 1437 1437 1438 1438 newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); 1439 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);1439 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); 1440 1440 1441 1441 newPoly->type = type; … … 1475 1475 1476 1476 newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); 1477 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);1477 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); 1478 1478 1479 1479 newPoly->type = type; … … 1523 1523 1524 1524 newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); 1525 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);1525 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); 1526 1526 1527 1527 newPoly->type = type; … … 1829 1829 tmp->knots->data.F32[numSplines] = max; 1830 1830 1831 p _psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);1831 psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); 1832 1832 return(tmp); 1833 1833 } … … 1872 1872 } 1873 1873 1874 p _psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);1874 psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); 1875 1875 return(tmp); 1876 1876 } -
trunk/psLib/src/dataManip/psStats.c
r3551 r3682 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.12 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 3-29 22:51:24$11 * @version $Revision: 1.125 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 1833 1833 // bins, then there are N+1 bounds to those bins. 1834 1834 newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); 1835 p _psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);1835 psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); 1836 1836 newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32); 1837 1837 newHist->bounds->n = newHist->bounds->nalloc; … … 1880 1880 // Allocate memory for the new histogram structure. 1881 1881 newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); 1882 p _psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);1882 psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); 1883 1883 newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32); 1884 1884 newHist->bounds->n = newHist->bounds->nalloc; -
trunk/psLib/src/fileUtils/psFits.c
r3671 r3682 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.2 6$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-04-0 6 01:12:58$9 * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 249 249 fits->p_fd = fptr; 250 250 strcpy((char*)fits->filename,name); 251 p _psMemSetDeallocator(fits,(psFreeFcn)fitsFree);251 psMemSetDeallocator(fits,(psFreeFcn)fitsFree); 252 252 253 253 return fits; -
trunk/psLib/src/fileUtils/psLookupTable.c
r3586 r3682 7 7 * @author Ross Harman, MHPCC 8 8 * 9 * @version $Revision: 1.1 1$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-0 3-31 02:33:17$9 * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii … … 421 421 422 422 // Set deallocator 423 p _psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);423 psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree); 424 424 425 425 // Allocate and set metadata item comment -
trunk/psLib/src/fits/psFits.c
r3671 r3682 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.2 6$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-04-0 6 01:12:58$9 * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 249 249 fits->p_fd = fptr; 250 250 strcpy((char*)fits->filename,name); 251 p _psMemSetDeallocator(fits,(psFreeFcn)fitsFree);251 psMemSetDeallocator(fits,(psFreeFcn)fitsFree); 252 252 253 253 return fits; -
trunk/psLib/src/image/psImage.c
r3671 r3682 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.6 2$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-04-0 6 01:12:58$11 * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 67 67 psImage* image = (psImage* ) psAlloc(sizeof(psImage)); 68 68 69 p _psMemSetDeallocator(image, (psFreeFcn) imageFree);69 psMemSetDeallocator(image, (psFreeFcn) imageFree); 70 70 71 71 image->data.V = psAlloc(sizeof(psPtr ) * numRows); -
trunk/psLib/src/image/psImageConvolve.c
r3191 r3682 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 2$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-0 2-11 20:27:34$7 * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-04-07 20:27:41 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 75 75 result->kernel = kernelRows - yMin; 76 76 77 p _psMemSetDeallocator(result,(psFreeFcn)freeKernel);77 psMemSetDeallocator(result,(psFreeFcn)freeKernel); 78 78 79 79 return result; -
trunk/psLib/src/image/psImageExtraction.c
r3476 r3682 9 9 * @author Robert DeSonia, MHPCC 10 10 * 11 * @version $Revision: 1.3 3$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 3-22 21:52:49$11 * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 105 105 106 106 // set the new psImage's deallocator to the same as the input image 107 p _psMemSetDeallocator(out,p_psMemGetDeallocator(image));107 psMemSetDeallocator(out,psMemGetDeallocator(image)); 108 108 109 109 inputColOffset = elementSize * col0; -
trunk/psLib/src/imageops/psImageConvolve.c
r3191 r3682 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 2$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-0 2-11 20:27:34$7 * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-04-07 20:27:41 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 75 75 result->kernel = kernelRows - yMin; 76 76 77 p _psMemSetDeallocator(result,(psFreeFcn)freeKernel);77 psMemSetDeallocator(result,(psFreeFcn)freeKernel); 78 78 79 79 return result; -
trunk/psLib/src/math/psPolynomial.c
r3671 r3682 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.9 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-04-0 6 01:12:58$9 * @version $Revision: 1.96 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1048 1048 1049 1049 newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); 1050 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);1050 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); 1051 1051 1052 1052 newPoly->type = type; … … 1075 1075 1076 1076 newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); 1077 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);1077 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); 1078 1078 1079 1079 newPoly->type = type; … … 1113 1113 1114 1114 newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); 1115 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);1115 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); 1116 1116 1117 1117 newPoly->type = type; … … 1161 1161 1162 1162 newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); 1163 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);1163 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); 1164 1164 1165 1165 newPoly->type = type; … … 1410 1410 1411 1411 newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); 1412 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);1412 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); 1413 1413 1414 1414 newPoly->type = type; … … 1437 1437 1438 1438 newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); 1439 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);1439 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); 1440 1440 1441 1441 newPoly->type = type; … … 1475 1475 1476 1476 newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); 1477 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);1477 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); 1478 1478 1479 1479 newPoly->type = type; … … 1523 1523 1524 1524 newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); 1525 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);1525 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); 1526 1526 1527 1527 newPoly->type = type; … … 1829 1829 tmp->knots->data.F32[numSplines] = max; 1830 1830 1831 p _psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);1831 psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); 1832 1832 return(tmp); 1833 1833 } … … 1872 1872 } 1873 1873 1874 p _psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);1874 psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); 1875 1875 return(tmp); 1876 1876 } -
trunk/psLib/src/math/psSpline.c
r3671 r3682 7 7 * polynomials. It also contains a Gaussian functions. 8 8 * 9 * @version $Revision: 1.9 5$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-04-0 6 01:12:58$9 * @version $Revision: 1.96 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 1048 1048 1049 1049 newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); 1050 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree);1050 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); 1051 1051 1052 1052 newPoly->type = type; … … 1075 1075 1076 1076 newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); 1077 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree);1077 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); 1078 1078 1079 1079 newPoly->type = type; … … 1113 1113 1114 1114 newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); 1115 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree);1115 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); 1116 1116 1117 1117 newPoly->type = type; … … 1161 1161 1162 1162 newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); 1163 p _psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree);1163 psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); 1164 1164 1165 1165 newPoly->type = type; … … 1410 1410 1411 1411 newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); 1412 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree);1412 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); 1413 1413 1414 1414 newPoly->type = type; … … 1437 1437 1438 1438 newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); 1439 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree);1439 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); 1440 1440 1441 1441 newPoly->type = type; … … 1475 1475 1476 1476 newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); 1477 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree);1477 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); 1478 1478 1479 1479 newPoly->type = type; … … 1523 1523 1524 1524 newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); 1525 p _psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree);1525 psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); 1526 1526 1527 1527 newPoly->type = type; … … 1829 1829 tmp->knots->data.F32[numSplines] = max; 1830 1830 1831 p _psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);1831 psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); 1832 1832 return(tmp); 1833 1833 } … … 1872 1872 } 1873 1873 1874 p _psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree);1874 psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); 1875 1875 return(tmp); 1876 1876 } -
trunk/psLib/src/math/psStats.c
r3551 r3682 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.12 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 3-29 22:51:24$11 * @version $Revision: 1.125 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 1833 1833 // bins, then there are N+1 bounds to those bins. 1834 1834 newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); 1835 p _psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);1835 psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); 1836 1836 newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32); 1837 1837 newHist->bounds->n = newHist->bounds->nalloc; … … 1880 1880 // Allocate memory for the new histogram structure. 1881 1881 newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); 1882 p _psMemSetDeallocator(newHist, (psFreeFcn) histogramFree);1882 psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); 1883 1883 newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32); 1884 1884 newHist->bounds->n = newHist->bounds->nalloc; -
trunk/psLib/src/mathtypes/psImage.c
r3671 r3682 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.6 2$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-04-0 6 01:12:58$11 * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 67 67 psImage* image = (psImage* ) psAlloc(sizeof(psImage)); 68 68 69 p _psMemSetDeallocator(image, (psFreeFcn) imageFree);69 psMemSetDeallocator(image, (psFreeFcn) imageFree); 70 70 71 71 image->data.V = psAlloc(sizeof(psPtr ) * numRows); -
trunk/psLib/src/mathtypes/psVector.c
r3476 r3682 9 9 * @author Robert DeSonia, MHPCC 10 10 * 11 * @version $Revision: 1.3 6$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 3-22 21:52:49$11 * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 51 51 // Create vector struct 52 52 psVec = (psVector* ) psAlloc(sizeof(psVector)); 53 p _psMemSetDeallocator(psVec, (psFreeFcn) vectorFree);53 psMemSetDeallocator(psVec, (psFreeFcn) vectorFree); 54 54 55 55 psVec->type.dimen = PS_DIMEN_VECTOR; -
trunk/psLib/src/pslib.h
r3598 r3682 1 2 1 /** @file pslib.h 3 2 * … … 9 8 * @author Eric Van Alst, MHPCC 10 9 * 11 * @version $Revision: 1.3 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 3-31 23:01:46$10 * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-04-07 20:27:41 $ 13 12 * 14 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 18 17 #define PS_LIB_H 19 18 20 /******************************************************************************/ 21 22 /* INCLUDE FILES */ 23 24 /******************************************************************************/ 25 26 // // System Utilities 27 28 /// @defgroup SysUtils System Utilities 29 /// @{ 30 31 /** @defgroup MemoryManagement Memory Management Utilities 32 * 33 * This is the generic memory management system put inbetween the user's high level code and the OS-level 34 * memory allocation routines. This system adds such features as callback routines for memory error events, 35 * tracing capabilities, and reference counting. 36 * 37 * @ingroup SysUtils 38 */ 39 40 #include "fitsio.h" 41 42 #include "psMemory.h" 43 44 /// @defgroup LogTrace Tracing and Logging 45 /// @ingroup SysUtils 46 #include "psLogMsg.h" 47 #include "psTrace.h" 48 49 /// @defgroup ErrorHandling Error Handling 50 /// @ingroup SysUtils 51 #include "psAbort.h" 52 #include "psError.h" 53 54 #include "psString.h" 55 56 /// @defgroup Configure Configure psLib 57 /// @ingroup SysUtils 58 #include "psConfigure.h" 59 60 /// @} 61 62 // Collections 63 /// @defgroup DataContainer Data Containers 64 /// @{ 65 66 #include "psType.h" 67 68 /// @defgroup LinkedList Linked List 69 /// @ingroup DataContainer 70 #include "psList.h" 71 72 /// @defgroup HashTable Hash Table 73 /// @ingroup DataContainer 74 #include "psHash.h" 75 76 /// @defgroup Scalar Scalar 77 /// @ingroup DataContainer 78 #include "psScalar.h" 79 80 /// @defgroup Vector Vector Container 81 /// @ingroup DataContainer 82 #include "psVector.h" 83 84 /// @defgroup Array Array Container 85 /// @ingroup DataContainer 86 #include "psArray.h" 87 88 /// @defgroup Image Image Container 89 /// @ingroup DataContainer 90 /// @{ 91 #include "psImage.h" 92 #include "psImageExtraction.h" 93 #include "psImageManip.h" 94 #include "psImageConvolve.h" 95 96 /// @defgroup ImageIO Image File I/O Functions 97 /// @ingroup Image 98 #include "psImageIO.h" 99 100 /// @defgroup ImageStats Image Statistical Functions 101 /// @ingroup Image 102 #include "psImageStats.h" 103 104 /// @} 105 106 /// @defgroup BitSet Bit Set Container 107 /// @ingroup DataContainer 108 #include "psBitSet.h" 109 110 /// @} 111 112 // Data Manipulation 113 /// @defgroup DataManip Data Manipulation 114 /// @{ 115 116 /// @defgroup Compare Comparison Functions 117 /// @ingroup DataManip 118 #include "psCompare.h" 119 120 /// @defgroup Stats Statistic Functions 121 /// @ingroup DataManip 122 #include "psStats.h" 123 124 /// @defgroup Matrix Matrix Operations 125 /// @ingroup DataManip 126 #include "psMatrix.h" 127 128 /// @defgroup MatrixArithmetic Matrix Arithmetic Operations 129 /// @ingroup DataManip 130 #include "psBinaryOp.h" 131 #include "psUnaryOp.h" 132 133 #include "psRandom.h" 134 135 /// @defgroup Transform Fourier Transform Operations 136 /// @ingroup DataManip 137 #include "psVectorFFT.h" 138 #include "psImageFFT.h" 139 140 #include "psFunctions.h" 141 #include "psMinimize.h" 142 143 /// @} 144 145 // Astronomy 146 /// @defgroup Astronomy Astronomy Functions 147 /// @{ 148 149 /// @defgroup CoordinateTransform Coordinate Functions 150 /// @ingroup Astronomy 151 #include "psCoord.h" 152 153 /// @defgroup Photometry Photometry 154 /// @ingroup Astronomy 155 #include "psPhotometry.h" 156 157 /// @defgroup Time Time Functions 158 /// @ingroup Astronomy 159 #include "psTime.h" 160 161 /// @defgroup Metadata Metadata Functions 162 /// @ingroup Astronomy 163 #include "psMetadata.h" 164 #include "psMetadataIO.h" 165 166 /// @defgroup AstroImage Astrometry Functions 167 /// @ingroup Astronomy 168 #include "psAstrometry.h" 169 #include "psConstants.h" 170 #include "psDB.h" 171 172 /// @} 173 174 // FileUtils 175 /// @defgroup FileUtils File Utilities 176 /// @{ 177 #include "psFits.h" 178 179 /// @defgroup LookupTable Lookup Table 180 /// @ingroup FileUtils 181 #include "psLookupTable.h" 182 183 /// @} 19 #include "pslib_strict.h" 184 20 185 21 #endif -
trunk/psLib/src/sys/psError.c
r3476 r3682 10 10 * @author Eric Van Alst, MHPCC 11 11 * 12 * @version $Revision: 1.2 3$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 3-22 21:52:49$12 * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-04-07 20:27:41 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 62 62 err->code = code; 63 63 64 p _psMemSetDeallocator(err,(psFreeFcn)errFree);64 psMemSetDeallocator(err,(psFreeFcn)errFree); 65 65 66 66 return err; -
trunk/psLib/src/sys/psErrorCodes.c
r3264 r3682 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.1 6$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-0 2-17 19:26:24$9 * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 105 105 } 106 106 107 p _psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);107 psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription); 108 108 return err; 109 109 } -
trunk/psLib/src/sys/psMemory.c
r3585 r3682 8 8 * @author Robert Lupton, Princeton University 9 9 * 10 * @version $Revision: 1. 49$ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 3-31 02:32:20$10 * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-04-07 20:27:41 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 641 641 } 642 642 643 void p _psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)643 void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn) 644 644 { 645 645 if (vptr == NULL) { … … 656 656 657 657 } 658 psFreeFcn p _psMemGetDeallocator(psPtr vptr)658 psFreeFcn psMemGetDeallocator(psPtr vptr) 659 659 { 660 660 if (vptr == NULL) { -
trunk/psLib/src/sys/psMemory.h
r3264 r3682 12 12 * @ingroup MemoryManagement 13 13 * 14 * @version $Revision: 1.3 5$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 2-17 19:26:24$14 * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-04-07 20:27:41 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 150 150 * 151 151 */ 152 void p _psMemSetDeallocator(152 void psMemSetDeallocator( 153 153 psPtr ptr, ///< the memory block to operate on 154 154 psFreeFcn freeFcn ///< the function to be executed at deallocation … … 164 164 * @return psFreeFcn the routine to be called at deallocation. 165 165 */ 166 psFreeFcn p _psMemGetDeallocator(166 psFreeFcn psMemGetDeallocator( 167 167 psPtr ptr ///< the memory block 168 168 ); -
trunk/psLib/src/sys/psTrace.c
r3541 r3682 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.4 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 3-29 21:31:54$11 * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 67 67 68 68 p_psMemSetPersistent(comp,true); 69 p _psMemSetDeallocator(comp, (psFreeFcn) componentFree);69 psMemSetDeallocator(comp, (psFreeFcn) componentFree); 70 70 comp->name = psStringCopy(name); 71 71 p_psMemSetPersistent((psPtr)comp->name,true); -
trunk/psLib/src/sysUtils/psError.c
r3476 r3682 10 10 * @author Eric Van Alst, MHPCC 11 11 * 12 * @version $Revision: 1.2 3$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 3-22 21:52:49$12 * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-04-07 20:27:41 $ 14 14 * 15 15 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 62 62 err->code = code; 63 63 64 p _psMemSetDeallocator(err,(psFreeFcn)errFree);64 psMemSetDeallocator(err,(psFreeFcn)errFree); 65 65 66 66 return err; -
trunk/psLib/src/sysUtils/psErrorCodes.c
r3264 r3682 7 7 * @author Robert DeSonia, MHPCC 8 8 * 9 * @version $Revision: 1.1 6$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-0 2-17 19:26:24$9 * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 105 105 } 106 106 107 p _psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription);107 psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription); 108 108 return err; 109 109 } -
trunk/psLib/src/sysUtils/psMemory.c
r3585 r3682 8 8 * @author Robert Lupton, Princeton University 9 9 * 10 * @version $Revision: 1. 49$ $Name: not supported by cvs2svn $11 * @date $Date: 2005-0 3-31 02:32:20$10 * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ 11 * @date $Date: 2005-04-07 20:27:41 $ 12 12 * 13 13 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 641 641 } 642 642 643 void p _psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn)643 void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn) 644 644 { 645 645 if (vptr == NULL) { … … 656 656 657 657 } 658 psFreeFcn p _psMemGetDeallocator(psPtr vptr)658 psFreeFcn psMemGetDeallocator(psPtr vptr) 659 659 { 660 660 if (vptr == NULL) { -
trunk/psLib/src/sysUtils/psMemory.h
r3264 r3682 12 12 * @ingroup MemoryManagement 13 13 * 14 * @version $Revision: 1.3 5$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 2-17 19:26:24$14 * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-04-07 20:27:41 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 150 150 * 151 151 */ 152 void p _psMemSetDeallocator(152 void psMemSetDeallocator( 153 153 psPtr ptr, ///< the memory block to operate on 154 154 psFreeFcn freeFcn ///< the function to be executed at deallocation … … 164 164 * @return psFreeFcn the routine to be called at deallocation. 165 165 */ 166 psFreeFcn p _psMemGetDeallocator(166 psFreeFcn psMemGetDeallocator( 167 167 psPtr ptr ///< the memory block 168 168 ); -
trunk/psLib/src/sysUtils/psTrace.c
r3541 r3682 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.4 4$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 3-29 21:31:54$11 * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 67 67 68 68 p_psMemSetPersistent(comp,true); 69 p _psMemSetDeallocator(comp, (psFreeFcn) componentFree);69 psMemSetDeallocator(comp, (psFreeFcn) componentFree); 70 70 comp->name = psStringCopy(name); 71 71 p_psMemSetPersistent((psPtr)comp->name,true); -
trunk/psLib/src/types/psArray.c
r3286 r3682 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.2 6$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 2-18 22:17:20$11 * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-04-07 20:27:41 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 55 55 // Create vector struct 56 56 psArr = (psArray* ) psAlloc(sizeof(psArray)); 57 p _psMemSetDeallocator(psArr, (psFreeFcn) arrayFree);57 psMemSetDeallocator(psArr, (psFreeFcn) arrayFree); 58 58 59 59 psArr->nalloc = nalloc; -
trunk/psLib/src/types/psBitSet.c
r3298 r3682 11 11 * @author Robert DeSonia, MHPCC 12 12 * 13 * @version $Revision: 1.2 3$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 2-22 19:25:52$13 * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-04-07 20:27:41 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 80 80 numBytes = ceil(n / 8.0); 81 81 newObj = psAlloc(sizeof(psBitSet)); 82 p _psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree);82 psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree); 83 83 newObj->n = numBytes; 84 84 -
trunk/psLib/src/types/psHash.c
r3286 r3682 12 12 * @author Robert DeSonia, MHPCC 13 13 * 14 * @version $Revision: 1.1 3$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 2-18 22:17:20$14 * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-04-07 20:27:41 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 90 90 psHashBucket* bucket = psAlloc(sizeof(psHashBucket)); 91 91 92 p _psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree);92 psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree); 93 93 94 94 // Initialize the bucket. … … 141 141 psHash* table = psAlloc(sizeof(psHash)); 142 142 143 p _psMemSetDeallocator(table, (psFreeFcn) hashFree);143 psMemSetDeallocator(table, (psFreeFcn) hashFree); 144 144 145 145 // Allocate memory for the buckets. -
trunk/psLib/src/types/psList.c
r3264 r3682 6 6 * @author Robert Daniel DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1.3 4$ $Name: not supported by cvs2svn $9 * @date $Date: 2005-0 2-17 19:26:23$8 * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2005-04-07 20:27:41 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 45 45 psArray* iterators = list->iterators; 46 46 for (int i = 0; i < iterators->n; i++) { 47 p _psMemSetDeallocator(iterators->data[i], NULL);47 psMemSetDeallocator(iterators->data[i], NULL); 48 48 } 49 49 … … 129 129 psList* list = psAlloc(sizeof(psList)); 130 130 131 p _psMemSetDeallocator(list, (psFreeFcn) listFree);131 psMemSetDeallocator(list, (psFreeFcn) listFree); 132 132 133 133 list->size = 0; … … 153 153 psListIterator* iter = psAlloc(sizeof(psListIterator)); 154 154 155 p _psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree);155 psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree); 156 156 157 157 // initialize the attributes -
trunk/psLib/src/types/psLookupTable.c
r3586 r3682 7 7 * @author Ross Harman, MHPCC 8 8 * 9 * @version $Revision: 1.1 1$ $Name: not supported by cvs2svn $10 * @date $Date: 2005-0 3-31 02:33:17$9 * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ 10 * @date $Date: 2005-04-07 20:27:41 $ 11 11 * 12 12 * Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii … … 421 421 422 422 // Set deallocator 423 p _psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree);423 psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree); 424 424 425 425 // Allocate and set metadata item comment -
trunk/psLib/src/types/psMetadata.c
r3541 r3682 12 12 * @author Ross Harman, MHPCC 13 13 * 14 * @version $Revision: 1.5 7$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-0 3-29 21:31:54$14 * @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-04-07 20:27:41 $ 16 16 * 17 17 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 183 183 184 184 // Set deallocator 185 p _psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree);185 psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); 186 186 187 187 // Allocate and set metadata item comment … … 252 252 metadata = (psMetadata*) psAlloc(sizeof(psMetadata)); 253 253 // Set deallocator 254 p _psMemSetDeallocator(metadata, (psFreeFcn) metadataFree);254 psMemSetDeallocator(metadata, (psFreeFcn) metadataFree); 255 255 256 256 // Allocate metadata's internal containers … … 598 598 599 599 // Set deallocator 600 p _psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree);600 psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree); 601 601 602 602 if (regex == NULL) {
Note:
See TracChangeset
for help on using the changeset viewer.
