Index: /trunk/psLib/Makefile.am =================================================================== --- /trunk/psLib/Makefile.am (revision 3681) +++ /trunk/psLib/Makefile.am (revision 3682) @@ -14,11 +14,11 @@ $(prefix)/docs/pslib: - mkdir -p $(prefix)/docs/pslib + mkdir -p -m 755 $(prefix)/docs/pslib $(mandir)/man3: - mkdir -p $(mandir)/man3 + mkdir -p -m 755 $(mandir)/man3 $(datadir)/pslib: - mkdir -p $(datadir)/pslib + mkdir -p -m 755 $(datadir)/pslib install-data-hook: $(datadir)/pslib @@ -26,5 +26,5 @@ uninstall-hook: - if [ `pwd`/share != $(datadir) ] ; then rm -rf $(datadir)/pslib ; fi + if [ `pwd`/share/pslib != $(datadir) ] ; then rm -rf $(datadir) ; fi rm -rf $(prefix)/docs/pslib/* @@ -32,2 +32,8 @@ test: check + +distuninstallcheck_listfiles = \ + `find . -name .packlist -or -name perllocal.pod -or -name pslib.bs -or -name pslib.so -or -name pslib.pm` + +distuninstallcheck: + @: Index: /trunk/psLib/configure.ac =================================================================== --- /trunk/psLib/configure.ac (revision 3681) +++ /trunk/psLib/configure.ac (revision 3682) @@ -1,5 +1,5 @@ -AC_INIT([pslib],[0.5.0],[www.pan-starrs.org/bugzilla]) +AC_INIT([pslib],[0.5.1],[www.pan-starrs.org/bugzilla]) AM_CONFIG_HEADER(src/config.h) -AM_INIT_AUTOMAKE(pslib, 0.5.0) +AM_INIT_AUTOMAKE(pslib, 0.5.1) PSLIB_LT_VERSION="0:5:0" Index: /trunk/psLib/etc/pslib/Makefile.am =================================================================== --- /trunk/psLib/etc/pslib/Makefile.am (revision 3681) +++ /trunk/psLib/etc/pslib/Makefile.am (revision 3682) @@ -11,11 +11,11 @@ $(sysconfdir)/pslib: - mkdir -p $(sysconfdir)/pslib - -install-data-hook: psTime.config $(sysconfdir)/pslib + mkdir -p -m 755 $(sysconfdir)/pslib + +install-exec-hook: psTime.config $(sysconfdir)/pslib if [ `pwd` != $(sysconfdir)/pslib ] ; then $(INSTALL) $(srcdir)/psTime.xml psTime.config $(sysconfdir)/pslib ; fi -uninstall-hook: - if [ `pwd` != $(sysconfdir)/pslib ] ; then rm -rf $(sysconfdir)/pslib ; fi +uninstall-local: + if [ `pwd` != $(sysconfdir) ] ; then rm -rf $(sysconfdir) ; fi Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 3681) +++ /trunk/psLib/pslib.kdevses (revision 3682) @@ -2,18 +2,5 @@ - - - - - - - - - - - - - - + Index: /trunk/psLib/src/Makefile.am =================================================================== --- /trunk/psLib/src/Makefile.am (revision 3681) +++ /trunk/psLib/src/Makefile.am (revision 3682) @@ -28,5 +28,6 @@ pslibinclude_HEADERS = \ psTest.h \ - pslib.h + pslib.h \ + pslib_strict.h install-exec-hook: libpslib.la Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 3681) +++ /trunk/psLib/src/astro/psCoord.c (revision 3682) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 23:01:46 $ +* @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -214,5 +214,5 @@ psPlane *p = psAlloc(sizeof(psPlane)); - p_psMemSetDeallocator(p, (psFreeFcn) planeFree); + psMemSetDeallocator(p, (psFreeFcn) planeFree); return(p); } @@ -228,5 +228,5 @@ psSphere *s = psAlloc(sizeof(psSphere)); - p_psMemSetDeallocator(s, (psFreeFcn) sphereFree); + psMemSetDeallocator(s, (psFreeFcn) sphereFree); return(s); } @@ -247,5 +247,5 @@ pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD); - p_psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree); + psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree); return(pt); } @@ -293,5 +293,5 @@ pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD); - p_psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree); + psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree); return(pt); } @@ -508,5 +508,5 @@ p->type = type; - p_psMemSetDeallocator(p, (psFreeFcn) projectionFree); + psMemSetDeallocator(p, (psFreeFcn) projectionFree); return(p); } Index: /trunk/psLib/src/astronomy/psAstrometry.c =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.c (revision 3681) +++ /trunk/psLib/src/astronomy/psAstrometry.c (revision 3682) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 23:01:46 $ + * @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -191,5 +191,5 @@ } - p_psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree); + psMemSetDeallocator(tmp,(psFreeFcn)fixedPatternFree); return(tmp); @@ -238,5 +238,5 @@ exp->telescopeName = NULL; - p_psMemSetDeallocator(exp,(psFreeFcn)exposureFree); + psMemSetDeallocator(exp,(psFreeFcn)exposureFree); return exp; @@ -263,5 +263,5 @@ *(double *)&obs->tlr = tlr; - p_psMemSetDeallocator(obs,(psFreeFcn)observatoryFree); + psMemSetDeallocator(obs,(psFreeFcn)observatoryFree); return obs; @@ -304,5 +304,5 @@ newFPA->chi2 = 0.0f; - p_psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree); + psMemSetDeallocator(newFPA,(psFreeFcn)FPAFree); return newFPA; @@ -338,5 +338,5 @@ chip->parent = parentFPA; - p_psMemSetDeallocator(chip,(psFreeFcn)chipFree); + psMemSetDeallocator(chip,(psFreeFcn)chipFree); return chip; @@ -376,5 +376,5 @@ cell->parent = parentChip; - p_psMemSetDeallocator(cell,(psFreeFcn)cellFree); + psMemSetDeallocator(cell,(psFreeFcn)cellFree); return cell; @@ -399,5 +399,5 @@ readout->metadata = NULL; - p_psMemSetDeallocator(readout,(psFreeFcn)readoutFree); + psMemSetDeallocator(readout,(psFreeFcn)readoutFree); return readout; Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 3681) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 3682) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 23:01:46 $ +* @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -214,5 +214,5 @@ psPlane *p = psAlloc(sizeof(psPlane)); - p_psMemSetDeallocator(p, (psFreeFcn) planeFree); + psMemSetDeallocator(p, (psFreeFcn) planeFree); return(p); } @@ -228,5 +228,5 @@ psSphere *s = psAlloc(sizeof(psSphere)); - p_psMemSetDeallocator(s, (psFreeFcn) sphereFree); + psMemSetDeallocator(s, (psFreeFcn) sphereFree); return(s); } @@ -247,5 +247,5 @@ pt->y = psDPolynomial2DAlloc(n1, n2, PS_POLYNOMIAL_ORD); - p_psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree); + psMemSetDeallocator(pt, (psFreeFcn) planeTransformFree); return(pt); } @@ -293,5 +293,5 @@ pt->y = psDPolynomial4DAlloc(n1, n2, n3, n4, PS_POLYNOMIAL_ORD); - p_psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree); + psMemSetDeallocator(pt, (psFreeFcn) planeDistortFree); return(pt); } @@ -508,5 +508,5 @@ p->type = type; - p_psMemSetDeallocator(p, (psFreeFcn) projectionFree); + psMemSetDeallocator(p, (psFreeFcn) projectionFree); return(p); } Index: /trunk/psLib/src/astronomy/psMetadata.c =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.c (revision 3681) +++ /trunk/psLib/src/astronomy/psMetadata.c (revision 3682) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-29 21:31:54 $ +* @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -183,5 +183,5 @@ // Set deallocator - p_psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); + psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); // Allocate and set metadata item comment @@ -252,5 +252,5 @@ metadata = (psMetadata*) psAlloc(sizeof(psMetadata)); // Set deallocator - p_psMemSetDeallocator(metadata, (psFreeFcn) metadataFree); + psMemSetDeallocator(metadata, (psFreeFcn) metadataFree); // Allocate metadata's internal containers @@ -598,5 +598,5 @@ // Set deallocator - p_psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree); + psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree); if (regex == NULL) { Index: /trunk/psLib/src/collections/psArray.c =================================================================== --- /trunk/psLib/src/collections/psArray.c (revision 3681) +++ /trunk/psLib/src/collections/psArray.c (revision 3682) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-18 22:17:20 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -55,5 +55,5 @@ // Create vector struct psArr = (psArray* ) psAlloc(sizeof(psArray)); - p_psMemSetDeallocator(psArr, (psFreeFcn) arrayFree); + psMemSetDeallocator(psArr, (psFreeFcn) arrayFree); psArr->nalloc = nalloc; Index: /trunk/psLib/src/collections/psBitSet.c =================================================================== --- /trunk/psLib/src/collections/psBitSet.c (revision 3681) +++ /trunk/psLib/src/collections/psBitSet.c (revision 3682) @@ -11,6 +11,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-22 19:25:52 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -80,5 +80,5 @@ numBytes = ceil(n / 8.0); newObj = psAlloc(sizeof(psBitSet)); - p_psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree); + psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree); newObj->n = numBytes; Index: /trunk/psLib/src/collections/psHash.c =================================================================== --- /trunk/psLib/src/collections/psHash.c (revision 3681) +++ /trunk/psLib/src/collections/psHash.c (revision 3682) @@ -12,6 +12,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-18 22:17:20 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -90,5 +90,5 @@ psHashBucket* bucket = psAlloc(sizeof(psHashBucket)); - p_psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree); + psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree); // Initialize the bucket. @@ -141,5 +141,5 @@ psHash* table = psAlloc(sizeof(psHash)); - p_psMemSetDeallocator(table, (psFreeFcn) hashFree); + psMemSetDeallocator(table, (psFreeFcn) hashFree); // Allocate memory for the buckets. Index: /trunk/psLib/src/collections/psList.c =================================================================== --- /trunk/psLib/src/collections/psList.c (revision 3681) +++ /trunk/psLib/src/collections/psList.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -45,5 +45,5 @@ psArray* iterators = list->iterators; for (int i = 0; i < iterators->n; i++) { - p_psMemSetDeallocator(iterators->data[i], NULL); + psMemSetDeallocator(iterators->data[i], NULL); } @@ -129,5 +129,5 @@ psList* list = psAlloc(sizeof(psList)); - p_psMemSetDeallocator(list, (psFreeFcn) listFree); + psMemSetDeallocator(list, (psFreeFcn) listFree); list->size = 0; @@ -153,5 +153,5 @@ psListIterator* iter = psAlloc(sizeof(psListIterator)); - p_psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree); + psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree); // initialize the attributes Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 3681) +++ /trunk/psLib/src/collections/psMetadata.c (revision 3682) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-29 21:31:54 $ +* @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -183,5 +183,5 @@ // Set deallocator - p_psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); + psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); // Allocate and set metadata item comment @@ -252,5 +252,5 @@ metadata = (psMetadata*) psAlloc(sizeof(psMetadata)); // Set deallocator - p_psMemSetDeallocator(metadata, (psFreeFcn) metadataFree); + psMemSetDeallocator(metadata, (psFreeFcn) metadataFree); // Allocate metadata's internal containers @@ -598,5 +598,5 @@ // Set deallocator - p_psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree); + psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree); if (regex == NULL) { Index: /trunk/psLib/src/collections/psVector.c =================================================================== --- /trunk/psLib/src/collections/psVector.c (revision 3681) +++ /trunk/psLib/src/collections/psVector.c (revision 3682) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-22 21:52:49 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -51,5 +51,5 @@ // Create vector struct psVec = (psVector* ) psAlloc(sizeof(psVector)); - p_psMemSetDeallocator(psVec, (psFreeFcn) vectorFree); + psMemSetDeallocator(psVec, (psFreeFcn) vectorFree); psVec->type.dimen = PS_DIMEN_VECTOR; Index: /trunk/psLib/src/dataIO/psFits.c =================================================================== --- /trunk/psLib/src/dataIO/psFits.c (revision 3681) +++ /trunk/psLib/src/dataIO/psFits.c (revision 3682) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-06 01:12:58 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -249,5 +249,5 @@ fits->p_fd = fptr; strcpy((char*)fits->filename,name); - p_psMemSetDeallocator(fits,(psFreeFcn)fitsFree); + psMemSetDeallocator(fits,(psFreeFcn)fitsFree); return fits; Index: /trunk/psLib/src/dataIO/psLookupTable.c =================================================================== --- /trunk/psLib/src/dataIO/psLookupTable.c (revision 3681) +++ /trunk/psLib/src/dataIO/psLookupTable.c (revision 3682) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 02:33:17 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii @@ -421,5 +421,5 @@ // Set deallocator - p_psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree); + psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree); // Allocate and set metadata item comment Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 3681) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 3682) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.95 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-06 01:12:58 $ + * @version $Revision: 1.96 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1048,5 +1048,5 @@ newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); newPoly->type = type; @@ -1075,5 +1075,5 @@ newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); newPoly->type = type; @@ -1113,5 +1113,5 @@ newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); newPoly->type = type; @@ -1161,5 +1161,5 @@ newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); newPoly->type = type; @@ -1410,5 +1410,5 @@ newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); newPoly->type = type; @@ -1437,5 +1437,5 @@ newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); newPoly->type = type; @@ -1475,5 +1475,5 @@ newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); newPoly->type = type; @@ -1523,5 +1523,5 @@ newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); newPoly->type = type; @@ -1829,5 +1829,5 @@ tmp->knots->data.F32[numSplines] = max; - p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); + psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); return(tmp); } @@ -1872,5 +1872,5 @@ } - p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); + psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); return(tmp); } Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 3681) +++ /trunk/psLib/src/dataManip/psStats.c (revision 3682) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.124 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-29 22:51:24 $ + * @version $Revision: 1.125 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1833,5 +1833,5 @@ // bins, then there are N+1 bounds to those bins. newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); - p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); + psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32); newHist->bounds->n = newHist->bounds->nalloc; @@ -1880,5 +1880,5 @@ // Allocate memory for the new histogram structure. newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); - p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); + psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32); newHist->bounds->n = newHist->bounds->nalloc; Index: /trunk/psLib/src/fileUtils/psFits.c =================================================================== --- /trunk/psLib/src/fileUtils/psFits.c (revision 3681) +++ /trunk/psLib/src/fileUtils/psFits.c (revision 3682) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-06 01:12:58 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -249,5 +249,5 @@ fits->p_fd = fptr; strcpy((char*)fits->filename,name); - p_psMemSetDeallocator(fits,(psFreeFcn)fitsFree); + psMemSetDeallocator(fits,(psFreeFcn)fitsFree); return fits; Index: /trunk/psLib/src/fileUtils/psLookupTable.c =================================================================== --- /trunk/psLib/src/fileUtils/psLookupTable.c (revision 3681) +++ /trunk/psLib/src/fileUtils/psLookupTable.c (revision 3682) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 02:33:17 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii @@ -421,5 +421,5 @@ // Set deallocator - p_psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree); + psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree); // Allocate and set metadata item comment Index: /trunk/psLib/src/fits/psFits.c =================================================================== --- /trunk/psLib/src/fits/psFits.c (revision 3681) +++ /trunk/psLib/src/fits/psFits.c (revision 3682) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-06 01:12:58 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -249,5 +249,5 @@ fits->p_fd = fptr; strcpy((char*)fits->filename,name); - p_psMemSetDeallocator(fits,(psFreeFcn)fitsFree); + psMemSetDeallocator(fits,(psFreeFcn)fitsFree); return fits; Index: /trunk/psLib/src/image/psImage.c =================================================================== --- /trunk/psLib/src/image/psImage.c (revision 3681) +++ /trunk/psLib/src/image/psImage.c (revision 3682) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-06 01:12:58 $ + * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ psImage* image = (psImage* ) psAlloc(sizeof(psImage)); - p_psMemSetDeallocator(image, (psFreeFcn) imageFree); + psMemSetDeallocator(image, (psFreeFcn) imageFree); image->data.V = psAlloc(sizeof(psPtr ) * numRows); Index: /trunk/psLib/src/image/psImageConvolve.c =================================================================== --- /trunk/psLib/src/image/psImageConvolve.c (revision 3681) +++ /trunk/psLib/src/image/psImageConvolve.c (revision 3682) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-11 20:27:34 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -75,5 +75,5 @@ result->kernel = kernelRows - yMin; - p_psMemSetDeallocator(result,(psFreeFcn)freeKernel); + psMemSetDeallocator(result,(psFreeFcn)freeKernel); return result; Index: /trunk/psLib/src/image/psImageExtraction.c =================================================================== --- /trunk/psLib/src/image/psImageExtraction.c (revision 3681) +++ /trunk/psLib/src/image/psImageExtraction.c (revision 3682) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -105,5 +105,5 @@ // set the new psImage's deallocator to the same as the input image - p_psMemSetDeallocator(out,p_psMemGetDeallocator(image)); + psMemSetDeallocator(out,psMemGetDeallocator(image)); inputColOffset = elementSize * col0; Index: /trunk/psLib/src/imageops/psImageConvolve.c =================================================================== --- /trunk/psLib/src/imageops/psImageConvolve.c (revision 3681) +++ /trunk/psLib/src/imageops/psImageConvolve.c (revision 3682) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-11 20:27:34 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -75,5 +75,5 @@ result->kernel = kernelRows - yMin; - p_psMemSetDeallocator(result,(psFreeFcn)freeKernel); + psMemSetDeallocator(result,(psFreeFcn)freeKernel); return result; Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 3681) +++ /trunk/psLib/src/math/psPolynomial.c (revision 3682) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.95 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-06 01:12:58 $ + * @version $Revision: 1.96 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1048,5 +1048,5 @@ newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); newPoly->type = type; @@ -1075,5 +1075,5 @@ newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); newPoly->type = type; @@ -1113,5 +1113,5 @@ newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); newPoly->type = type; @@ -1161,5 +1161,5 @@ newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); newPoly->type = type; @@ -1410,5 +1410,5 @@ newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); newPoly->type = type; @@ -1437,5 +1437,5 @@ newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); newPoly->type = type; @@ -1475,5 +1475,5 @@ newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); newPoly->type = type; @@ -1523,5 +1523,5 @@ newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); newPoly->type = type; @@ -1829,5 +1829,5 @@ tmp->knots->data.F32[numSplines] = max; - p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); + psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); return(tmp); } @@ -1872,5 +1872,5 @@ } - p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); + psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); return(tmp); } Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 3681) +++ /trunk/psLib/src/math/psSpline.c (revision 3682) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.95 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-06 01:12:58 $ + * @version $Revision: 1.96 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1048,5 +1048,5 @@ newPoly = (psPolynomial1D* ) psAlloc(sizeof(psPolynomial1D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial1DFree); newPoly->type = type; @@ -1075,5 +1075,5 @@ newPoly = (psPolynomial2D* ) psAlloc(sizeof(psPolynomial2D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial2DFree); newPoly->type = type; @@ -1113,5 +1113,5 @@ newPoly = (psPolynomial3D* ) psAlloc(sizeof(psPolynomial3D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial3DFree); newPoly->type = type; @@ -1161,5 +1161,5 @@ newPoly = (psPolynomial4D* ) psAlloc(sizeof(psPolynomial4D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) polynomial4DFree); newPoly->type = type; @@ -1410,5 +1410,5 @@ newPoly = (psDPolynomial1D* ) psAlloc(sizeof(psDPolynomial1D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial1DFree); newPoly->type = type; @@ -1437,5 +1437,5 @@ newPoly = (psDPolynomial2D* ) psAlloc(sizeof(psDPolynomial2D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial2DFree); newPoly->type = type; @@ -1475,5 +1475,5 @@ newPoly = (psDPolynomial3D* ) psAlloc(sizeof(psDPolynomial3D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial3DFree); newPoly->type = type; @@ -1523,5 +1523,5 @@ newPoly = (psDPolynomial4D* ) psAlloc(sizeof(psDPolynomial4D)); - p_psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); + psMemSetDeallocator(newPoly, (psFreeFcn) dPolynomial4DFree); newPoly->type = type; @@ -1829,5 +1829,5 @@ tmp->knots->data.F32[numSplines] = max; - p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); + psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); return(tmp); } @@ -1872,5 +1872,5 @@ } - p_psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); + psMemSetDeallocator(tmp,(psFreeFcn)spline1DFree); return(tmp); } Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 3681) +++ /trunk/psLib/src/math/psStats.c (revision 3682) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.124 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-29 22:51:24 $ + * @version $Revision: 1.125 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1833,5 +1833,5 @@ // bins, then there are N+1 bounds to those bins. newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); - p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); + psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); newHist->bounds = psVectorAlloc(n + 1, PS_TYPE_F32); newHist->bounds->n = newHist->bounds->nalloc; @@ -1880,5 +1880,5 @@ // Allocate memory for the new histogram structure. newHist = (psHistogram* ) psAlloc(sizeof(psHistogram)); - p_psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); + psMemSetDeallocator(newHist, (psFreeFcn) histogramFree); newHist->bounds = psVectorAlloc(bounds->n, PS_TYPE_F32); newHist->bounds->n = newHist->bounds->nalloc; Index: /trunk/psLib/src/mathtypes/psImage.c =================================================================== --- /trunk/psLib/src/mathtypes/psImage.c (revision 3681) +++ /trunk/psLib/src/mathtypes/psImage.c (revision 3682) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.62 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-06 01:12:58 $ + * @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ psImage* image = (psImage* ) psAlloc(sizeof(psImage)); - p_psMemSetDeallocator(image, (psFreeFcn) imageFree); + psMemSetDeallocator(image, (psFreeFcn) imageFree); image->data.V = psAlloc(sizeof(psPtr ) * numRows); Index: /trunk/psLib/src/mathtypes/psVector.c =================================================================== --- /trunk/psLib/src/mathtypes/psVector.c (revision 3681) +++ /trunk/psLib/src/mathtypes/psVector.c (revision 3682) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-22 21:52:49 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -51,5 +51,5 @@ // Create vector struct psVec = (psVector* ) psAlloc(sizeof(psVector)); - p_psMemSetDeallocator(psVec, (psFreeFcn) vectorFree); + psMemSetDeallocator(psVec, (psFreeFcn) vectorFree); psVec->type.dimen = PS_DIMEN_VECTOR; Index: /trunk/psLib/src/pslib.h =================================================================== --- /trunk/psLib/src/pslib.h (revision 3681) +++ /trunk/psLib/src/pslib.h (revision 3682) @@ -1,3 +1,2 @@ - /** @file pslib.h * @@ -9,6 +8,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 23:01:46 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -18,168 +17,5 @@ #define PS_LIB_H -/******************************************************************************/ - -/* INCLUDE FILES */ - -/******************************************************************************/ - -// // System Utilities - -/// @defgroup SysUtils System Utilities -/// @{ - -/** @defgroup MemoryManagement Memory Management Utilities - * - * This is the generic memory management system put inbetween the user's high level code and the OS-level - * memory allocation routines. This system adds such features as callback routines for memory error events, - * tracing capabilities, and reference counting. - * - * @ingroup SysUtils - */ - -#include "fitsio.h" - -#include "psMemory.h" - -/// @defgroup LogTrace Tracing and Logging -/// @ingroup SysUtils -#include "psLogMsg.h" -#include "psTrace.h" - -/// @defgroup ErrorHandling Error Handling -/// @ingroup SysUtils -#include "psAbort.h" -#include "psError.h" - -#include "psString.h" - -/// @defgroup Configure Configure psLib -/// @ingroup SysUtils -#include "psConfigure.h" - -/// @} - -// Collections -/// @defgroup DataContainer Data Containers -/// @{ - -#include "psType.h" - -/// @defgroup LinkedList Linked List -/// @ingroup DataContainer -#include "psList.h" - -/// @defgroup HashTable Hash Table -/// @ingroup DataContainer -#include "psHash.h" - -/// @defgroup Scalar Scalar -/// @ingroup DataContainer -#include "psScalar.h" - -/// @defgroup Vector Vector Container -/// @ingroup DataContainer -#include "psVector.h" - -/// @defgroup Array Array Container -/// @ingroup DataContainer -#include "psArray.h" - -/// @defgroup Image Image Container -/// @ingroup DataContainer -/// @{ -#include "psImage.h" -#include "psImageExtraction.h" -#include "psImageManip.h" -#include "psImageConvolve.h" - -/// @defgroup ImageIO Image File I/O Functions -/// @ingroup Image -#include "psImageIO.h" - -/// @defgroup ImageStats Image Statistical Functions -/// @ingroup Image -#include "psImageStats.h" - -/// @} - -/// @defgroup BitSet Bit Set Container -/// @ingroup DataContainer -#include "psBitSet.h" - -/// @} - -// Data Manipulation -/// @defgroup DataManip Data Manipulation -/// @{ - -/// @defgroup Compare Comparison Functions -/// @ingroup DataManip -#include "psCompare.h" - -/// @defgroup Stats Statistic Functions -/// @ingroup DataManip -#include "psStats.h" - -/// @defgroup Matrix Matrix Operations -/// @ingroup DataManip -#include "psMatrix.h" - -/// @defgroup MatrixArithmetic Matrix Arithmetic Operations -/// @ingroup DataManip -#include "psBinaryOp.h" -#include "psUnaryOp.h" - -#include "psRandom.h" - -/// @defgroup Transform Fourier Transform Operations -/// @ingroup DataManip -#include "psVectorFFT.h" -#include "psImageFFT.h" - -#include "psFunctions.h" -#include "psMinimize.h" - -/// @} - -// Astronomy -/// @defgroup Astronomy Astronomy Functions -/// @{ - -/// @defgroup CoordinateTransform Coordinate Functions -/// @ingroup Astronomy -#include "psCoord.h" - -/// @defgroup Photometry Photometry -/// @ingroup Astronomy -#include "psPhotometry.h" - -/// @defgroup Time Time Functions -/// @ingroup Astronomy -#include "psTime.h" - -/// @defgroup Metadata Metadata Functions -/// @ingroup Astronomy -#include "psMetadata.h" -#include "psMetadataIO.h" - -/// @defgroup AstroImage Astrometry Functions -/// @ingroup Astronomy -#include "psAstrometry.h" -#include "psConstants.h" -#include "psDB.h" - -/// @} - -// FileUtils -/// @defgroup FileUtils File Utilities -/// @{ -#include "psFits.h" - -/// @defgroup LookupTable Lookup Table -/// @ingroup FileUtils -#include "psLookupTable.h" - -/// @} +#include "pslib_strict.h" #endif Index: /trunk/psLib/src/pslib_strict.h =================================================================== --- /trunk/psLib/src/pslib_strict.h (revision 3682) +++ /trunk/psLib/src/pslib_strict.h (revision 3682) @@ -0,0 +1,187 @@ +/** @file pslib_strict.h +* +* @brief Contains the complete list of header files for pslib while poisoning +* the use of standard memory allocation routines. +* +* This header file includes all the necessary header files for a user to +* user all public functions within the pslib library. +* +* @author Eric Van Alst, MHPCC +* +* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ +* +* Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii +*/ + +#ifndef PS_LIB_STRICT_H +#define PS_LIB_STRICT_H + +#ifdef PS_LIB_H /* this is included from pslib.h, so don't poison anything */ +#ifndef PS_ALLOW_MALLOC +#define PS_ALLOW_MALLOC +#endif +#else +#undef PS_ALLOW_MALLOC /* don't allow code to not poison malloc, i.e., strict poisioning */ +#endif + +// // System Utilities + +/// @defgroup SysUtils System Utilities +/// @{ + +/** @defgroup MemoryManagement Memory Management Utilities + * + * This is the generic memory management system put inbetween the user's high level code and the OS-level + * memory allocation routines. This system adds such features as callback routines for memory error events, + * tracing capabilities, and reference counting. + * + * @ingroup SysUtils + */ + +#include "fitsio.h" + +#include "psMemory.h" + +/// @defgroup LogTrace Tracing and Logging +/// @ingroup SysUtils +#include "psLogMsg.h" +#include "psTrace.h" + +/// @defgroup ErrorHandling Error Handling +/// @ingroup SysUtils +#include "psAbort.h" +#include "psError.h" + +#include "psString.h" + +/// @defgroup Configure Configure psLib +/// @ingroup SysUtils +#include "psConfigure.h" + +/// @} + +// Collections +/// @defgroup DataContainer Data Containers +/// @{ + +#include "psType.h" + +/// @defgroup LinkedList Linked List +/// @ingroup DataContainer +#include "psList.h" + +/// @defgroup HashTable Hash Table +/// @ingroup DataContainer +#include "psHash.h" + +/// @defgroup Scalar Scalar +/// @ingroup DataContainer +#include "psScalar.h" + +/// @defgroup Vector Vector Container +/// @ingroup DataContainer +#include "psVector.h" + +/// @defgroup Array Array Container +/// @ingroup DataContainer +#include "psArray.h" + +/// @defgroup Image Image Container +/// @ingroup DataContainer +/// @{ +#include "psImage.h" +#include "psImageExtraction.h" +#include "psImageManip.h" +#include "psImageConvolve.h" + +/// @defgroup ImageIO Image File I/O Functions +/// @ingroup Image +#include "psImageIO.h" + +/// @defgroup ImageStats Image Statistical Functions +/// @ingroup Image +#include "psImageStats.h" + +/// @} + +/// @defgroup BitSet Bit Set Container +/// @ingroup DataContainer +#include "psBitSet.h" + +/// @} + +// Data Manipulation +/// @defgroup DataManip Data Manipulation +/// @{ + +/// @defgroup Compare Comparison Functions +/// @ingroup DataManip +#include "psCompare.h" + +/// @defgroup Stats Statistic Functions +/// @ingroup DataManip +#include "psStats.h" + +/// @defgroup Matrix Matrix Operations +/// @ingroup DataManip +#include "psMatrix.h" + +/// @defgroup MatrixArithmetic Matrix Arithmetic Operations +/// @ingroup DataManip +#include "psBinaryOp.h" +#include "psUnaryOp.h" + +#include "psRandom.h" + +/// @defgroup Transform Fourier Transform Operations +/// @ingroup DataManip +#include "psVectorFFT.h" +#include "psImageFFT.h" + +#include "psFunctions.h" +#include "psMinimize.h" + +/// @} + +// Astronomy +/// @defgroup Astronomy Astronomy Functions +/// @{ + +/// @defgroup CoordinateTransform Coordinate Functions +/// @ingroup Astronomy +#include "psCoord.h" + +/// @defgroup Photometry Photometry +/// @ingroup Astronomy +#include "psPhotometry.h" + +/// @defgroup Time Time Functions +/// @ingroup Astronomy +#include "psTime.h" + +/// @defgroup Metadata Metadata Functions +/// @ingroup Astronomy +#include "psMetadata.h" +#include "psMetadataIO.h" + +/// @defgroup AstroImage Astrometry Functions +/// @ingroup Astronomy +#include "psAstrometry.h" +#include "psConstants.h" +#include "psDB.h" + +/// @} + +// FileUtils +/// @defgroup FileUtils File Utilities +/// @{ +#include "psFits.h" + +/// @defgroup LookupTable Lookup Table +/// @ingroup FileUtils +#include "psLookupTable.h" + +/// @} + +#endif Index: /trunk/psLib/src/sys/psError.c =================================================================== --- /trunk/psLib/src/sys/psError.c (revision 3681) +++ /trunk/psLib/src/sys/psError.c (revision 3682) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -62,5 +62,5 @@ err->code = code; - p_psMemSetDeallocator(err,(psFreeFcn)errFree); + psMemSetDeallocator(err,(psFreeFcn)errFree); return err; Index: /trunk/psLib/src/sys/psErrorCodes.c =================================================================== --- /trunk/psLib/src/sys/psErrorCodes.c (revision 3681) +++ /trunk/psLib/src/sys/psErrorCodes.c (revision 3682) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -105,5 +105,5 @@ } - p_psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription); + psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription); return err; } Index: /trunk/psLib/src/sys/psMemory.c =================================================================== --- /trunk/psLib/src/sys/psMemory.c (revision 3681) +++ /trunk/psLib/src/sys/psMemory.c (revision 3682) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 02:32:20 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -641,5 +641,5 @@ } -void p_psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn) +void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn) { if (vptr == NULL) { @@ -656,5 +656,5 @@ } -psFreeFcn p_psMemGetDeallocator(psPtr vptr) +psFreeFcn psMemGetDeallocator(psPtr vptr) { if (vptr == NULL) { Index: /trunk/psLib/src/sys/psMemory.h =================================================================== --- /trunk/psLib/src/sys/psMemory.h (revision 3681) +++ /trunk/psLib/src/sys/psMemory.h (revision 3682) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -150,5 +150,5 @@ * */ -void p_psMemSetDeallocator( +void psMemSetDeallocator( psPtr ptr, ///< the memory block to operate on psFreeFcn freeFcn ///< the function to be executed at deallocation @@ -164,5 +164,5 @@ * @return psFreeFcn the routine to be called at deallocation. */ -psFreeFcn p_psMemGetDeallocator( +psFreeFcn psMemGetDeallocator( psPtr ptr ///< the memory block ); Index: /trunk/psLib/src/sys/psTrace.c =================================================================== --- /trunk/psLib/src/sys/psTrace.c (revision 3681) +++ /trunk/psLib/src/sys/psTrace.c (revision 3682) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-29 21:31:54 $ + * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ p_psMemSetPersistent(comp,true); - p_psMemSetDeallocator(comp, (psFreeFcn) componentFree); + psMemSetDeallocator(comp, (psFreeFcn) componentFree); comp->name = psStringCopy(name); p_psMemSetPersistent((psPtr)comp->name,true); Index: /trunk/psLib/src/sysUtils/psError.c =================================================================== --- /trunk/psLib/src/sysUtils/psError.c (revision 3681) +++ /trunk/psLib/src/sysUtils/psError.c (revision 3682) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-22 21:52:49 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -62,5 +62,5 @@ err->code = code; - p_psMemSetDeallocator(err,(psFreeFcn)errFree); + psMemSetDeallocator(err,(psFreeFcn)errFree); return err; Index: /trunk/psLib/src/sysUtils/psErrorCodes.c =================================================================== --- /trunk/psLib/src/sysUtils/psErrorCodes.c (revision 3681) +++ /trunk/psLib/src/sysUtils/psErrorCodes.c (revision 3682) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -105,5 +105,5 @@ } - p_psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription); + psMemSetDeallocator(err,(psFreeFcn)freeErrorDescription); return err; } Index: /trunk/psLib/src/sysUtils/psMemory.c =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.c (revision 3681) +++ /trunk/psLib/src/sysUtils/psMemory.c (revision 3682) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 02:32:20 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -641,5 +641,5 @@ } -void p_psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn) +void psMemSetDeallocator(psPtr vptr, psFreeFcn freeFcn) { if (vptr == NULL) { @@ -656,5 +656,5 @@ } -psFreeFcn p_psMemGetDeallocator(psPtr vptr) +psFreeFcn psMemGetDeallocator(psPtr vptr) { if (vptr == NULL) { Index: /trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.h (revision 3681) +++ /trunk/psLib/src/sysUtils/psMemory.h (revision 3682) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -150,5 +150,5 @@ * */ -void p_psMemSetDeallocator( +void psMemSetDeallocator( psPtr ptr, ///< the memory block to operate on psFreeFcn freeFcn ///< the function to be executed at deallocation @@ -164,5 +164,5 @@ * @return psFreeFcn the routine to be called at deallocation. */ -psFreeFcn p_psMemGetDeallocator( +psFreeFcn psMemGetDeallocator( psPtr ptr ///< the memory block ); Index: /trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.c (revision 3681) +++ /trunk/psLib/src/sysUtils/psTrace.c (revision 3682) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-29 21:31:54 $ + * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ p_psMemSetPersistent(comp,true); - p_psMemSetDeallocator(comp, (psFreeFcn) componentFree); + psMemSetDeallocator(comp, (psFreeFcn) componentFree); comp->name = psStringCopy(name); p_psMemSetPersistent((psPtr)comp->name,true); Index: /trunk/psLib/src/types/psArray.c =================================================================== --- /trunk/psLib/src/types/psArray.c (revision 3681) +++ /trunk/psLib/src/types/psArray.c (revision 3682) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-18 22:17:20 $ + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -55,5 +55,5 @@ // Create vector struct psArr = (psArray* ) psAlloc(sizeof(psArray)); - p_psMemSetDeallocator(psArr, (psFreeFcn) arrayFree); + psMemSetDeallocator(psArr, (psFreeFcn) arrayFree); psArr->nalloc = nalloc; Index: /trunk/psLib/src/types/psBitSet.c =================================================================== --- /trunk/psLib/src/types/psBitSet.c (revision 3681) +++ /trunk/psLib/src/types/psBitSet.c (revision 3682) @@ -11,6 +11,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-22 19:25:52 $ + * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -80,5 +80,5 @@ numBytes = ceil(n / 8.0); newObj = psAlloc(sizeof(psBitSet)); - p_psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree); + psMemSetDeallocator(newObj, (psFreeFcn) bitSetFree); newObj->n = numBytes; Index: /trunk/psLib/src/types/psHash.c =================================================================== --- /trunk/psLib/src/types/psHash.c (revision 3681) +++ /trunk/psLib/src/types/psHash.c (revision 3682) @@ -12,6 +12,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-18 22:17:20 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -90,5 +90,5 @@ psHashBucket* bucket = psAlloc(sizeof(psHashBucket)); - p_psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree); + psMemSetDeallocator(bucket, (psFreeFcn) hashBucketFree); // Initialize the bucket. @@ -141,5 +141,5 @@ psHash* table = psAlloc(sizeof(psHash)); - p_psMemSetDeallocator(table, (psFreeFcn) hashFree); + psMemSetDeallocator(table, (psFreeFcn) hashFree); // Allocate memory for the buckets. Index: /trunk/psLib/src/types/psList.c =================================================================== --- /trunk/psLib/src/types/psList.c (revision 3681) +++ /trunk/psLib/src/types/psList.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:23 $ + * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -45,5 +45,5 @@ psArray* iterators = list->iterators; for (int i = 0; i < iterators->n; i++) { - p_psMemSetDeallocator(iterators->data[i], NULL); + psMemSetDeallocator(iterators->data[i], NULL); } @@ -129,5 +129,5 @@ psList* list = psAlloc(sizeof(psList)); - p_psMemSetDeallocator(list, (psFreeFcn) listFree); + psMemSetDeallocator(list, (psFreeFcn) listFree); list->size = 0; @@ -153,5 +153,5 @@ psListIterator* iter = psAlloc(sizeof(psListIterator)); - p_psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree); + psMemSetDeallocator(iter, (psFreeFcn) listIteratorFree); // initialize the attributes Index: /trunk/psLib/src/types/psLookupTable.c =================================================================== --- /trunk/psLib/src/types/psLookupTable.c (revision 3681) +++ /trunk/psLib/src/types/psLookupTable.c (revision 3682) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 02:33:17 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii @@ -421,5 +421,5 @@ // Set deallocator - p_psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree); + psMemSetDeallocator(outTable, (psFreeFcn)lookupTableFree); // Allocate and set metadata item comment Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 3681) +++ /trunk/psLib/src/types/psMetadata.c (revision 3682) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-29 21:31:54 $ +* @version $Revision: 1.58 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -183,5 +183,5 @@ // Set deallocator - p_psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); + psMemSetDeallocator(metadataItem, (psFreeFcn) metadataItemFree); // Allocate and set metadata item comment @@ -252,5 +252,5 @@ metadata = (psMetadata*) psAlloc(sizeof(psMetadata)); // Set deallocator - p_psMemSetDeallocator(metadata, (psFreeFcn) metadataFree); + psMemSetDeallocator(metadata, (psFreeFcn) metadataFree); // Allocate metadata's internal containers @@ -598,5 +598,5 @@ // Set deallocator - p_psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree); + psMemSetDeallocator(newIter, (psFreeFcn) metadataIteratorFree); if (regex == NULL) { Index: /trunk/psLib/swig/Makefile.am =================================================================== --- /trunk/psLib/swig/Makefile.am (revision 3681) +++ /trunk/psLib/swig/Makefile.am (revision 3682) @@ -48,5 +48,2 @@ install-exec-hook: swig-install - -uninstall-local: psLibModule/Makefile - cd psLibModule && make uninstall && make clean Index: /trunk/psLib/test/astronomy/builddir/tst_psMetadata_01.d =================================================================== --- /trunk/psLib/test/astronomy/builddir/tst_psMetadata_01.d (revision 3681) +++ /trunk/psLib/test/astronomy/builddir/tst_psMetadata_01.d (revision 3682) @@ -1,3 +1,3 @@ -builddir/tst_psMetadata_01.o: tst_psMetadata_01.c ../../include/pslib.h \ +builddir/tst_psMetadata_01.o: tst_psMetadata_01.c ../../include/pslib_strict.h \ ../../include/psMemory.h ../../include/psLogMsg.h \ ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \ Index: /trunk/psLib/test/astronomy/builddir/tst_psMetadata_02.d =================================================================== --- /trunk/psLib/test/astronomy/builddir/tst_psMetadata_02.d (revision 3681) +++ /trunk/psLib/test/astronomy/builddir/tst_psMetadata_02.d (revision 3682) @@ -1,3 +1,3 @@ -builddir/tst_psMetadata_02.o: tst_psMetadata_02.c ../../include/pslib.h \ +builddir/tst_psMetadata_02.o: tst_psMetadata_02.c ../../include/pslib_strict.h \ ../../include/psMemory.h ../../include/psLogMsg.h \ ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \ Index: /trunk/psLib/test/astronomy/builddir/tst_psMetadata_03.d =================================================================== --- /trunk/psLib/test/astronomy/builddir/tst_psMetadata_03.d (revision 3681) +++ /trunk/psLib/test/astronomy/builddir/tst_psMetadata_03.d (revision 3682) @@ -1,3 +1,3 @@ -builddir/tst_psMetadata_03.o: tst_psMetadata_03.c ../../include/pslib.h \ +builddir/tst_psMetadata_03.o: tst_psMetadata_03.c ../../include/pslib_strict.h \ ../../include/psMemory.h ../../include/psLogMsg.h \ ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \ Index: /trunk/psLib/test/astronomy/builddir/tst_psMetadata_04.d =================================================================== --- /trunk/psLib/test/astronomy/builddir/tst_psMetadata_04.d (revision 3681) +++ /trunk/psLib/test/astronomy/builddir/tst_psMetadata_04.d (revision 3682) @@ -1,3 +1,3 @@ -builddir/tst_psMetadata_04.o: tst_psMetadata_04.c ../../include/pslib.h \ +builddir/tst_psMetadata_04.o: tst_psMetadata_04.c ../../include/pslib_strict.h \ ../../include/psMemory.h ../../include/psLogMsg.h \ ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \ Index: /trunk/psLib/test/astronomy/builddir/tst_psMetadata_05.d =================================================================== --- /trunk/psLib/test/astronomy/builddir/tst_psMetadata_05.d (revision 3681) +++ /trunk/psLib/test/astronomy/builddir/tst_psMetadata_05.d (revision 3682) @@ -1,3 +1,3 @@ -builddir/tst_psMetadata_05.o: tst_psMetadata_05.c ../../include/pslib.h \ +builddir/tst_psMetadata_05.o: tst_psMetadata_05.c ../../include/pslib_strict.h \ ../../include/psMemory.h ../../include/psLogMsg.h \ ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \ Index: /trunk/psLib/test/astronomy/builddir/tst_psMetadata_06.d =================================================================== --- /trunk/psLib/test/astronomy/builddir/tst_psMetadata_06.d (revision 3681) +++ /trunk/psLib/test/astronomy/builddir/tst_psMetadata_06.d (revision 3682) @@ -1,3 +1,3 @@ -builddir/tst_psMetadata_06.o: tst_psMetadata_06.c ../../include/pslib.h \ +builddir/tst_psMetadata_06.o: tst_psMetadata_06.c ../../include/pslib_strict.h \ ../../include/psMemory.h ../../include/psLogMsg.h \ ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \ Index: /trunk/psLib/test/astronomy/builddir/tst_psTime_01.d =================================================================== --- /trunk/psLib/test/astronomy/builddir/tst_psTime_01.d (revision 3681) +++ /trunk/psLib/test/astronomy/builddir/tst_psTime_01.d (revision 3682) @@ -1,3 +1,3 @@ -builddir/tst_psTime_01.o: tst_psTime_01.c ../../include/pslib.h \ +builddir/tst_psTime_01.o: tst_psTime_01.c ../../include/pslib_strict.h \ ../../include/psMemory.h ../../include/psLogMsg.h \ ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \ Index: /trunk/psLib/test/astronomy/builddir/tst_psTime_02.d =================================================================== --- /trunk/psLib/test/astronomy/builddir/tst_psTime_02.d (revision 3681) +++ /trunk/psLib/test/astronomy/builddir/tst_psTime_02.d (revision 3682) @@ -1,3 +1,3 @@ -builddir/tst_psTime_02.o: tst_psTime_02.c ../../include/pslib.h \ +builddir/tst_psTime_02.o: tst_psTime_02.c ../../include/pslib_strict.h \ ../../include/psMemory.h ../../include/psLogMsg.h \ ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \ Index: /trunk/psLib/test/astronomy/tst_psAstrometry.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psAstrometry.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psAstrometry.c (revision 3682) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-28 23:34:10 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" static psS32 testExposureAlloc(void); @@ -40,5 +40,5 @@ psLogSetLevel(PS_LOG_INFO); - return ! runTestSuite(stderr,"psImage",tests,argc,argv); + return ! runTestSuite(stderr,"psAstrometry",tests,argc,argv); } Index: /trunk/psLib/test/astronomy/tst_psAstrometry01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psAstrometry01.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psAstrometry01.c (revision 3682) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-01 22:22:17 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * XXX: Must test @@ -23,5 +23,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" static psS32 test1( void ); Index: /trunk/psLib/test/astronomy/tst_psCoord.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psCoord.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psCoord.c (revision 3682) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-22 01:36:47 $ +* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -13,5 +13,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" static psS32 testSphereTransformAlloc(void); static psS32 testPlaneTransformAlloc(void); Index: /trunk/psLib/test/astronomy/tst_psCoord01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psCoord01.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psCoord01.c (revision 3682) @@ -6,11 +6,11 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-22 01:37:31 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2005 Maui High Performance Computing Center, Univ. of Hawaii */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psDB.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psDB.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psDB.c (revision 3682) @@ -9,6 +9,6 @@ * @author Aaron Culliney, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 23:01:46 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -25,5 +25,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #define STR_1 "hello world!" Index: /trunk/psLib/test/astronomy/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadataIO.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psMetadataIO.c (revision 3682) @@ -14,6 +14,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-11 20:38:56 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 3682) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-11 20:38:56 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 3682) @@ -15,6 +15,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-11 20:38:56 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -23,5 +23,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psMetadata_03.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 3682) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-11 20:38:56 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 3682) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-11 20:38:56 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 3682) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-17 19:44:44 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +30,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psMetadata_06.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 3682) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-11 20:38:56 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psMetadata_07.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_07.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psMetadata_07.c (revision 3682) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-28 23:34:10 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -16,5 +16,5 @@ */ #include "config.h" -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psTime_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 3682) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psTime_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 3682) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psTime_03.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 3682) @@ -19,6 +19,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/tst_psTime_04.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_04.c (revision 3681) +++ /trunk/psLib/test/astronomy/tst_psTime_04.c (revision 3682) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,5 @@ #include "config.h" -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/astronomy/verified/tst_psAstrometry.stderr =================================================================== --- /trunk/psLib/test/astronomy/verified/tst_psAstrometry.stderr (revision 3681) +++ /trunk/psLib/test/astronomy/verified/tst_psAstrometry.stderr (revision 3682) @@ -1,54 +1,54 @@ /***************************** TESTPOINT ******************************************\ * TestFile: tst_psAstrometry.c * -* TestPoint: psImage{psExposureAlloc} * +* TestPoint: psAstrometry{psExposureAlloc} * * TestType: Positive * \**********************************************************************************/ ----> TESTPOINT PASSED (psImage{psExposureAlloc} | tst_psAstrometry.c) +---> TESTPOINT PASSED (psAstrometry{psExposureAlloc} | tst_psAstrometry.c) /***************************** TESTPOINT ******************************************\ * TestFile: tst_psAstrometry.c * -* TestPoint: psImage{psObservatoryAlloc} * +* TestPoint: psAstrometry{psObservatoryAlloc} * * TestType: Positive * \**********************************************************************************/ ----> TESTPOINT PASSED (psImage{psObservatoryAlloc} | tst_psAstrometry.c) +---> TESTPOINT PASSED (psAstrometry{psObservatoryAlloc} | tst_psAstrometry.c) /***************************** TESTPOINT ******************************************\ * TestFile: tst_psAstrometry.c * -* TestPoint: psImage{psFPAAlloc} * +* TestPoint: psAstrometry{psFPAAlloc} * * TestType: Positive * \**********************************************************************************/ ----> TESTPOINT PASSED (psImage{psFPAAlloc} | tst_psAstrometry.c) +---> TESTPOINT PASSED (psAstrometry{psFPAAlloc} | tst_psAstrometry.c) /***************************** TESTPOINT ******************************************\ * TestFile: tst_psAstrometry.c * -* TestPoint: psImage{psChipAlloc} * +* TestPoint: psAstrometry{psChipAlloc} * * TestType: Positive * \**********************************************************************************/ ----> TESTPOINT PASSED (psImage{psChipAlloc} | tst_psAstrometry.c) +---> TESTPOINT PASSED (psAstrometry{psChipAlloc} | tst_psAstrometry.c) /***************************** TESTPOINT ******************************************\ * TestFile: tst_psAstrometry.c * -* TestPoint: psImage{psCellAlloc} * +* TestPoint: psAstrometry{psCellAlloc} * * TestType: Positive * \**********************************************************************************/ ----> TESTPOINT PASSED (psImage{psCellAlloc} | tst_psAstrometry.c) +---> TESTPOINT PASSED (psAstrometry{psCellAlloc} | tst_psAstrometry.c) /***************************** TESTPOINT ******************************************\ * TestFile: tst_psAstrometry.c * -* TestPoint: psImage{psReadoutAlloc} * +* TestPoint: psAstrometry{psReadoutAlloc} * * TestType: Positive * \**********************************************************************************/ ----> TESTPOINT PASSED (psImage{psReadoutAlloc} | tst_psAstrometry.c) +---> TESTPOINT PASSED (psAstrometry{psReadoutAlloc} | tst_psAstrometry.c) Index: /trunk/psLib/test/collections/tst_psArray.c =================================================================== --- /trunk/psLib/test/collections/tst_psArray.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psArray.c (revision 3682) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-18 22:17:20 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psBitSet.c =================================================================== --- /trunk/psLib/test/collections/tst_psBitSet.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psBitSet.c (revision 3682) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-18 22:46:50 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -24,5 +24,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psHash00.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash00.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psHash00.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psHash.h" Index: /trunk/psLib/test/collections/tst_psHash01.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash01.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psHash01.c (revision 3682) @@ -4,5 +4,5 @@ #include #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psHash.h" Index: /trunk/psLib/test/collections/tst_psHash02.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash02.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psHash02.c (revision 3682) @@ -8,5 +8,5 @@ #include #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psHash.h" Index: /trunk/psLib/test/collections/tst_psHash03.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash03.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psHash03.c (revision 3682) @@ -6,5 +6,5 @@ #include #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psHash.h" Index: /trunk/psLib/test/collections/tst_psHash04.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash04.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psHash04.c (revision 3682) @@ -3,5 +3,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psHash.h" Index: /trunk/psLib/test/collections/tst_psHash05.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash05.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psHash05.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-17 19:26:24 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -13,5 +13,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" static psS32 hashToArray( void ); Index: /trunk/psLib/test/collections/tst_psList.c =================================================================== --- /trunk/psLib/test/collections/tst_psList.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psList.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -13,5 +13,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" void printListInt(psList* list); Index: /trunk/psLib/test/collections/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadataIO.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psMetadataIO.c (revision 3682) @@ -14,6 +14,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-11 20:38:56 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 3682) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-11 20:38:56 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_02.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psMetadata_02.c (revision 3682) @@ -15,6 +15,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-11 20:38:56 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -23,5 +23,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psMetadata_03.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_03.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psMetadata_03.c (revision 3682) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-11 20:38:56 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,5 +26,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_04.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psMetadata_04.c (revision 3682) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-11 20:38:56 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -31,5 +31,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_05.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psMetadata_05.c (revision 3682) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-17 19:44:44 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +30,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psMetadata_06.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_06.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psMetadata_06.c (revision 3682) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-11 20:38:56 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psMetadata_07.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_07.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psMetadata_07.c (revision 3682) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-28 23:34:10 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -16,5 +16,5 @@ */ #include "config.h" -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psScalar.c =================================================================== --- /trunk/psLib/test/collections/tst_psScalar.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psScalar.c (revision 3682) @@ -5,7 +5,7 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -13,5 +13,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" static psS32 testScalarAlloc(void); Index: /trunk/psLib/test/collections/tst_psVector.c =================================================================== --- /trunk/psLib/test/collections/tst_psVector.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psVector.c (revision 3682) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psVectorSort_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 3682) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-17 19:26:19 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psVectorSort_02.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_02.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psVectorSort_02.c (revision 3682) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psVectorSort_03.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_03.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psVectorSort_03.c (revision 3682) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/collections/tst_psVectorSort_04.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_04.c (revision 3681) +++ /trunk/psLib/test/collections/tst_psVectorSort_04.c (revision 3682) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:24 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -16,5 +16,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataIO/tst_psDB.c =================================================================== --- /trunk/psLib/test/dataIO/tst_psDB.c (revision 3681) +++ /trunk/psLib/test/dataIO/tst_psDB.c (revision 3682) @@ -9,6 +9,6 @@ * @author Aaron Culliney, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 23:01:46 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -25,5 +25,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #define STR_1 "hello world!" Index: /trunk/psLib/test/dataIO/tst_psFits.c =================================================================== --- /trunk/psLib/test/dataIO/tst_psFits.c (revision 3681) +++ /trunk/psLib/test/dataIO/tst_psFits.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-24 22:21:17 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #define GENIMAGE(img,c,r,TYP, valueFcn) \ Index: /trunk/psLib/test/dataIO/tst_psLookupTable_01.c =================================================================== --- /trunk/psLib/test/dataIO/tst_psLookupTable_01.c (revision 3681) +++ /trunk/psLib/test/dataIO/tst_psLookupTable_01.c (revision 3682) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 23:01:46 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include Index: /trunk/psLib/test/dataManip/tst_psFunc00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc00.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc00.c (revision 3682) @@ -14,6 +14,6 @@ * orders are created. * -* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-29 22:50:16 $ +* @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -21,5 +21,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psFunc01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc01.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc01.c (revision 3682) @@ -6,5 +6,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psFunc02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 3682) @@ -5,5 +5,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psFunc03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc03.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc03.c (revision 3682) @@ -6,5 +6,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psFunc04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc04.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc04.c (revision 3682) @@ -10,5 +10,5 @@ #include #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psFunc05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc05.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc05.c (revision 3682) @@ -11,5 +11,5 @@ #include #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psFunc07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc07.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc07.c (revision 3682) @@ -12,5 +12,5 @@ #include #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psFunc08.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc08.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc08.c (revision 3682) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-07 20:31:06 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -11,5 +11,5 @@ ***************************************************************************/ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psFunc09.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc09.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc09.c (revision 3682) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-08 02:46:20 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -11,5 +11,5 @@ ***************************************************************************/ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psFunc10.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc10.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc10.c (revision 3682) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-10 01:14:11 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -11,5 +11,5 @@ ***************************************************************************/ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psFunc11.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc11.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psFunc11.c (revision 3682) @@ -4,6 +4,6 @@ * ORD and CHEB type polynomials. * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-10 22:36:09 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -11,5 +11,5 @@ ***************************************************************************/ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psHist00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist00.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psHist00.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psHist01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist01.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psHist01.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psHist02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist02.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psHist02.c (revision 3682) @@ -5,5 +5,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psHist03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist03.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psHist03.c (revision 3682) @@ -5,5 +5,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psMatrix01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 3682) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-17 19:26:25 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrix02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix02.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrix02.c (revision 3682) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-24 00:19:51 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrix03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 3682) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-24 00:19:51 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrix04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 3682) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:25 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -20,5 +20,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrix05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 3682) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-17 19:26:25 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrix06.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 3682) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-17 19:26:25 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrix07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 3682) @@ -16,6 +16,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-24 00:19:51 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -23,5 +23,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c (revision 3682) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:25 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c (revision 3682) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:25 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic03.c (revision 3682) @@ -15,6 +15,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:25 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic04.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic04.c (revision 3682) @@ -9,6 +9,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:25 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -16,5 +16,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psMinimize00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize00.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize00.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psMinimize01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize01.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize01.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psMinimize02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize02.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize02.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psMinimize03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize03.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize03.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psMinimize04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize04.c (revision 3682) @@ -13,5 +13,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psMinimize04_F32.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04_F32.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize04_F32.c (revision 3682) @@ -13,5 +13,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psMinimize04b.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04b.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize04b.c (revision 3682) @@ -3,5 +3,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c (revision 3682) @@ -3,5 +3,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psMemory.h" Index: /trunk/psLib/test/dataManip/tst_psMinimize05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize05.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize05.c (revision 3682) @@ -7,5 +7,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include Index: /trunk/psLib/test/dataManip/tst_psMinimize06.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize06.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize06.c (revision 3682) @@ -3,5 +3,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include Index: /trunk/psLib/test/dataManip/tst_psMinimize07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize07.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psMinimize07.c (revision 3682) @@ -3,5 +3,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include Index: /trunk/psLib/test/dataManip/tst_psRandom.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psRandom.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psRandom.c (revision 3682) @@ -19,5 +19,5 @@ #include #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psStats00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats00.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats00.c (revision 3682) @@ -5,11 +5,11 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-24 23:57:13 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psStats01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats01.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats01.c (revision 3682) @@ -5,11 +5,11 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-28 22:50:59 $ +* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psStats02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats02.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats02.c (revision 3682) @@ -5,11 +5,11 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-28 23:54:14 $ +* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psStats03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats03.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats03.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #define N1 1029 // This should be an odd number. Index: /trunk/psLib/test/dataManip/tst_psStats04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats04.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats04.c (revision 3682) @@ -7,5 +7,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #define N1 1029 Index: /trunk/psLib/test/dataManip/tst_psStats05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats05.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats05.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #define MISC_FLOAT_NUMBER 345.0 Index: /trunk/psLib/test/dataManip/tst_psStats06.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats06.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats06.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psStats07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats07.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats07.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psStats08.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats08.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats08.c (revision 3682) @@ -4,5 +4,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psStats09.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats09.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psStats09.c (revision 3682) @@ -5,5 +5,5 @@ *****************************************************************************/ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include "psTest.h" Index: /trunk/psLib/test/dataManip/tst_psVectorFFT.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psVectorFFT.c (revision 3681) +++ /trunk/psLib/test/dataManip/tst_psVectorFFT.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-17 19:26:25 $ +* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -16,5 +16,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #define GENIMAGE(img,c,r,TYP, valueFcn) \ Index: /trunk/psLib/test/fileUtils/tst_psDB.c =================================================================== --- /trunk/psLib/test/fileUtils/tst_psDB.c (revision 3681) +++ /trunk/psLib/test/fileUtils/tst_psDB.c (revision 3682) @@ -9,6 +9,6 @@ * @author Aaron Culliney, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-31 23:01:46 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:41 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -25,5 +25,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #define STR_1 "hello world!" Index: /trunk/psLib/test/fileUtils/tst_psFits.c =================================================================== --- /trunk/psLib/test/fileUtils/tst_psFits.c (revision 3681) +++ /trunk/psLib/test/fileUtils/tst_psFits.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-24 22:21:17 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #define GENIMAGE(img,c,r,TYP, valueFcn) \ Index: /trunk/psLib/test/fileUtils/tst_psLookupTable_01.c =================================================================== --- /trunk/psLib/test/fileUtils/tst_psLookupTable_01.c (revision 3681) +++ /trunk/psLib/test/fileUtils/tst_psLookupTable_01.c (revision 3682) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-03-31 23:01:46 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-5 Maui High Performance Computing Center, University of Hawaii @@ -19,5 +19,5 @@ */ -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" #include Index: /trunk/psLib/test/image/tst_psImage.c =================================================================== --- /trunk/psLib/test/image/tst_psImage.c (revision 3681) +++ /trunk/psLib/test/image/tst_psImage.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:25 $ + * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -18,5 +18,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #include "psType.h" @@ -51,9 +51,8 @@ 0,1,100,1,150,100 }; - psU32 types = 13; + psU32 types = 12; psElemType type[] = { PS_TYPE_S8, PS_TYPE_S16, PS_TYPE_S32, PS_TYPE_S64, PS_TYPE_U8, PS_TYPE_U16, PS_TYPE_U32, PS_TYPE_U64, - PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64, - PS_TYPE_PTR }; + PS_TYPE_F32, PS_TYPE_F64, PS_TYPE_C32, PS_TYPE_C64}; psLogMsg(__func__,PS_LOG_INFO,"#546 - psImageAlloc shall allocate memory for a psImage structure"); @@ -193,28 +192,4 @@ } } - } - break; - case PS_TYPE_PTR: { - psU32 rows = numRows[i]; - psU32 cols = numCols[i]; - psImage* temp = psImageAlloc(1,1,PS_TYPE_F32); - - for (psS32 r=0;rdata.PTR[r][c] = psMemIncrRefCounter(temp); - } - } - for (psS32 r=0;rdata.PTR[r][c] != temp) { - psError(PS_ERR_UNKNOWN, true, "Could not set pixel in pointer image at (%d,%d): %x %x", - c,r,image->data.PTR[r][c],temp); - psFree(image); - psFree(temp); - return 8; - } - } - } - psFree(temp); } break; Index: /trunk/psLib/test/image/tst_psImageConvolve.c =================================================================== --- /trunk/psLib/test/image/tst_psImageConvolve.c (revision 3681) +++ /trunk/psLib/test/image/tst_psImageConvolve.c (revision 3682) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-05 21:16:15 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -17,5 +17,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #include "psType.h" Index: /trunk/psLib/test/image/tst_psImageExtraction.c =================================================================== --- /trunk/psLib/test/image/tst_psImageExtraction.c (revision 3681) +++ /trunk/psLib/test/image/tst_psImageExtraction.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-23 21:36:57 $ +* @version $Revision: 1.22 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -15,5 +15,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #include "psType.h" Index: /trunk/psLib/test/image/tst_psImageFFT.c =================================================================== --- /trunk/psLib/test/image/tst_psImageFFT.c (revision 3681) +++ /trunk/psLib/test/image/tst_psImageFFT.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:25 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -16,5 +16,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #define GENIMAGE(img,c,r,TYP, valueFcn) \ Index: /trunk/psLib/test/image/tst_psImageIO.c =================================================================== --- /trunk/psLib/test/image/tst_psImageIO.c (revision 3681) +++ /trunk/psLib/test/image/tst_psImageIO.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-17 19:26:25 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -21,5 +21,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #define GENIMAGE(img,c,r,TYP, valueFcn) \ Index: /trunk/psLib/test/image/tst_psImageInterpolate.c =================================================================== --- /trunk/psLib/test/image/tst_psImageInterpolate.c (revision 3681) +++ /trunk/psLib/test/image/tst_psImageInterpolate.c (revision 3682) @@ -5,7 +5,7 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ * $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-18 02:35:15 $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -14,5 +14,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #define GENIMAGE(img,c,r,TYP,valueFcn) \ @@ -100,5 +100,5 @@ // Perform interpolation with invalid input image type - img1 = psImageAlloc(10,10,PS_TYPE_PTR); + img1 = psImageAlloc(10,10,PS_TYPE_BOOL); psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message"); val = psImagePixelInterpolate(img1,1.2,1.2,NULL,0,10.0,PS_INTERPOLATE_FLAT); Index: /trunk/psLib/test/image/tst_psImageManip.c =================================================================== --- /trunk/psLib/test/image/tst_psImageManip.c (revision 3681) +++ /trunk/psLib/test/image/tst_psImageManip.c (revision 3682) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-03-18 02:35:15 $ + * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-04-07 20:27:42 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -22,5 +22,5 @@ #include "psTest.h" -#include "pslib.h" +#include "pslib_strict.h" #include "psType.h" @@ -1788,6 +1788,6 @@ // Verify that that an invalid image type is handled properly psErrorClear(); - psImage* invImage = psImageAlloc(cols,rows,PS_TYPE_PTR); - memset(invImage->rawDataBuffer,0,cols*rows*sizeof(psPtr)); // make sure the image is of all NULLs + psImage* invImage = psImageAlloc(cols,rows,PS_TYPE_BOOL); + memset(invImage->rawDataBuffer,0,cols*rows*sizeof(psBool)); // make sure the image is of all NULLs result = psImageResample(result,invImage,2,PS_INTERPOLATE_FLAT); if (result != NULL) { Index: /trunk/psLib/test/image/tst_psImageStats.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats.c (revision 3681) +++ /trunk/psLib/test/image/tst_psImageStats.c (revision 3682) @@ -15,5 +15,5 @@ #include -#include "pslib.h" +#include "pslib_strict.h" #include "psTest.h" Index: /trunk/psLib/test/image/verified/tst_psImage.stderr =================================================================== --- /trunk/psLib/test/image/verified/tst_psImage.stderr (revision 3681) +++ /trunk/psLib/test/image/verified/tst_psImage.stderr (revision 3682) @@ -79,10 +79,4 @@