Index: trunk/psLib/src/astronomy/psAstrometry.c =================================================================== --- trunk/psLib/src/astronomy/psAstrometry.c (revision 2200) +++ trunk/psLib/src/astronomy/psAstrometry.c (revision 2204) @@ -8,6 +8,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-14 23:45:53 $ + * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,7 +33,7 @@ psImage. *****************************************************************************/ -static int checkValidImageCoords(double x, - double y, - psImage* tmpImage) +static psS32 checkValidImageCoords(double x, + double y, + psImage* tmpImage) { if (tmpImage == NULL) { @@ -56,7 +56,7 @@ cooefficients of order 2 are higher are non-zero, then it is not linear. *****************************************************************************/ -static int isProjectionLinear(psPlaneTransform *transform) -{ - int i = 0; +static psS32 isProjectionLinear(psPlaneTransform *transform) +{ + psS32 i = 0; PS_CHECK_NULL_PTR_RETURN_ZERO(transform); @@ -178,5 +178,5 @@ { if (obs != NULL) { - psFree((void*)obs->name); + psFree((psPtr)obs->name); } } @@ -185,8 +185,8 @@ { if (exp != NULL) { - psFree((void*)exp->time); - psFree((void*)exp->observatory); - psFree((void*)exp->cameraName); - psFree((void*)exp->telescopeName); + psFree((psPtr)exp->time); + psFree((psPtr)exp->observatory); + psFree((psPtr)exp->cameraName); + psFree((psPtr)exp->telescopeName); } } @@ -195,9 +195,9 @@ { if (fp != NULL) { - for (int i = 0; i < fp->p_ps_xRows; i++) { + for (psS32 i = 0; i < fp->p_ps_xRows; i++) { psFree(fp->x[i]); } - for (int j = 0; j < fp->p_ps_yRows; j++) { + for (psS32 j = 0; j < fp->p_ps_yRows; j++) { psFree(fp->y[j]); } @@ -226,6 +226,6 @@ { psFixedPattern *tmp; - int i; - int j; + psS32 i; + psS32 j; PS_CHECK_NULL_IMAGE_RETURN_NULL(x); @@ -301,6 +301,6 @@ *(float *)&exp->wavelength = wavelength; - exp->time = psMemIncrRefCounter((void*)time); - exp->observatory = psMemIncrRefCounter((void*)observatory); + exp->time = psMemIncrRefCounter((psPtr)time); + exp->observatory = psMemIncrRefCounter((psPtr)observatory); // XXX: how is these value derived? @@ -343,5 +343,5 @@ } -psFPA* psFPAAlloc(int nChips, +psFPA* psFPAAlloc(psS32 nChips, const psExposure* exp) { @@ -350,6 +350,6 @@ // create array of NULL chips of the size nChips newFPA->chips = psArrayAlloc(nChips); - void** chips = newFPA->chips->data; - for (int i=0;ichips->data; + for (psS32 i=0;icells = psArrayAlloc(nCells); - void** cells = chip->cells->data; - for (int i=0;icells->data; + for (psS32 i=0;ireadouts = psArrayAlloc(nReadouts); - void** readouts = cell->readouts->data; - for (int i=0;ireadouts->data; + for (psS32 i=0;icolBins = 1; - *(unsigned int*)&readout->rowBins = 1; - *(int*)&readout->col0 = col0; - *(int*)&readout->row0 = row0; + *(psU32*)&readout->colBins = 1; + *(psU32*)&readout->rowBins = 1; + *(psS32*)&readout->col0 = col0; + *(psS32*)&readout->row0 = row0; readout->image = (psImage*)image; @@ -521,5 +521,5 @@ PS_CHECK_NULL_PTR_RETURN_NULL(FPA->chips); psArray* chips = FPA->chips; - int nChips = chips->n; + psS32 nChips = chips->n; psPlane chipCoord; psCell *tmpCell = NULL; @@ -529,5 +529,5 @@ // cells in that chip contain those chip coordinates. - for (int i = 0; i < nChips; i++) { + for (psS32 i = 0; i < nChips; i++) { psChip* tmpChip = chips->data[i]; psPlaneTransformApply(&chipCoord, tmpChip->fromFPA, fpaCoord); @@ -560,10 +560,10 @@ // If so, then we return that cell. - for (int i = 0; i < cells->n; i++) { + for (psS32 i = 0; i < cells->n; i++) { psCell* tmpCell = (psCell* ) cells->data[i]; psArray* readouts = tmpCell->readouts; if (readouts != NULL) { - for (int j = 0; j < readouts->n; j++) { + for (psS32 j = 0; j < readouts->n; j++) { psReadout* tmpReadout = readouts->data[j]; Index: trunk/psLib/src/astronomy/psAstrometry.h =================================================================== --- trunk/psLib/src/astronomy/psAstrometry.h (revision 2200) +++ trunk/psLib/src/astronomy/psAstrometry.h (revision 2204) @@ -8,6 +8,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-12 20:53:02 $ +* @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -72,6 +72,6 @@ typedef struct { - int nX; ///< Number of elements in x direction - int nY; ///< Number of elements in y direction + psS32 nX; ///< Number of elements in x direction + psS32 nY; ///< Number of elements in y direction double x0; ///< X Position of 0,0 corner on focal plane double y0; ///< Y Position of 0,0 corner on focal plane @@ -79,8 +79,8 @@ double yScale; ///< Scale of the grid in x direction /// XXX: I added the following memvers to facilitate the psFreeing of the x,y data structures. - int p_ps_xRows; ///< Number of rows in the x member - int p_ps_xCols; ///< Number of cols in the x member - int p_ps_yRows; ///< Number of rows in the y member - int p_ps_yCols; ///< Number of cols in the y member + psS32 p_ps_xRows; ///< Number of rows in the x member + psS32 p_ps_xCols; ///< Number of cols in the x member + psS32 p_ps_yRows; ///< Number of rows in the y member + psS32 p_ps_yCols; ///< Number of cols in the y member double **x; ///< The grid of offsets in x double **y; ///< The grid of offsets in y @@ -99,8 +99,8 @@ typedef struct { - const unsigned int colBins; ///< Amount of binning in x-dimension - const unsigned int rowBins; ///< Amount of binning in y-dimension - const int col0; ///< Offset from the left of chip. - const int row0; ///< Offset from the bottom of chip. + const psU32 colBins; ///< Amount of binning in x-dimension + const psU32 rowBins; ///< Amount of binning in y-dimension + const psS32 col0; ///< Offset from the left of chip. + const psS32 row0; ///< Offset from the bottom of chip. psImage* image; ///< Imaging area of readout @@ -304,5 +304,5 @@ */ psFPA* psFPAAlloc( - int nChips, ///< number of chips in the FPA + psS32 nChips, ///< number of chips in the FPA const psExposure* exp ///< the exposure information ); @@ -317,5 +317,5 @@ */ psChip* psChipAlloc( - int nCells, ///< number of cells in Chip + psS32 nCells, ///< number of cells in Chip psFPA* parentFPA ///< parent FPA ); @@ -330,5 +330,5 @@ */ psCell* psCellAlloc( - int nReadouts, ///< number of readouts in cell + psS32 nReadouts, ///< number of readouts in cell psChip* parentChip ///< parent Chip ); @@ -342,6 +342,6 @@ */ psReadout* psReadoutAlloc( - int col0, ///< offset from the left of the cell - int row0, ///< offset from the bottom of the cell + psS32 col0, ///< offset from the left of the cell + psS32 row0, ///< offset from the bottom of the cell const psImage* image ///< image of the readout ); Index: trunk/psLib/src/astronomy/psAstronomyErrors.dat =================================================================== --- trunk/psLib/src/astronomy/psAstronomyErrors.dat (revision 2200) +++ trunk/psLib/src/astronomy/psAstronomyErrors.dat (revision 2204) Index: trunk/psLib/src/astronomy/psCoord.c =================================================================== --- trunk/psLib/src/astronomy/psCoord.c (revision 2200) +++ trunk/psLib/src/astronomy/psCoord.c (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-26 22:32:09 $ +* @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,5 +67,5 @@ } -psPlaneTransform* psPlaneTransformAlloc(int n1, int n2) +psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2) { psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform)); @@ -97,5 +97,5 @@ } -psPlaneDistort* psPlaneDistortAlloc(int n1, int n2, int n3, int n4) +psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4) { psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort)); Index: trunk/psLib/src/astronomy/psCoord.h =================================================================== --- trunk/psLib/src/astronomy/psCoord.h (revision 2200) +++ trunk/psLib/src/astronomy/psCoord.h (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-26 22:32:09 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -173,6 +173,6 @@ psPlaneTransform* psPlaneTransformAlloc( - int n1, ///< The order of the x term in the transform. - int n2 ///< The order of the y term in the transform. + psS32 n1, ///< The order of the x term in the transform. + psS32 n2 ///< The order of the y term in the transform. ); @@ -193,8 +193,8 @@ psPlaneDistort* psPlaneDistortAlloc( - int n1, ///< The order of the w term in the transform. - int n2, ///< The order of the x term in the transform. - int n3, ///< The order of the y term in the transform. - int n4 ///< The order of the z term in the transform. + psS32 n1, ///< The order of the w term in the transform. + psS32 n2, ///< The order of the x term in the transform. + psS32 n3, ///< The order of the y term in the transform. + psS32 n4 ///< The order of the z term in the transform. ); Index: trunk/psLib/src/astronomy/psMetadata.c =================================================================== --- trunk/psLib/src/astronomy/psMetadata.c (revision 2200) +++ trunk/psLib/src/astronomy/psMetadata.c (revision 2204) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-09 03:05:53 $ +* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,5 +59,5 @@ /*****************************************************************************/ -static int metadataId = 0; +static psS32 metadataId = 0; /*****************************************************************************/ @@ -143,5 +143,5 @@ // Set metadata item unique id - *(int *)(&metadataItem->id) = ++metadataId; + *(psS32 *)(&metadataItem->id) = ++metadataId; // Set metadata item type @@ -154,5 +154,5 @@ break; case PS_META_BOOL: - metadataItem->data.B = (bool)va_arg(argPtr, int); + metadataItem->data.B = (psBool)va_arg(argPtr, psS32); break; case PS_META_S32: @@ -215,5 +215,5 @@ } -bool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, int location ) +psBool psMetadataAddItem( psMetadata *restrict md, psMetadataItem *restrict metadataItem, psS32 location ) { char * key = NULL; @@ -337,6 +337,6 @@ } -bool psMetadataAdd(psMetadata* restrict md, int where, const char *name, psMetadataType type, - const char *comment, ...) +psBool psMetadataAdd(psMetadata* restrict md, psS32 where, const char *name, psMetadataType type, + const char *comment, ...) { va_list argPtr; @@ -359,7 +359,7 @@ } -bool psMetadataRemove(psMetadata* restrict md, int where, const char *restrict key) -{ - int numChildren = 0; +psBool psMetadataRemove(psMetadata* restrict md, psS32 where, const char *restrict key) +{ + psS32 numChildren = 0; psList* mdList = NULL; psHash* mdTable = NULL; @@ -471,5 +471,5 @@ } -psMetadataItem* psMetadataGet(psMetadata* restrict md, int where) +psMetadataItem* psMetadataGet(psMetadata* restrict md, psS32 where) { psList* mdList = NULL; @@ -497,5 +497,5 @@ } -bool psMetadataSetIterator(psMetadata* restrict md, int where) +psBool psMetadataSetIterator(psMetadata* restrict md, psS32 where) { psList* mdList = NULL; @@ -517,5 +517,5 @@ } -psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, int which) +psMetadataItem* psMetadataGetNext(psMetadata* restrict md, const char *restrict match, psS32 which) { psList* mdList = NULL; @@ -553,5 +553,5 @@ } -psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, int which) +psMetadataItem* psMetadataGetPrevious(psMetadata* restrict md, const char *restrict match, psS32 which) { psList* mdList = NULL; Index: trunk/psLib/src/astronomy/psMetadata.h =================================================================== --- trunk/psLib/src/astronomy/psMetadata.h (revision 2200) +++ trunk/psLib/src/astronomy/psMetadata.h (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 01:06:27 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,11 +38,11 @@ PS_META_F32, ///< Single-precision float data. PS_META_F64, ///< Double-precision float data. - PS_META_STR, ///< String data (Stored in as void *). - PS_META_VEC, ///< Vector data (Stored in as void *). - PS_META_IMG, ///< Image data (Stored in as void *). - PS_META_JPEG, ///< JPEG data (Stored in as void *). - PS_META_PNG, ///< PNG data (Stored in as void *). - PS_META_ASTROM, ///< Astrometric coefficients (Stored in as void *). - PS_META_UNKNOWN, ///< Other data (Stored in as void *). + PS_META_STR, ///< String data (Stored in as psPtr ). + PS_META_VEC, ///< Vector data (Stored in as psPtr ). + PS_META_IMG, ///< Image data (Stored in as psPtr ). + PS_META_JPEG, ///< JPEG data (Stored in as psPtr ). + PS_META_PNG, ///< PNG data (Stored in as psPtr ). + PS_META_ASTROM, ///< Astrometric coefficients (Stored in as psPtr ). + PS_META_UNKNOWN, ///< Other data (Stored in as psPtr ). PS_META_NTYPE ///< Number of types. Must be last. } psMetadataType; @@ -55,13 +55,13 @@ typedef struct psMetadataItem { - const int id; ///< Unique ID for metadata item. + const psS32 id; ///< Unique ID for metadata item. char *restrict name; ///< Name of metadata item. psMetadataType type; ///< Type of metadata item. union { - bool B; ///< boolean data + psBool B; ///< boolean data psS32 S32; ///< Signed 32-bit integer data. psF32 F32; ///< Single-precision float data. psF64 F64; ///< Double-precision float data. - psPTR V; ///< Pointer to other type of data. + psPtr V; ///< Pointer to other type of data. } data; ///< Union for data types. char *comment; ///< Optional comment ("", not NULL). @@ -144,8 +144,8 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAddItem( +psBool psMetadataAddItem( psMetadata* restrict md, ///< Metadata collection to insert metadat item. psMetadataItem* restrict item, ///< Metadata item to be added. - int location ///< Location to be added. + psS32 location ///< Location to be added. ); @@ -156,7 +156,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataAdd( - psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be added. +psBool psMetadataAdd( + psMetadata* restrict md, ///< Metadata collection to insert metadat item. + psS32 where, ///< Location to be added. const char *name, ///< Name of metadata item. psMetadataType type, ///< Type of metadata item. @@ -175,7 +175,7 @@ * @return bool: True for success, false for failure. */ -bool psMetadataRemove( - psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where, ///< Location to be removed. +psBool psMetadataRemove( + psMetadata* restrict md, ///< Metadata collection to insert metadat item. + psS32 where, ///< Location to be removed. const char *restrict key ///< Name of metadata key. ); @@ -203,5 +203,5 @@ psMetadataItem* psMetadataGet( psMetadata* restrict md, ///< Metadata collection to insert metadat item. - int where ///< Location to be retrieved. + psS32 where ///< Location to be retrieved. ); @@ -213,7 +213,7 @@ * @return void: void. */ -bool psMetadataSetIterator( +psBool psMetadataSetIterator( psMetadata* restrict md, ///< Metadata collection to iterate. - int where ///< Location of iterator. + psS32 where ///< Location of iterator. ); @@ -227,5 +227,5 @@ psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. - int which ///< Iterator to be used. + psS32 which ///< Iterator to be used. ); @@ -239,5 +239,5 @@ psMetadata* restrict md, ///< Metadata collection to iterate. const char *restrict match, ///< Beginning of key name. - int which ///< Iterator to be used. + psS32 which ///< Iterator to be used. ); Index: trunk/psLib/src/astronomy/psMetadataIO.c =================================================================== --- trunk/psLib/src/astronomy/psMetadataIO.c (revision 2200) +++ trunk/psLib/src/astronomy/psMetadataIO.c (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-08 00:43:12 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -104,5 +104,5 @@ /** Determines if a line is blank (whitespace only) or a commentline. It returns true if so. The input string * must be null terminated. */ -bool ignoreLine(char *inString) +psBool ignoreLine(char *inString) { while(*inString!='\0' && *inString!='#') { @@ -119,5 +119,5 @@ /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null * terminated copy of the original input string. */ -char *cleanString(char *inString, int sLen) +char *cleanString(char *inString, psS32 sLen) { char *ptrB = NULL; @@ -149,7 +149,7 @@ /** Count repeat occurances of a single character within a line. The input string must be null terminated. */ -int repeatedChars(char *inString, char ch) -{ - int count = 0; +psS32 repeatedChars(char *inString, char ch) +{ + psS32 count = 0; @@ -166,8 +166,8 @@ /** Returns cleaned token based on delimiter, but not including delimiter. Also changes the pointer location * the beginning of the string. Tokens are newly allocated null terminated strings. */ -char* getToken(char **inString, char *delimiter, int *status) +char* getToken(char **inString, char *delimiter, psS32 *status) { char *cleanToken = NULL; - int sLen = 0; + psS32 sLen = 0; @@ -195,5 +195,5 @@ /** Returns single parsed value as a double precision number. The input string must be cleaned and null * terminated. */ -double parseValue(char *inString, int *status) +double parseValue(char *inString, psS32 *status) { char *end = NULL; @@ -212,7 +212,7 @@ /** Returns true or false. 'T', 't', '1', 'F', 'f', and '0' are acceptable, parsable variations. */ -bool parseBool(char *inString, int *status) -{ - bool value = false; +psBool parseBool(char *inString, psS32 *status) +{ + psBool value = false; @@ -229,10 +229,10 @@ /** Returns parsed vector filled with with data. The input string must be null terminated. */ -psVector* parseVector(char *inString, psElemType elemType, int *status) +psVector* parseVector(char *inString, psElemType elemType, psS32 *status) { char *end = NULL; char *saveValue = NULL; - int i = 0; - int numValues = 0; + psS32 i = 0; + psS32 numValues = 0; double value = 0.0; psVector *vec = NULL; @@ -341,8 +341,8 @@ -psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, int extNum, char *fileName) -{ - bool tempBool; - bool success; +psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, psS32 extNum, char *fileName) +{ + psBool tempBool; + psBool success; char keyType; char keyName[FITS_LINE_SIZE]; @@ -350,9 +350,9 @@ char keyComment[FITS_LINE_SIZE]; char fitsErr[MAX_STRING_LENGTH]; - int i; - int hduType = 0; - int status = 0; - int numKeys = 0; - int keyNum = 0; + psS32 i; + psS32 hduType = 0; + psS32 status = 0; + psS32 numKeys = 0; + psS32 keyNum = 0; psMetadataType metadataItemType; fitsfile *fd = NULL; @@ -449,7 +449,7 @@ -int psMetadataParseConfig(psMetadata** md, char *fileName, bool overwrite) -{ - bool tempBool; +psS32 psMetadataParseConfig(psMetadata** md, char *fileName, psBool overwrite) +{ + psBool tempBool; char *line = NULL; char *strName = NULL; @@ -458,7 +458,7 @@ char *strComment = NULL; char *linePtr = NULL; - int status = 0; - int lineCount = 0; - int failedLines = 0; + psS32 status = 0; + psS32 lineCount = 0; + psS32 failedLines = 0; psF64 tempDbl = 0.0; psS32 tempInt = 0.0; Index: trunk/psLib/src/astronomy/psMetadataIO.h =================================================================== --- trunk/psLib/src/astronomy/psMetadataIO.h (revision 2200) +++ trunk/psLib/src/astronomy/psMetadataIO.h (revision 2204) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-06 01:17:39 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ psMetadata* output, ///< Resulting metadata from read. char *extName, ///< File name extension string. - int extNum, ///< File name extension number. Starts at 1. + psS32 extNum, ///< File name extension number. Starts at 1. char *fileName ///< Name of file to read. ); @@ -58,10 +58,10 @@ * Loads pre-defined settings by parsing a configuration file into a psMetadata structure. * - * @return int : Number of lines that failed to be read. + * @return psS32 : Number of lines that failed to be read. */ -int psMetadataParseConfig( +psS32 psMetadataParseConfig( psMetadata** md, ///< Resulting metadata from read. char *fileName, ///< Name of file to read. - bool overwrite ///< Allow overwrite of duplicate specifications. + psBool overwrite ///< Allow overwrite of duplicate specifications. ); Index: trunk/psLib/src/astronomy/psPhotometry.h =================================================================== --- trunk/psLib/src/astronomy/psPhotometry.h (revision 2200) +++ trunk/psLib/src/astronomy/psPhotometry.h (revision 2204) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 23:40:54 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -43,5 +43,5 @@ typedef struct { - const int ID; ///< ID number for this photometric system + const psS32 ID; ///< ID number for this photometric system const char *name; ///< Name of photometric system const char *camera; ///< Camera for photometric system Index: trunk/psLib/src/astronomy/psTime.c =================================================================== --- trunk/psLib/src/astronomy/psTime.c (revision 2200) +++ trunk/psLib/src/astronomy/psTime.c (revision 2204) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-26 00:37:44 $ + * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -144,5 +144,5 @@ static double lookupSer7Table( const psTime *time, ///< time to lookup. - int col ///< Column to lookup. + psS32 col ///< Column to lookup. ); @@ -150,6 +150,6 @@ { char line[LINESIZE]; - int j = 0; - int maxLines = 100; + psS32 j = 0; + psS32 maxLines = 100; psF64 *ptr = NULL; psImage *table = NULL; @@ -180,5 +180,5 @@ } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; p_psMemSetPersistent(table,true); @@ -191,8 +191,8 @@ static psImage* readSer7File(const char *fileName) { - bool beginRecord = false; + psBool beginRecord = false; char line[LINESIZE]; - int j = 0; - int maxLines = 400; + psS32 j = 0; + psS32 maxLines = 400; psImage *table = NULL; FILE *fd = NULL; @@ -231,5 +231,5 @@ } } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; p_psMemSetPersistent(table,true); @@ -244,7 +244,7 @@ { char line[LINESIZE]; - int i = 0; - int j = 0; - int maxLines = 2500; + psS32 i = 0; + psS32 j = 0; + psS32 maxLines = 2500; psImage *table = NULL; FILE *fd = NULL; @@ -276,5 +276,5 @@ } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; return table; @@ -284,6 +284,6 @@ { char line[LINESIZE]; - int j = 0; - int maxLines = 15000; + psS32 j = 0; + psS32 maxLines = 15000; psImage *table = NULL; FILE *fd = NULL; @@ -346,5 +346,5 @@ } - *(unsigned int *)&table->numRows = j; + *(psU32 *)&table->numRows = j; return table; @@ -354,7 +354,7 @@ static double lookupTaiUtcTable(const psTime *time) { - int hiIdx = 0; - int loIdx = 0; - int numRows = 0; + psS32 hiIdx = 0; + psS32 loIdx = 0; + psS32 numRows = 0; double jd = 0.0; double mjd = 0.0; @@ -422,9 +422,9 @@ } -static double lookupSer7Table(const psTime *time, int col) -{ - int hiIdx = 0; - int loIdx = 0; - int numRows = 0; +static double lookupSer7Table(const psTime *time, psS32 col) +{ + psS32 hiIdx = 0; + psS32 loIdx = 0; + psS32 numRows = 0; double out = 0.0; double denom = 0.0; @@ -752,7 +752,7 @@ } -long psTimeLeapseconds(const psTime *time1, const psTime *time2) -{ - long diff = 0; +psS64 psTimeLeapseconds(const psTime *time1, const psTime *time2) +{ + psS64 diff = 0; @@ -827,5 +827,5 @@ char* psTimeToISOTime(const psTime *time) { - int ms = 0; + psS32 ms = 0; char *timeString = NULL; char *tempString = NULL; @@ -889,12 +889,12 @@ struct tm* psTimeToTM(const psTime *time) { - long cent = 0; - long year = 0; - long month = 0; - long day = 0; - long hour = 0; - long minute = 0; - long seconds = 0; - long temp = 0; + psS64 cent = 0; + psS64 year = 0; + psS64 month = 0; + psS64 day = 0; + psS64 hour = 0; + psS64 minute = 0; + psS64 seconds = 0; + psS64 temp = 0; struct tm* tmTime = NULL; @@ -975,7 +975,7 @@ seconds = days * SEC_PER_DAY; if(seconds < 0.0) { - outTime->usec = (seconds - (long)seconds) * -1000000.0; // psTime earlier than epoch + outTime->usec = (seconds - (psS64)seconds) * -1000000.0; // psTime earlier than epoch } else { - outTime->usec = (seconds - (long)seconds) * 1000000.0; // psTime greater than epoch + outTime->usec = (seconds - (psS64)seconds) * 1000000.0; // psTime greater than epoch } outTime->sec = seconds; @@ -1003,7 +1003,7 @@ seconds = days * SEC_PER_DAY; if(seconds < 0.0) { - outTime->usec = (seconds - (long)seconds) * -1000000.0; // psTime earlier than epoch + outTime->usec = (seconds - (psS64)seconds) * -1000000.0; // psTime earlier than epoch } else { - outTime->usec = (seconds - (long)seconds) * 1000000.0; // psTime greater than epoch + outTime->usec = (seconds - (psS64)seconds) * 1000000.0; // psTime greater than epoch } outTime->sec = seconds; @@ -1020,11 +1020,11 @@ { char tempString[MAX_TIME_STRING_LENGTH]; - int month; - int day; - int year; - int hour; - int minute; - int second; - int millisecond; + psS32 month; + psS32 day; + psS32 year; + psS32 hour; + psS32 minute; + psS32 second; + psS32 millisecond; struct tm tmTime; psTime *outTime = NULL; @@ -1127,11 +1127,11 @@ psTime* psTimeFromTM(const struct tm* time) { - long year; - long month; - long day; - long hour; - long minute; - long seconds; - long temp; + psS64 year; + psS64 month; + psS64 day; + psS64 hour; + psS64 minute; + psS64 seconds; + psS64 temp; psTime *outTime = NULL; @@ -1194,5 +1194,5 @@ { psF64 deltaSec = 0; - long deltaUsec = 0; + psS64 deltaUsec = 0; psTime *outTime = NULL; @@ -1243,5 +1243,5 @@ { psS64 deltaSec = 0; - long deltaUsec = 0; + psS64 deltaUsec = 0; psTime *outTime = NULL; @@ -1267,5 +1267,5 @@ outTime = psTimeAlloc(tai1->type); deltaSec = tai1->sec - tai2->sec; - deltaUsec = (long)tai1->usec - (long)tai2->usec; + deltaUsec = (psS64)tai1->usec - (psS64)tai2->usec; // Adjust time in case of microsecond underflow after subtraction @@ -1289,5 +1289,5 @@ { psS64 deltaSec = 0; - long deltaUsec = 0; + psS64 deltaUsec = 0; psTime *outTime = NULL; @@ -1313,5 +1313,5 @@ outTime = psTimeAlloc(tai1->type); deltaSec = tai1->sec - tai2->sec; - deltaUsec = (long)tai1->usec - (long)tai2->usec; + deltaUsec = (psS64)tai1->usec - (psS64)tai2->usec; // Adjust time in case of microsecond underflow after subtraction Index: trunk/psLib/src/astronomy/psTime.h =================================================================== --- trunk/psLib/src/astronomy/psTime.h (revision 2200) +++ trunk/psLib/src/astronomy/psTime.h (revision 2204) @@ -54,6 +54,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-20 20:05:58 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-10-27 00:57:30 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -181,5 +181,5 @@ * @return long: leapseconds added between given times */ -long psTimeLeapseconds( +psS64 psTimeLeapseconds( const psTime* time1, ///< First input time. const psTime* time2 ///< Second input time.