Index: trunk/psLib/src/astro/psCoord.c =================================================================== --- trunk/psLib/src/astro/psCoord.c (revision 6437) +++ trunk/psLib/src/astro/psCoord.c (revision 6445) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.116 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-02-10 00:51:00 $ +* @version $Revision: 1.117 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-02-17 03:24:46 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -564,186 +564,4 @@ } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /***************************************************************************** psPlaneTransformCombine(out, trans1, trans2) @@ -963,5 +781,4 @@ - /***************************************************************************** psPlaneTransformInvert(out, in, region, nSamples) Index: trunk/psLib/src/fits/psFitsTable.c =================================================================== --- trunk/psLib/src/fits/psFitsTable.c (revision 6437) +++ trunk/psLib/src/fits/psFitsTable.c (revision 6445) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-02-08 01:03:34 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-02-17 03:24:46 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -595,4 +595,5 @@ psTrace(".psFits.psFitsReadTable",5,"Reading row %i of %i\n",row, numRows); table->data[row] = psFitsReadTableRow(fits,row); + table->n++; } @@ -658,4 +659,5 @@ psMemDecrRefCounter(fItem); columns->data[n] = psMemIncrRefCounter(item); + columns->n++; } else if (item->type == PS_DATA_VECTOR && @@ -663,4 +665,5 @@ psMemDecrRefCounter(fItem); columns->data[n] = psMemIncrRefCounter(item); + columns->n++; } } else { @@ -686,8 +689,11 @@ //create list of column names and types. + columns->n--; psArray* columnNames = psArrayAlloc(columns->n); psArray* columnTypes = psArrayAlloc(columns->n); for (int n=0; n < columns->n; n++) { columnNames->data[n] = psMemIncrRefCounter(((psMetadataItem*)columns->data[n])->name); + columnNames->n++; + columnTypes->n++; if ( ! getMetadataTForm((psMetadataItem*)columns->data[n], (char**)&(columnTypes->data[n]),1) ) { @@ -754,4 +760,5 @@ table->data[row], item->name)); + colArray->n++; } fits_write_col_str(fits->fd, Index: trunk/psLib/src/types/psArray.c =================================================================== --- trunk/psLib/src/types/psArray.c (revision 6437) +++ trunk/psLib/src/types/psArray.c (revision 6445) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-11-16 23:06:35 $ + * @version $Revision: 1.41 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-02-17 03:24:46 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -64,6 +64,6 @@ P_PSARRAY_SET_NALLOC(psArr,nalloc); - psArr->n = nalloc; - + psArr->n = 0; + // psArr->n = nalloc; // Create vector data array psArr->data = psAlloc(nalloc * sizeof(psPtr)); @@ -169,5 +169,5 @@ } -/// Set an element in the array. +// Set an element in the array. bool psArraySet(psArray* array, ///< input array to set element in long position, ///< the element position to set @@ -213,5 +213,5 @@ } -/// Get an element in the array. +// Get an element in the array. psPtr psArrayGet(const psArray* array, long position ) Index: trunk/psLib/src/types/psLookupTable.c =================================================================== --- trunk/psLib/src/types/psLookupTable.c (revision 6437) +++ trunk/psLib/src/types/psLookupTable.c (revision 6445) @@ -7,6 +7,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-26 21:10:22 $ +* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-02-17 03:24:46 $ * * Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii @@ -615,4 +615,5 @@ psS32 type = ((psVector*)(vectors->data[j]))->type.type; newValueArray->data[j] = psVectorAlloc(numRows,type); + newValueArray->n++; } Index: trunk/psLib/test/astro/tst_psCoord02.c =================================================================== --- trunk/psLib/test/astro/tst_psCoord02.c (revision 6437) +++ trunk/psLib/test/astro/tst_psCoord02.c (revision 6445) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-02-10 00:56:24 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-02-17 03:24:46 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -323,4 +323,16 @@ for (psF32 x = TST05_X_MIN ; x < TST05_X_MAX ; x+= (TST05_X_MAX-TST05_X_MIN)/TST05_NUM_X) { for (psF32 y = TST05_Y_MIN ; y < TST05_Y_MAX ; y+= (TST05_Y_MAX-TST05_Y_MIN)/TST05_NUM_Y) { + if (i == src->n) { + if (src->n == src->nalloc) { + src = psArrayRealloc(src, src->n+1); + } + src->n++; + } + if (i == dst->n) { + if (dst->n == dst->nalloc) { + dst = psArrayRealloc(dst, dst->n+1); + } + dst->n++; + } src->data[i] = (psPtr *) psPlaneAlloc(); ((psPlane *) src->data[i])->x = x; @@ -336,5 +348,5 @@ rc = psPlaneTransformFit(NULL, src, dst, 100, 100.0); if (rc == true) { - printf("TEST ERROR: psPlaneTransformFit() returned TRUE.\n"); + printf("TEST ERROR1: psPlaneTransformFit() returned TRUE.\n"); testStatus = false; } @@ -344,5 +356,5 @@ rc = psPlaneTransformFit(trans, NULL, dst, 100, 100.0); if (rc == true) { - printf("TEST ERROR: psPlaneTransformFit() returned TRUE.\n"); + printf("TEST ERROR2: psPlaneTransformFit() returned TRUE.\n"); testStatus = false; } @@ -352,5 +364,5 @@ rc = psPlaneTransformFit(trans, src, NULL, 100, 100.0); if (rc == true) { - printf("TEST ERROR: psPlaneTransformFit() returned TRUE.\n"); + printf("TEST ERROR3: psPlaneTransformFit() returned TRUE.\n"); testStatus = false; } @@ -360,5 +372,5 @@ rc = psPlaneTransformFit(trans, src, dst, 100, 100.0); if (rc != true) { - printf("TEST ERROR: psPlaneTransformFit() returned FALSE.\n"); + printf("TEST ERROR4: psPlaneTransformFit() returned FALSE.\n"); testStatus = false; } else { Index: trunk/psLib/test/fits/tst_psFits.c =================================================================== --- trunk/psLib/test/fits/tst_psFits.c (revision 6437) +++ trunk/psLib/test/fits/tst_psFits.c (revision 6445) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-02-08 01:03:35 $ +* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-02-17 03:24:46 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -162,4 +162,5 @@ // build a table structure psArray* table = psArrayAlloc(tableNumRows); + // table->n = tableNumRows; psMetadata* header = NULL; for (int row = 0; row < tableNumRows; row++) { @@ -205,4 +206,5 @@ table->data[row] = header; + table->n++; } @@ -211,6 +213,6 @@ psFree(table); psFree(fitsFile); - - return ! psMemCheckLeaks(15,NULL,stderr,false); + // return 1; + return (!psMemCheckLeaks(15,NULL,stderr,false)); } @@ -915,5 +917,5 @@ if (! makeTable()) { - return 1; + return 111; } @@ -1028,5 +1030,5 @@ { if (! makeTable()) { - return 1; + return 111; } @@ -1130,5 +1132,5 @@ { if (! makeTable()) { - return 1; + return 111; } @@ -1258,5 +1260,5 @@ if (! makeTable()) { - return 1; + return 111; } Index: trunk/psLib/test/types/tst_psArray.c =================================================================== --- trunk/psLib/test/types/tst_psArray.c (revision 6437) +++ trunk/psLib/test/types/tst_psArray.c (revision 6445) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-10-01 02:22:26 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-02-17 03:24:46 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -56,8 +56,8 @@ testDescription tests[] = { - {testArray, -1, "psArray", 0, false}, - {testArray01, -2, "psArray", 0, false}, - {testArrayAdd, 788, "psArrayAdd", 0, false}, - {testArrayGetSet, -3, "psArrayGetSet", 0, false}, + {testArray, 665, "psArray", 0, false}, + {testArray01, 666, "psArray01", 0, false}, + {testArrayAdd, 667, "psArrayAdd", 0, false}, + {testArrayGetSet, 668, "psArrayGetSet", 0, false}, {NULL} }; @@ -94,6 +94,10 @@ ts->y = 10.1*i; mySt[i] = ts; - psArr->data[i] = ts; + // psArr->data[i] = ts; + if (!psArraySet(psArr, psArr->n, (psPtr)ts) ) { + return 6; + } psMemIncrRefCounter(ts); + psFree(ts); } @@ -264,6 +268,10 @@ ts->y = 10.1*(10-i); mySt[i] = ts; - psArr->data[i] = ts; + // psArr->data[i] = ts; + if (!psArraySet(psArr, psArr->n, (psPtr)ts) ) { + return 6; + } psMemIncrRefCounter(ts); + psFree(ts); } Index: trunk/psLib/test/types/verified/tst_psArray.stderr =================================================================== --- trunk/psLib/test/types/verified/tst_psArray.stderr (revision 6437) +++ trunk/psLib/test/types/verified/tst_psArray.stderr (revision 6445) @@ -136,5 +136,5 @@ /***************************** TESTPOINT ******************************************\ * TestFile: tst_psArray.c * -* TestPoint: psArray{psArray} * +* TestPoint: psArray{psArray01} * * TestType: Positive * \**********************************************************************************/ @@ -208,5 +208,5 @@ ----> TESTPOINT PASSED (psArray{psArray} | tst_psArray.c) +---> TESTPOINT PASSED (psArray{psArray01} | tst_psArray.c) /***************************** TESTPOINT ******************************************\