IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4590


Ignore:
Timestamp:
Jul 20, 2005, 4:39:58 PM (21 years ago)
Author:
drobbin
Message:

made minor changes according to most recent api-delta report from IFA

Location:
trunk/psLib
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astro/psTime.h

    r4409 r4590  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-06-28 20:17:52 $
     13 *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-07-21 02:39:57 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6464    psS64 sec;                         ///< Seconds since epoch, Jan 1, 1970.
    6565    psU32 nsec;                        ///< Nanoseconds since last second.
    66     psBool leapsecond;                 ///< if time falls on UTC leapsecond
     66    bool leapsecond;                   ///< if time falls on UTC leapsecond
    6767    psTimeType type;                   ///< Type of time.
    6868}

  • trunk/psLib/src/imageops/psImagePixelExtract.h

    r4385 r4590  
    88*  @author Robert DeSonia, MHPCC
    99*
    10 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-06-25 00:51:28 $
     10*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2005-07-21 02:39:57 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3030    PS_CUT_X_NEG,                      ///< Cut in the x dimension from rigth to left
    3131    PS_CUT_Y_POS,                      ///< Cut in the y dimension from bottom up
    32     PS_CUT_Y_NEG,                      ///< Cut in the y dimension from top down.
     32    PS_CUT_Y_NEG                       ///< Cut in the y dimension from top down.
    3333} psImageCutDirection;
    3434

  • trunk/psLib/src/mathtypes/psImage.h

    r4540 r4590  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-07-12 19:12:01 $
     13 *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-07-21 02:39:57 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3939    PS_INTERPOLATE_LANCZOS2_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS2
    4040    PS_INTERPOLATE_LANCZOS3_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS3
    41     PS_INTERPOLATE_LANCZOS4_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS4
     41    PS_INTERPOLATE_LANCZOS4_VARIANCE   ///< Variance version of PS_INTERPOLATE_LANCZOS4
    4242    //    PS_INTERPOLATE_NUM_MODES           ///< enum end-marker; does not coorespond to a interpolation mode
    4343} psImageInterpolateMode;

  • trunk/psLib/src/sys/psMemory.h

    r4589 r4590  
    1212 *  @ingroup MemoryManagement
    1313 *
    14  *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2005-07-21 01:40:10 $
     14 *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2005-07-21 02:39:57 $
    1616 *
    1717 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    118118 *  @ingroup memCallback
    119119 */
    120 typedef void* (*psMemExhaustedCallback) (
     120typedef psPtr (*psMemExhaustedCallback) (
    121121    size_t size                        ///< the size of buffer required
    122122);

  • trunk/psLib/src/sys/psType.h

    r4540 r4590  
    1010*  @author Ross Harman, MHPCC
    1111*
    12 *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-07-12 19:12:01 $
     12*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-07-21 02:39:57 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    131131    PS_DATA_SCALAR,                    ///< psScalar
    132132    PS_DATA_SPHERE,                    ///< psSphere
    133     PS_DATA_SPHERETRANSFORM,           ///< psSphereTransform
     133    PS_DATA_SPHEREROT,           ///< psSphereTransform
    134134    PS_DATA_SPLINE1D,                  ///< psSpline1D
    135135    PS_DATA_STATS,                     ///< psStats

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

    r4556 r4590  
    77 *  @ingroup LinkedList
    88 *
    9  *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-07-15 02:33:54 $
     9 *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-07-21 02:39:57 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7777psList* list;                      ///< List iterator to works on
    7878psListElem* cursor;                ///< current cursor position
    79 int index;                         ///< the index number in the list
    8079bool offEnd;                       ///< Iterator off the end?
     80long index;                         ///< the index number in the list
    8181bool mutable;                      ///< Is it permissible to modify the list?
    8282}

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

    r4589 r4590  
    1212*  @author Ross Harman, MHPCC
    1313*
    14 *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
    15 *  @date $Date: 2005-07-21 01:40:10 $
     14*  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
     15*  @date $Date: 2005-07-21 02:39:57 $
    1616*
    1717*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    135135    }
    136136    psFree(metadata->list);
    137     psFree(metadata->table);
     137    psFree(metadata->hash);
    138138
    139139}
    … …  
    256256{
    257257    psList* list = NULL;
    258     psHash* table = NULL;
     258    psHash* hash = NULL;
    259259    psMetadata* metadata = NULL;
    260260
    … …  
    266266    // Allocate metadata's internal containers
    267267    list = (psList*) psListAlloc(NULL);
    268     table = (psHash*) psHashAlloc(10);
     268    hash = (psHash*) psHashAlloc(10);
    269269
    270270    metadata->list = list;
    271     metadata->table = table;
     271    metadata->hash = hash;
    272272
    273273    return metadata;
    … …  
    285285
    286286    PS_ASSERT_PTR_NON_NULL(md,NULL);
    287     PS_ASSERT_PTR_NON_NULL(md->table,NULL);
     287    PS_ASSERT_PTR_NON_NULL(md->hash,NULL);
    288288    PS_ASSERT_PTR_NON_NULL(md->list,NULL);
    289289    PS_ASSERT_PTR_NON_NULL(item,NULL);
    290290    PS_ASSERT_PTR_NON_NULL(item->name,NULL);
    291291
    292     mdTable = md->table;
     292    mdTable = md->hash;
    293293    mdList = md->list;
    294294    key = item->name;
    … …  
    435435    psList* mdList = md->list;
    436436
    437     PS_ASSERT_PTR_NON_NULL(md->table,NULL);
    438     psHash* mdTable = md->table;
     437    PS_ASSERT_PTR_NON_NULL(md->hash,NULL);
     438    psHash* mdTable = md->hash;
    439439
    440440    // Select removal by key or index
    … …  
    504504
    505505    PS_ASSERT_PTR_NON_NULL(md,NULL);
    506     PS_ASSERT_PTR_NON_NULL(md->table,NULL);
     506    PS_ASSERT_PTR_NON_NULL(md->hash,NULL);
    507507    PS_ASSERT_PTR_NON_NULL(key,NULL);
    508508
    509     mdTable = md->table;
     509    mdTable = md->hash;
    510510    entry = (psMetadataItem*)psHashLookup(mdTable, key);
    511511

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

    r4589 r4590  
    1111*  @author Ross Harman, MHPCC
    1212*
    13 *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2005-07-21 01:40:10 $
     13*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2005-07-21 02:39:57 $
    1515*
    1616*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9393{
    9494    psList*  list;                     ///< Metadata in linked-list
    95     psHash*  table;                    ///< Metadata in a hash table
     95    psHash*  hash;                     ///< Metadata in a hash table
    9696    void *lock;                        ///< Optional lock for thread safety
    9797}

  • trunk/psLib/test/types/tst_psMetadata_01.c

    r4547 r4590  
    1818*  @author  Ross Harman, MHPCC
    1919*
    20 *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    21 *  @date  $Date: 2005-07-13 02:47:01 $
     20*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     21*  @date  $Date: 2005-07-21 02:39:57 $
    2222*
    2323*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3939    printMetadataList(metadata->list, " ");
    4040    printf("\nContents of metadata table:\n");
    41     printMetadataTable(metadata->table);
     41    printMetadataTable(metadata->hash);
    4242}
    4343

  • trunk/psLib/test/types/tst_psMetadata_03.c

    r4547 r4590  
    1818*  @author  Ross Harman, MHPCC
    1919*
    20 *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    21 *  @date  $Date: 2005-07-13 02:47:01 $
     20*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     21*  @date  $Date: 2005-07-21 02:39:57 $
    2222*
    2323*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    164164                            "Couldn't add item to invalid metadata structure.",0);
    165165    errMetadata = psMetadataAlloc();
    166     mdTable = errMetadata->table;
    167     errMetadata->table = NULL;
     166    mdTable = errMetadata->hash;
     167    errMetadata->hash = NULL;
    168168    if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD, PS_META_DEFAULT) ) {
    169169        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
    … …  
    174174        return 31;
    175175    }
    176     errMetadata->table = mdTable;
     176    errMetadata->hash = mdTable;
    177177    printFooter(stdout,"psMetadata","Test G - Attempt to add item to invalid metadata w/o hash table", true);
    178178
    … …  
    208208    printNegativeTestHeader(stdout,"psMetadata","Test J - Attempt to add item to metadata w/o hash table",
    209209                            "Couldn't add item to invalid metadata structure.",0);
    210     mdTable = errMetadata->table;
    211     errMetadata->table = NULL;
     210    mdTable = errMetadata->hash;
     211    errMetadata->hash = NULL;
    212212    if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32, "Integer",22) ) {
    213213        psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table.");
    214214        return 24;
    215215    }
    216     errMetadata->table = mdTable;
     216    errMetadata->hash = mdTable;
    217217    printFooter(stdout,"psMetadata","Test J - Attempt to add item to invalid metadata w/o hash table", true);
    218218

  • trunk/psLib/test/types/tst_psMetadata_04.c

    r4547 r4590  
    2323*  @author  Ross Harman, MHPCC
    2424*
    25 *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
    26 *  @date  $Date: 2005-07-13 02:47:01 $
     25*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
     26*  @date  $Date: 2005-07-21 02:39:57 $
    2727*
    2828*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    219219    printNegativeTestHeader(stdout,"psMetadata","Test L - Attemp to look up with an invalid metadata",
    220220                            "Lookup item with invalid metadata object.", 0 );
    221     tmpTable = metadata->table;
    222     metadata->table = NULL;
     221    tmpTable = metadata->hash;
     222    metadata->hash = NULL;
    223223    if ( psMetadataLookup(metadata,"myItem2") != NULL ) {
    224224        psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object");
    225225        return 20;
    226226    }
    227     metadata->table = tmpTable;
     227    metadata->hash = tmpTable;
    228228    printFooter(stdout, "psMetadata","Test L - Attempt to lookup an invalid metadata object.",true);
    229229

  • trunk/psLib/test/types/verified/tst_psMetadata_03.stderr

    r4547 r4590  
    66    Could not find metadata item at index 22.
    77<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
    8     Unallowable operation: md->table is NULL.
     8    Unallowable operation: md->hash is NULL.
    99<DATE><TIME>|<HOST>|E|psMetadataRemove (FILE:LINENO)
    10     Unallowable operation: md->table is NULL.
     10    Unallowable operation: md->hash is NULL.
    1111<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
    1212    Unallowable operation: md->list is NULL.
    … …  
    1616    Unallowable operation: item->name is NULL.
    1717<DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
    18     Unallowable operation: md->table is NULL.
     18    Unallowable operation: md->hash is NULL.
    1919<DATE><TIME>|<HOST>|E|psMetadataAddV (FILE:LINENO)
    2020    Failed to add metadata item to metadata collection list.

  • trunk/psLib/test/types/verified/tst_psMetadata_04.stderr

    r4547 r4590  
    1212    Could not find metadata item at index 22.
    1313<DATE><TIME>|<HOST>|E|psMetadataLookup (FILE:LINENO)
    14     Unallowable operation: md->table is NULL.
     14    Unallowable operation: md->hash is NULL.
    1515<DATE><TIME>|<HOST>|E|psMetadataGet (FILE:LINENO)
    1616    Unallowable operation: md->list is NULL.
Note: See TracChangeset for help on using the changeset viewer.