Index: trunk/psLib/src/dataIO/psFits.c =================================================================== --- trunk/psLib/src/dataIO/psFits.c (revision 3495) +++ trunk/psLib/src/dataIO/psFits.c (revision 3500) @@ -7,6 +7,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-03-24 23:52:25 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -190,5 +190,5 @@ } -static bool isHDUEmpty(psFits* fits) +static bool isHDUEmpty(const psFits* fits) { /* check for keys - no keys means this is really an empty HDU */ @@ -265,5 +265,5 @@ } -bool psFitsMoveExtName(psFits* fits, +bool psFitsMoveExtName(const psFits* fits, const char* extname) { @@ -295,5 +295,5 @@ } -bool psFitsMoveExtNum(psFits* fits, +bool psFitsMoveExtNum(const psFits* fits, int extnum, bool relative) @@ -333,5 +333,5 @@ } -int psFitsGetExtNum(psFits* fits) +int psFitsGetExtNum(const psFits* fits) { int hdunum; @@ -347,5 +347,5 @@ } -char* psFitsGetExtName(psFits* fits) +char* psFitsGetExtName(const psFits* fits) { if (fits == NULL) { @@ -368,5 +368,5 @@ } -bool psFitsSetExtName(psFits* fits, const char* name) +bool psFitsSetExtName(const psFits* fits, const char* name) { if (fits == NULL) { @@ -396,5 +396,5 @@ } -int psFitsGetSize(psFits* fits) +int psFitsGetSize(const psFits* fits) { if (fits == NULL) { @@ -419,5 +419,5 @@ } -psFitsType psFitsGetExtType(psFits* fits) +psFitsType psFitsGetExtType(const psFits* fits) { if (fits == NULL) { @@ -583,5 +583,5 @@ psHash* psFitsReadHeaderSet(psHash* out, - psFits* fits) + const psFits* fits) { if (fits == NULL) { @@ -636,5 +636,5 @@ psImage* psFitsReadImage(psImage* output, // a psImage to recycle. - psFits* fits, // the psFits object + const psFits* fits, // the psFits object psRegion region, // the region in the FITS image to read int z) // the z-plane in the FITS image cube to read @@ -652,6 +652,5 @@ psS32 datatype = 0; - if (fits == NULL) - { + if (fits == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_NULL); @@ -662,6 +661,5 @@ // check to see if we even are positioned on an image HDU int hdutype; - if ( fits_get_hdu_type(fits->p_fd,&hdutype, &status) != 0) - { + if ( fits_get_hdu_type(fits->p_fd,&hdutype, &status) != 0) { char fitsErr[MAX_STRING_LENGTH]; (void)fits_get_errstatus(status, fitsErr); @@ -671,6 +669,5 @@ return NULL; } - if (hdutype != IMAGE_HDU) - { + if (hdutype != IMAGE_HDU) { psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_NOT_IMAGE_TYPE); @@ -679,6 +676,5 @@ /* Get the data type 'bitPix' from the FITS image */ - if (fits_get_img_equivtype(fits->p_fd, &bitPix, &status) != 0) - { + if (fits_get_img_equivtype(fits->p_fd, &bitPix, &status) != 0) { fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, @@ -690,6 +686,5 @@ /* Get the dimensions 'nAxis' from the FITS image */ - if (fits_get_img_dim(fits->p_fd, &nAxis, &status) != 0) - { + if (fits_get_img_dim(fits->p_fd, &nAxis, &status) != 0) { (void)fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, @@ -701,6 +696,5 @@ /* Validate the number of axis */ - if ((nAxis < 2) || (nAxis > 3)) - { + if ((nAxis < 2) || (nAxis > 3)) { psError(PS_ERR_IO, true, PS_ERRORTEXT_psFits_IMAGE_DIMENSION_UNSUPPORTED, @@ -711,6 +705,5 @@ /* Get the Image size from the FITS file */ - if (fits_get_img_size(fits->p_fd, nAxis, nAxes, &status) != 0) - { + if (fits_get_img_size(fits->p_fd, nAxis, nAxes, &status) != 0) { (void)fits_get_errstatus(status, fitsErr); psError(PS_ERR_IO, true, @@ -725,16 +718,12 @@ firstPixel[2] = z + 1; - if (region.x1 > 0) - { + if (region.x1 > 0) { lastPixel[0] = region.x1; - } else - { + } else { lastPixel[0] = nAxes[0] + region.x1; // n.b., region.x1 < 0 } - if (region.y1 > 0) - { + if (region.y1 > 0) { lastPixel[1] = region.y1; - } else - { + } else { lastPixel[1] = nAxes[1] + region.y1; // n.b., region.y1 < 0 } @@ -745,6 +734,5 @@ increment[2] = 1; - switch (bitPix) - { + switch (bitPix) { case BYTE_IMG: datatype = PS_TYPE_U8; @@ -796,6 +784,5 @@ datatype); - if (output == NULL) - { + if (output == NULL) { psError(PS_ERR_UNKNOWN, false, "Failed to allocate a properly sized image."); @@ -805,6 +792,5 @@ // n.b., this assumes contiguous image buffer if (fits_read_subset(fits->p_fd, fitsDatatype, firstPixel, lastPixel, increment, - NULL, output->data.V[0], &anynull, &status) != 0) - { + NULL, output->data.V[0], &anynull, &status) != 0) { psFree(output); (void)fits_get_errstatus(status, fitsErr); @@ -819,5 +805,5 @@ } -bool psFitsWriteImage(psFits* fits, +bool psFitsWriteImage(const psFits* fits, const psMetadata* header, const psImage* input, @@ -911,5 +897,5 @@ } -bool psFitsUpdateImage(psFits* fits, +bool psFitsUpdateImage(const psFits* fits, const psImage* input, psRegion region, @@ -1050,5 +1036,5 @@ bool psFitsWriteHeader(const psMetadata* header, - psFits* fits) + const psFits* fits) { @@ -1132,5 +1118,5 @@ } -psMetadata* psFitsReadTableRow(psFits* fits, +psMetadata* psFitsReadTableRow(const psFits* fits, int row) { @@ -1257,5 +1243,5 @@ } -psArray* psFitsReadTableColumn(psFits* fits, +psArray* psFitsReadTableColumn(const psFits* fits, const char* colname) { @@ -1339,5 +1325,5 @@ } -psVector* psFitsReadTableColumnNum(psFits* fits, +psVector* psFitsReadTableColumnNum(const psFits* fits, const char* colname) { @@ -1422,5 +1408,5 @@ -psArray* psFitsReadTable(psFits* fits) +psArray* psFitsReadTable(const psFits* fits) { int status = 0; @@ -1469,5 +1455,5 @@ } -bool psFitsWriteTable(psFits* fits, +bool psFitsWriteTable(const psFits* fits, psMetadata* header, psArray* table, @@ -1650,5 +1636,5 @@ } -bool psFitsUpdateTable(psFits* fits, +bool psFitsUpdateTable(const psFits* fits, psMetadata* data, int row)