IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 24, 2005, 1:52:25 PM (21 years ago)
Author:
desonia
Message:

modifications to add const to psFits parameters of functions.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/dataIO/psFits.c

    r3495 r3500  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-03-24 22:21:17 $
     9 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-03-24 23:52:25 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    190190}
    191191
    192 static bool isHDUEmpty(psFits* fits)
     192static bool isHDUEmpty(const psFits* fits)
    193193{
    194194    /* check for keys - no keys means this is really an empty HDU */
    … …  
    265265}
    266266
    267 bool psFitsMoveExtName(psFits* fits,
     267bool psFitsMoveExtName(const psFits* fits,
    268268                       const char* extname)
    269269{
    … …  
    295295}
    296296
    297 bool psFitsMoveExtNum(psFits* fits,
     297bool psFitsMoveExtNum(const psFits* fits,
    298298                      int extnum,
    299299                      bool relative)
    … …  
    333333}
    334334
    335 int psFitsGetExtNum(psFits* fits)
     335int psFitsGetExtNum(const psFits* fits)
    336336{
    337337    int hdunum;
    … …  
    347347}
    348348
    349 char* psFitsGetExtName(psFits* fits)
     349char* psFitsGetExtName(const psFits* fits)
    350350{
    351351    if (fits == NULL) {
    … …  
    368368}
    369369
    370 bool psFitsSetExtName(psFits* fits, const char* name)
     370bool psFitsSetExtName(const psFits* fits, const char* name)
    371371{
    372372    if (fits == NULL) {
    … …  
    396396}
    397397
    398 int psFitsGetSize(psFits* fits)
     398int psFitsGetSize(const psFits* fits)
    399399{
    400400    if (fits == NULL) {
    … …  
    419419}
    420420
    421 psFitsType psFitsGetExtType(psFits* fits)
     421psFitsType psFitsGetExtType(const psFits* fits)
    422422{
    423423    if (fits == NULL) {
    … …  
    583583
    584584psHash* psFitsReadHeaderSet(psHash* out,
    585                             psFits* fits)
     585                            const psFits* fits)
    586586{
    587587    if (fits == NULL) {
    … …  
    636636
    637637psImage* psFitsReadImage(psImage* output, // a psImage to recycle.
    638                          psFits* fits,    // the psFits object
     638                         const psFits* fits,    // the psFits object
    639639                         psRegion region, // the region in the FITS image to read
    640640                         int z)           // the z-plane in the FITS image cube to read
    … …  
    652652    psS32 datatype = 0;
    653653
    654     if (fits == NULL)
    655     {
     654    if (fits == NULL) {
    656655        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    657656                PS_ERRORTEXT_psFits_NULL);
    … …  
    662661    // check to see if we even are positioned on an image HDU
    663662    int hdutype;
    664     if ( fits_get_hdu_type(fits->p_fd,&hdutype, &status) != 0)
    665     {
     663    if ( fits_get_hdu_type(fits->p_fd,&hdutype, &status) != 0) {
    666664        char fitsErr[MAX_STRING_LENGTH];
    667665        (void)fits_get_errstatus(status, fitsErr);
    … …  
    671669        return NULL;
    672670    }
    673     if (hdutype != IMAGE_HDU)
    674     {
     671    if (hdutype != IMAGE_HDU) {
    675672        psError(PS_ERR_IO, true,
    676673                PS_ERRORTEXT_psFits_NOT_IMAGE_TYPE);
    … …  
    679676
    680677    /* Get the data type 'bitPix' from the FITS image */
    681     if (fits_get_img_equivtype(fits->p_fd, &bitPix, &status) != 0)
    682     {
     678    if (fits_get_img_equivtype(fits->p_fd, &bitPix, &status) != 0) {
    683679        fits_get_errstatus(status, fitsErr);
    684680        psError(PS_ERR_IO, true,
    … …  
    690686
    691687    /* Get the dimensions 'nAxis' from the FITS image */
    692     if (fits_get_img_dim(fits->p_fd, &nAxis, &status) != 0)
    693     {
     688    if (fits_get_img_dim(fits->p_fd, &nAxis, &status) != 0) {
    694689        (void)fits_get_errstatus(status, fitsErr);
    695690        psError(PS_ERR_IO, true,
    … …  
    701696
    702697    /* Validate the number of axis */
    703     if ((nAxis < 2) || (nAxis > 3))
    704     {
     698    if ((nAxis < 2) || (nAxis > 3)) {
    705699        psError(PS_ERR_IO, true,
    706700                PS_ERRORTEXT_psFits_IMAGE_DIMENSION_UNSUPPORTED,
    … …  
    711705
    712706    /* Get the Image size from the FITS file */
    713     if (fits_get_img_size(fits->p_fd, nAxis, nAxes, &status) != 0)
    714     {
     707    if (fits_get_img_size(fits->p_fd, nAxis, nAxes, &status) != 0) {
    715708        (void)fits_get_errstatus(status, fitsErr);
    716709        psError(PS_ERR_IO, true,
    … …  
    725718    firstPixel[2] = z + 1;
    726719
    727     if (region.x1 > 0)
    728     {
     720    if (region.x1 > 0) {
    729721        lastPixel[0] = region.x1;
    730     } else
    731     {
     722    } else {
    732723        lastPixel[0] = nAxes[0] + region.x1; // n.b., region.x1 < 0
    733724    }
    734     if (region.y1 > 0)
    735     {
     725    if (region.y1 > 0) {
    736726        lastPixel[1] = region.y1;
    737     } else
    738     {
     727    } else {
    739728        lastPixel[1] = nAxes[1] + region.y1; // n.b., region.y1 < 0
    740729    }
    … …  
    745734    increment[2] = 1;
    746735
    747     switch (bitPix)
    748     {
     736    switch (bitPix) {
    749737    case BYTE_IMG:
    750738        datatype = PS_TYPE_U8;
    … …  
    796784                            datatype);
    797785
    798     if (output == NULL)
    799     {
     786    if (output == NULL) {
    800787        psError(PS_ERR_UNKNOWN, false,
    801788                "Failed to allocate a properly sized image.");
    … …  
    805792    // n.b., this assumes contiguous image buffer
    806793    if (fits_read_subset(fits->p_fd, fitsDatatype, firstPixel, lastPixel, increment,
    807                          NULL, output->data.V[0], &anynull, &status) != 0)
    808     {
     794                         NULL, output->data.V[0], &anynull, &status) != 0) {
    809795        psFree(output);
    810796        (void)fits_get_errstatus(status, fitsErr);
    … …  
    819805}
    820806
    821 bool psFitsWriteImage(psFits* fits,
     807bool psFitsWriteImage(const psFits* fits,
    822808                      const psMetadata* header,
    823809                      const psImage* input,
    … …  
    911897}
    912898
    913 bool psFitsUpdateImage(psFits* fits,
     899bool psFitsUpdateImage(const psFits* fits,
    914900                       const psImage* input,
    915901                       psRegion region,
    … …  
    10501036
    10511037bool psFitsWriteHeader(const psMetadata* header,
    1052                        psFits* fits)
     1038                       const psFits* fits)
    10531039{
    10541040
    … …  
    11321118}
    11331119
    1134 psMetadata* psFitsReadTableRow(psFits* fits,
     1120psMetadata* psFitsReadTableRow(const psFits* fits,
    11351121                               int row)
    11361122{
    … …  
    12571243}
    12581244
    1259 psArray* psFitsReadTableColumn(psFits* fits,
     1245psArray* psFitsReadTableColumn(const psFits* fits,
    12601246                               const char* colname)
    12611247{
    … …  
    13391325}
    13401326
    1341 psVector* psFitsReadTableColumnNum(psFits* fits,
     1327psVector* psFitsReadTableColumnNum(const psFits* fits,
    13421328                                   const char* colname)
    13431329{
    … …  
    14221408
    14231409
    1424 psArray* psFitsReadTable(psFits* fits)
     1410psArray* psFitsReadTable(const psFits* fits)
    14251411{
    14261412    int status = 0;
    … …  
    14691455}
    14701456
    1471 bool psFitsWriteTable(psFits* fits,
     1457bool psFitsWriteTable(const psFits* fits,
    14721458                      psMetadata* header,
    14731459                      psArray* table,
    … …  
    16501636}
    16511637
    1652 bool psFitsUpdateTable(psFits* fits,
     1638bool psFitsUpdateTable(const psFits* fits,
    16531639                       psMetadata* data,
    16541640                       int row)
Note: See TracChangeset for help on using the changeset viewer.