IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4343


Ignore:
Timestamp:
Jun 21, 2005, 5:00:27 PM (21 years ago)
Author:
drobbin
Message:

* empty log message *

Location:
trunk/psLib/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/collections/psHash.c

    r4315 r4343  
    1212*  @author GLG, MHPCC
    1313*
    14 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-06-18 02:30:49 $
     14*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2005-06-22 03:00:27 $
    1616*
    1717*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    343343    boolean value defining success or failure
    344344 *****************************************************************************/
    345 psBool psHashAdd(psHash* table,
    346                  const char *key,
    347                  psPtr data)
     345bool psHashAdd(psHash* table,
     346               const char *key,
     347               psPtr data)
    348348{
    349349    PS_ASSERT_PTR_NON_NULL(table, false);
    … …  
    365365    The data associated with that key.
    366366 *****************************************************************************/
    367 psPtr psHashLookup(psHash* table,      // table to lookup key in
     367psPtr psHashLookup(const psHash* table,      // table to lookup key in
    368368                   const char *key)     // key to lookup
    369369{
    … …  
    371371    PS_ASSERT_PTR_NON_NULL(key, NULL);
    372372
    373     return doHashWork(table, key, NULL, false);
     373    return doHashWork((psPtr)table, key, NULL, false);
    374374}
    375375
    … …  
    402402}
    403403
    404 psArray* psHashToArray(psHash* table)
     404psArray* psHashToArray(const psHash* table)
    405405{
    406406    PS_ASSERT_PTR_NON_NULL(table, NULL);

  • trunk/psLib/src/collections/psHash.h

    r4315 r4343  
    1111 *  @author GLG, MHPCC
    1212 *
    13  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-18 02:30:49 $
     13 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-22 03:00:27 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5151
    5252/// Insert entry into table.
    53 psBool psHashAdd(
     53bool psHashAdd(
    5454    psHash* table,                     ///< The table to insert in.
    5555    const char *key,                   ///< The key to use.
    … …  
    5959/// Lookup key in table.
    6060psPtr psHashLookup(
    61     psHash* table,                     ///< The table to lookup key in.
     61    const psHash* table,               ///< The table to lookup key in.
    6262    const char *key                    ///< The key to lookup.
    6363);
    … …  
    7979 */
    8080psArray* psHashToArray(
    81     psHash* table                 ///< The table to convert to psArray.
     81    const psHash* table                ///< The table to convert to psArray.
    8282);
    8383

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

    r4342 r4343  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-22 02:05:41 $
     9 *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-22 03:00:27 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    794794}
    795795
    796 bool psFitsWriteImage(const psFits* fits,
    797                       const psMetadata* header,
     796bool psFitsWriteImage(psFits* fits,
     797                      psMetadata* header,
    798798                      const psImage* input,
    799799                      int numZPlanes)
    … …  
    845845    // write the header, if any.
    846846    if (header != NULL) {
    847         psFitsWriteHeader(header, fits);
     847        psFitsWriteHeader(header, (psPtr)fits);
    848848    }
    849849
    … …  
    10201020
    10211021bool psFitsWriteHeader(const psMetadata* output,
    1022                        const psFits* fits)
     1022                       psFits* fits)
    10231023{
    10241024
    … …  
    14461446}
    14471447
    1448 bool psFitsWriteTable(const psFits* fits,
    1449                       psMetadata* header,
    1450                       psArray* table)
     1448bool psFitsWriteTable(psFits* fits,
     1449                      const psMetadata* header,
     1450                      const psArray* table)
    14511451{
    14521452    int status = 0;
    … …  
    16341634}
    16351635
    1636 bool psFitsUpdateTable(const psFits* fits,
    1637                        psMetadata* data,
     1636bool psFitsUpdateTable(psFits* fits,
     1637                       const psMetadata* data,
    16381638                       int row)
    16391639{
    … …  
    16681668    }
    16691669
    1670     psMetadataIterator* iter = psMetadataIteratorAlloc(data,PS_LIST_HEAD,NULL);
     1670    psMetadataIterator* iter = psMetadataIteratorAlloc((psPtr)data,PS_LIST_HEAD,NULL);
    16711671
    16721672    psMetadataItem* item;

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

    r4342 r4343  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-22 02:05:41 $
     9 *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-22 03:00:27 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    156156bool psFitsWriteHeader(
    157157    const psMetadata* output,          ///< the psMetadata data in which to write
    158     const psFits* fits                 ///< the psFits object
     158    psFits* fits                       ///< the psFits object
    159159);
    160160
    … …  
    175175 */
    176176bool psFitsWriteImage(
    177     const psFits* fits,                ///< the psFits object
    178     const psMetadata* header,          ///< header items for the new HDU.  Can be NULL.
     177    psFits* fits,                      ///< the psFits object
     178    psMetadata* header,                ///< header items for the new HDU.  Can be NULL.
    179179    const psImage* input,              ///< the image to output
    180180    int depth                          ///< the number of z-planes of the FITS image data cube
    … …  
    245245 */
    246246bool psFitsWriteTable(
    247     const psFits* fits,                ///< the psFits object
    248     psMetadata* header,                ///< header items for the new HDU.  Can be NULL.
    249     psArray* table
     247    psFits* fits,                      ///< the psFits object
     248    const psMetadata* header,          ///< header items for the new HDU.  Can be NULL.
     249    const psArray* table
    250250    ///< Array of psMetadata items, which contains the output data items of each row.
    251251);
    … …  
    259259 */
    260260bool psFitsUpdateTable(
    261     const psFits* fits,                ///< the psFits object
    262     psMetadata* data,
     261    psFits* fits,                ///< the psFits object
     262    const psMetadata* data,
    263263    ///< Array of psMetadata items, which contains the output data items of each row.
    264264    int row                            ///< the row number to update.

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

    r4342 r4343  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-22 02:05:41 $
     9 *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-22 03:00:27 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    794794}
    795795
    796 bool psFitsWriteImage(const psFits* fits,
    797                       const psMetadata* header,
     796bool psFitsWriteImage(psFits* fits,
     797                      psMetadata* header,
    798798                      const psImage* input,
    799799                      int numZPlanes)
    … …  
    845845    // write the header, if any.
    846846    if (header != NULL) {
    847         psFitsWriteHeader(header, fits);
     847        psFitsWriteHeader(header, (psPtr)fits);
    848848    }
    849849
    … …  
    10201020
    10211021bool psFitsWriteHeader(const psMetadata* output,
    1022                        const psFits* fits)
     1022                       psFits* fits)
    10231023{
    10241024
    … …  
    14461446}
    14471447
    1448 bool psFitsWriteTable(const psFits* fits,
    1449                       psMetadata* header,
    1450                       psArray* table)
     1448bool psFitsWriteTable(psFits* fits,
     1449                      const psMetadata* header,
     1450                      const psArray* table)
    14511451{
    14521452    int status = 0;
    … …  
    16341634}
    16351635
    1636 bool psFitsUpdateTable(const psFits* fits,
    1637                        psMetadata* data,
     1636bool psFitsUpdateTable(psFits* fits,
     1637                       const psMetadata* data,
    16381638                       int row)
    16391639{
    … …  
    16681668    }
    16691669
    1670     psMetadataIterator* iter = psMetadataIteratorAlloc(data,PS_LIST_HEAD,NULL);
     1670    psMetadataIterator* iter = psMetadataIteratorAlloc((psPtr)data,PS_LIST_HEAD,NULL);
    16711671
    16721672    psMetadataItem* item;

  • trunk/psLib/src/fits/psFits.h

    r4342 r4343  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-22 02:05:41 $
     9 *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-22 03:00:27 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    156156bool psFitsWriteHeader(
    157157    const psMetadata* output,          ///< the psMetadata data in which to write
    158     const psFits* fits                 ///< the psFits object
     158    psFits* fits                       ///< the psFits object
    159159);
    160160
    … …  
    175175 */
    176176bool psFitsWriteImage(
    177     const psFits* fits,                ///< the psFits object
    178     const psMetadata* header,          ///< header items for the new HDU.  Can be NULL.
     177    psFits* fits,                      ///< the psFits object
     178    psMetadata* header,                ///< header items for the new HDU.  Can be NULL.
    179179    const psImage* input,              ///< the image to output
    180180    int depth                          ///< the number of z-planes of the FITS image data cube
    … …  
    245245 */
    246246bool psFitsWriteTable(
    247     const psFits* fits,                ///< the psFits object
    248     psMetadata* header,                ///< header items for the new HDU.  Can be NULL.
    249     psArray* table
     247    psFits* fits,                      ///< the psFits object
     248    const psMetadata* header,          ///< header items for the new HDU.  Can be NULL.
     249    const psArray* table
    250250    ///< Array of psMetadata items, which contains the output data items of each row.
    251251);
    … …  
    259259 */
    260260bool psFitsUpdateTable(
    261     const psFits* fits,                ///< the psFits object
    262     psMetadata* data,
     261    psFits* fits,                ///< the psFits object
     262    const psMetadata* data,
    263263    ///< Array of psMetadata items, which contains the output data items of each row.
    264264    int row                            ///< the row number to update.

  • trunk/psLib/src/types/psHash.c

    r4315 r4343  
    1212*  @author GLG, MHPCC
    1313*
    14 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-06-18 02:30:49 $
     14*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2005-06-22 03:00:27 $
    1616*
    1717*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    343343    boolean value defining success or failure
    344344 *****************************************************************************/
    345 psBool psHashAdd(psHash* table,
    346                  const char *key,
    347                  psPtr data)
     345bool psHashAdd(psHash* table,
     346               const char *key,
     347               psPtr data)
    348348{
    349349    PS_ASSERT_PTR_NON_NULL(table, false);
    … …  
    365365    The data associated with that key.
    366366 *****************************************************************************/
    367 psPtr psHashLookup(psHash* table,      // table to lookup key in
     367psPtr psHashLookup(const psHash* table,      // table to lookup key in
    368368                   const char *key)     // key to lookup
    369369{
    … …  
    371371    PS_ASSERT_PTR_NON_NULL(key, NULL);
    372372
    373     return doHashWork(table, key, NULL, false);
     373    return doHashWork((psPtr)table, key, NULL, false);
    374374}
    375375
    … …  
    402402}
    403403
    404 psArray* psHashToArray(psHash* table)
     404psArray* psHashToArray(const psHash* table)
    405405{
    406406    PS_ASSERT_PTR_NON_NULL(table, NULL);

  • trunk/psLib/src/types/psHash.h

    r4315 r4343  
    1111 *  @author GLG, MHPCC
    1212 *
    13  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-18 02:30:49 $
     13 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-06-22 03:00:27 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5151
    5252/// Insert entry into table.
    53 psBool psHashAdd(
     53bool psHashAdd(
    5454    psHash* table,                     ///< The table to insert in.
    5555    const char *key,                   ///< The key to use.
    … …  
    5959/// Lookup key in table.
    6060psPtr psHashLookup(
    61     psHash* table,                     ///< The table to lookup key in.
     61    const psHash* table,               ///< The table to lookup key in.
    6262    const char *key                    ///< The key to lookup.
    6363);
    … …  
    7979 */
    8080psArray* psHashToArray(
    81     psHash* table                 ///< The table to convert to psArray.
     81    const psHash* table                ///< The table to convert to psArray.
    8282);
    8383
Note: See TracChangeset for help on using the changeset viewer.