IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 25, 2005, 10:26:55 AM (21 years ago)
Author:
gusciora
Message:

I renamed many of the PS_CHECK macros to PS_ASSERT...

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astro/psCoord.c

    r3991 r4029  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2005-05-20 00:15:50 $
     12*  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2005-05-25 20:26:55 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    9494psPlaneTransform *p_psPlaneTransformLinearInvert(psPlaneTransform *transform)
    9595{
    96     PS_PTR_CHECK_NULL(transform, 0);
    97     PS_PTR_CHECK_NULL(transform->x, 0);
    98     PS_PTR_CHECK_NULL(transform->y, 0);
     96    PS_ASSERT_PTR_NON_NULL(transform, 0);
     97    PS_ASSERT_PTR_NON_NULL(transform->x, 0);
     98    PS_ASSERT_PTR_NON_NULL(transform->y, 0);
    9999
    100100    psF64 A = 0.0;
    … …  
    160160psS32 p_psIsProjectionLinear(psPlaneTransform *transform)
    161161{
    162     PS_PTR_CHECK_NULL(transform, 0);
    163     PS_PTR_CHECK_NULL(transform->x, 0);
    164     PS_PTR_CHECK_NULL(transform->y, 0);
     162    PS_ASSERT_PTR_NON_NULL(transform, 0);
     163    PS_ASSERT_PTR_NON_NULL(transform->x, 0);
     164    PS_ASSERT_PTR_NON_NULL(transform->y, 0);
    165165
    166166    for (psS32 i=0;i<(transform->x->nX);i++) {
    … …  
    223223psPlaneTransform* psPlaneTransformAlloc(psS32 n1, psS32 n2)
    224224{
    225     PS_INT_CHECK_NON_NEGATIVE(n1, NULL);
    226     PS_INT_CHECK_NON_NEGATIVE(n2, NULL);
     225    PS_ASSERT_INT_NONNEGATIVE(n1, NULL);
     226    PS_ASSERT_INT_NONNEGATIVE(n2, NULL);
    227227
    228228    psPlaneTransform *pt = psAlloc(sizeof(psPlaneTransform));
    … …  
    238238                               const psPlane* coords)
    239239{
    240     PS_PTR_CHECK_NULL(transform, NULL);
    241     PS_PTR_CHECK_NULL(transform->x, NULL);
    242     PS_PTR_CHECK_NULL(transform->y, NULL);
    243     PS_PTR_CHECK_NULL(coords, NULL);
     240    PS_ASSERT_PTR_NON_NULL(transform, NULL);
     241    PS_ASSERT_PTR_NON_NULL(transform->x, NULL);
     242    PS_ASSERT_PTR_NON_NULL(transform->y, NULL);
     243    PS_ASSERT_PTR_NON_NULL(coords, NULL);
    244244
    245245    if (out == NULL) {
    … …  
    267267psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4)
    268268{
    269     PS_INT_CHECK_NON_NEGATIVE(n1, NULL);
    270     PS_INT_CHECK_NON_NEGATIVE(n2, NULL);
    271     PS_INT_CHECK_NON_NEGATIVE(n3, NULL);
    272     PS_INT_CHECK_NON_NEGATIVE(n4, NULL);
     269    PS_ASSERT_INT_NONNEGATIVE(n1, NULL);
     270    PS_ASSERT_INT_NONNEGATIVE(n2, NULL);
     271    PS_ASSERT_INT_NONNEGATIVE(n3, NULL);
     272    PS_ASSERT_INT_NONNEGATIVE(n4, NULL);
    273273
    274274    psPlaneDistort *pt = psAlloc(sizeof(psPlaneDistort));
    … …  
    290290                             float magnitude)
    291291{
    292     PS_PTR_CHECK_NULL(transform, NULL);
    293     PS_PTR_CHECK_NULL(transform->x, NULL);
    294     PS_PTR_CHECK_NULL(transform->y, NULL);
    295     PS_PTR_CHECK_NULL(coords, NULL);
     292    PS_ASSERT_PTR_NON_NULL(transform, NULL);
     293    PS_ASSERT_PTR_NON_NULL(transform->x, NULL);
     294    PS_ASSERT_PTR_NON_NULL(transform->y, NULL);
     295    PS_ASSERT_PTR_NON_NULL(coords, NULL);
    296296
    297297    if (out == NULL) {
    … …  
    364364                                 const psSphere* coord)
    365365{
    366     PS_PTR_CHECK_NULL(transform, NULL);
    367     PS_PTR_CHECK_NULL(coord, NULL);
     366    PS_ASSERT_PTR_NON_NULL(transform, NULL);
     367    PS_ASSERT_PTR_NON_NULL(coord, NULL);
    368368
    369369    if (out == NULL) {
    … …  
    394394
    395395    // Check for null parameter
    396     PS_PTR_CHECK_NULL(time, NULL);
     396    PS_ASSERT_PTR_NON_NULL(time, NULL);
    397397
    398398    // Convert psTime to MJD
    … …  
    427427
    428428    // Check for null parameter
    429     PS_PTR_CHECK_NULL(time, NULL);
     429    PS_ASSERT_PTR_NON_NULL(time, NULL);
    430430
    431431    // Convert psTime to MJD
    … …  
    498498                   const psProjection* projection)
    499499{
    500     PS_PTR_CHECK_NULL(coord, NULL);
    501     PS_PTR_CHECK_NULL(projection, NULL);
     500    PS_ASSERT_PTR_NON_NULL(coord, NULL);
     501    PS_ASSERT_PTR_NON_NULL(projection, NULL);
    502502
    503503    psF64   theta = 0.0;
    … …  
    550550                      const psProjection* projection)
    551551{
    552     PS_PTR_CHECK_NULL(coord, NULL);
    553     PS_PTR_CHECK_NULL(projection, NULL);
     552    PS_ASSERT_PTR_NON_NULL(coord, NULL);
     553    PS_ASSERT_PTR_NON_NULL(projection, NULL);
    554554
    555555    psF64  theta = 0.0;
    … …  
    622622                            psSphereOffsetUnit unit)
    623623{
    624     PS_PTR_CHECK_NULL(position1, NULL);
    625     PS_PTR_CHECK_NULL(position2, NULL);
     624    PS_ASSERT_PTR_NON_NULL(position1, NULL);
     625    PS_ASSERT_PTR_NON_NULL(position2, NULL);
    626626
    627627    // Check positions near 90 degree and issue warnings if necessary
    … …  
    721721                            psSphereOffsetUnit unit)
    722722{
    723     PS_PTR_CHECK_NULL(position, NULL);
    724     PS_PTR_CHECK_NULL(offset, NULL);
     723    PS_ASSERT_PTR_NON_NULL(position, NULL);
     724    PS_ASSERT_PTR_NON_NULL(offset, NULL);
    725725
    726726    psSphere* tmp;
    … …  
    811811{
    812812    // Check input for NULL pointers
    813     PS_PTR_CHECK_NULL(coords, NULL);
    814     PS_PTR_CHECK_NULL(fromTime, NULL);
    815     PS_PTR_CHECK_NULL(toTime, NULL);
     813    PS_ASSERT_PTR_NON_NULL(coords, NULL);
     814    PS_ASSERT_PTR_NON_NULL(fromTime, NULL);
     815    PS_ASSERT_PTR_NON_NULL(toTime, NULL);
    816816
    817817    // Calculate Julian centuries
    … …  
    904904    // XXX: This does not yet use region and nSamples:  need to modify -rdd
    905905
    906     PS_PTR_CHECK_NULL(trans1, NULL);
    907     PS_PTR_CHECK_NULL(trans2, NULL);
     906    PS_ASSERT_PTR_NON_NULL(trans1, NULL);
     907    PS_ASSERT_PTR_NON_NULL(trans2, NULL);
    908908    //TRACE: printf("psPlaneTransformCombine(%d, %d, %d, %d: %d, %d, %d, %d)\n", trans1->x->nX, trans1->x->nY, trans1->y->nX, trans1->y->nY, trans2->x->nX, trans2->x->nY, trans2->y->nX, trans2->y->nY);
    909909    //
    … …  
    10471047                         float sigmaClip)
    10481048{
    1049     PS_PTR_CHECK_NULL(trans, NULL);
    1050     PS_PTR_CHECK_NULL(source, NULL);
    1051     PS_PTR_CHECK_NULL(dest, NULL);
     1049    PS_ASSERT_PTR_NON_NULL(trans, NULL);
     1050    PS_ASSERT_PTR_NON_NULL(source, NULL);
     1051    PS_ASSERT_PTR_NON_NULL(dest, NULL);
    10521052
    10531053    psS32 numCoords = PS_MIN(source->n, dest->n);
    … …  
    11591159        int nSamples)
    11601160{
    1161     PS_PTR_CHECK_NULL(in, NULL);
     1161    PS_ASSERT_PTR_NON_NULL(in, NULL);
    11621162    //
    11631163    // If the transform is linear, then invert it exactly and return.
Note: See TracChangeset for help on using the changeset viewer.