IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 25, 2005, 10:28:32 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/psModules/src/pmObjects.c

    r4028 r4030  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-05-25 19:26:44 $
     7 *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-05-25 20:28:32 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    156156                            psF32 threshold)
    157157{
    158     PS_VECTOR_CHECK_NULL(vector, NULL);
    159     PS_VECTOR_CHECK_EMPTY(vector, NULL);
    160     PS_VECTOR_CHECK_TYPE(vector, PS_TYPE_F32, NULL);
     158    PS_ASSERT_VECTOR_NON_NULL(vector, NULL);
     159    PS_ASSERT_VECTOR_NON_EMPTY(vector, NULL);
     160    PS_ASSERT_VECTOR_TYPE(vector, PS_TYPE_F32, NULL);
    161161    int count = 0;
    162162    int n = vector->n;
    … …  
    250250                                    psU32 row)
    251251{
    252     PS_IMAGE_CHECK_NULL(image, NULL);
    253     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL);
     252    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     253    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
    254254
    255255    psVector *tmpVector = psVectorAlloc(image->numCols, PS_TYPE_F32);
    … …  
    302302                          psF32 threshold)
    303303{
    304     PS_IMAGE_CHECK_NULL(image, NULL);
    305     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL);
     304    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     305    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
    306306    if ((image->numRows == 1) || (image->numCols == 1)) {
    307307        psError(PS_ERR_UNKNOWN, true, "Currently, input image must have at least 2 rows and 2 columns.");
    … …  
    514514                    const psRegion *valid)
    515515{
    516     PS_PTR_CHECK_NULL(peaks, NULL);
    517     //    PS_PTR_CHECK_NULL(valid, NULL);
     516    PS_ASSERT_PTR_NON_NULL(peaks, NULL);
     517    //    PS_ASSERT_PTR_NON_NULL(valid, NULL);
    518518
    519519    psListElem *tmpListElem = (psListElem *) peaks->head;
    … …  
    540540psArray *pmPeaksSubset(psArray *peaks, psF32 maxValue, const psRegion *valid)
    541541{
    542     PS_PTR_CHECK_NULL(peaks, NULL);
     542    PS_ASSERT_PTR_NON_NULL(peaks, NULL);
    543543
    544544    psArray *output = psArrayAlloc (200);
    … …  
    603603                           psF32 outerRadius)
    604604{
    605     PS_IMAGE_CHECK_NULL(image, NULL);
    606     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, NULL);
    607     PS_PTR_CHECK_NULL(peak, NULL);
     605    PS_ASSERT_IMAGE_NON_NULL(image, NULL);
     606    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, NULL);
     607    PS_ASSERT_PTR_NON_NULL(peak, NULL);
    608608    PS_FLOAT_COMPARE(0.0, innerRadius, NULL);
    609609    PS_FLOAT_COMPARE(innerRadius, outerRadius, NULL);
    … …  
    786786                          psF32 radius)
    787787{
    788     PS_PTR_CHECK_NULL(source, NULL);
    789     PS_PTR_CHECK_NULL(source->peak, NULL);
    790     PS_PTR_CHECK_NULL(source->pixels, NULL);
     788    PS_ASSERT_PTR_NON_NULL(source, NULL);
     789    PS_ASSERT_PTR_NON_NULL(source->peak, NULL);
     790    PS_ASSERT_PTR_NON_NULL(source->pixels, NULL);
    791791    PS_FLOAT_COMPARE(0.0, radius, NULL);
    792792
    … …  
    961961bool pmSourceRoughClass(psArray *sources, psMetadata *metadata)
    962962{
    963     PS_PTR_CHECK_NULL(sources, false);
    964     PS_PTR_CHECK_NULL(metadata, false);
     963    PS_ASSERT_PTR_NON_NULL(sources, false);
     964    PS_ASSERT_PTR_NON_NULL(metadata, false);
    965965    psBool rc = true;
    966966    psArray *peaks  = NULL;
    … …  
    983983        {
    984984            psSource *tmpSrc = (psSource *) sources->data[i];
    985             PS_PTR_CHECK_NULL(tmpSrc, false); // just skip this one?
    986             PS_PTR_CHECK_NULL(tmpSrc->moments, false); // just skip this one?
     985            PS_ASSERT_PTR_NON_NULL(tmpSrc, false); // just skip this one?
     986            PS_ASSERT_PTR_NON_NULL(tmpSrc->moments, false); // just skip this one?
    987987
    988988            // Sx,Sy are limited at 0.  a peak at 0,0 is artificial
    … …  
    11911191                            psF32 radius)
    11921192{
    1193     PS_IMAGE_CHECK_NULL(image, false);
    1194     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
    1195     PS_PTR_CHECK_NULL(source, false);
    1196     PS_PTR_CHECK_NULL(source->moments, false);
    1197     // PS_PTR_CHECK_NULL(source->peak, false);
     1193    PS_ASSERT_IMAGE_NON_NULL(image, false);
     1194    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
     1195    PS_ASSERT_PTR_NON_NULL(source, false);
     1196    PS_ASSERT_PTR_NON_NULL(source->moments, false);
     1197    // PS_ASSERT_PTR_NON_NULL(source->peak, false);
    11981198    PS_FLOAT_COMPARE(0.0, radius, false);
    11991199
    … …  
    13011301                        psModelType model)
    13021302{
    1303     PS_PTR_CHECK_NULL(source, false);
    1304     PS_PTR_CHECK_NULL(source->moments, false);
    1305     PS_PTR_CHECK_NULL(source->peak, false);
    1306     PS_IMAGE_CHECK_NULL(image, false);
    1307     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
     1303    PS_ASSERT_PTR_NON_NULL(source, false);
     1304    PS_ASSERT_PTR_NON_NULL(source->moments, false);
     1305    PS_ASSERT_PTR_NON_NULL(source->peak, false);
     1306    PS_ASSERT_IMAGE_NON_NULL(image, false);
     1307    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
    13081308    if (source->models != NULL) {
    13091309        psLogMsg(__func__, PS_LOG_WARN, "WARNING: source->models was non-NULL; calling psFree(source->models).\n");
    … …  
    14231423                       psU32 col)
    14241424{
    1425     PS_PTR_CHECK_NULL(src, false);
    1426     PS_PTR_CHECK_NULL(src->models, false);
    1427     PS_PTR_CHECK_NULL(src->models->params, false);
     1425    PS_ASSERT_PTR_NON_NULL(src, false);
     1426    PS_ASSERT_PTR_NON_NULL(src->models, false);
     1427    PS_ASSERT_PTR_NON_NULL(src->models->params, false);
    14281428
    14291429    // XXX: The following step will not be necessary if the models->params
    … …  
    15601560                         pmContourType mode)
    15611561{
    1562     PS_PTR_CHECK_NULL(source, false);
    1563     PS_PTR_CHECK_NULL(image, false);
    1564     PS_PTR_CHECK_NULL(source->moments, false);
    1565     PS_PTR_CHECK_NULL(source->peak, false);
    1566     PS_PTR_CHECK_NULL(source->pixels, false);
    1567     PS_PTR_CHECK_NULL(source->models, false);
     1562    PS_ASSERT_PTR_NON_NULL(source, false);
     1563    PS_ASSERT_PTR_NON_NULL(image, false);
     1564    PS_ASSERT_PTR_NON_NULL(source->moments, false);
     1565    PS_ASSERT_PTR_NON_NULL(source->peak, false);
     1566    PS_ASSERT_PTR_NON_NULL(source->pixels, false);
     1567    PS_ASSERT_PTR_NON_NULL(source->models, false);
    15681568
    15691569    //
    … …  
    16691669                      const psImage *image)
    16701670{
    1671     PS_PTR_CHECK_NULL(source, false);
    1672     PS_PTR_CHECK_NULL(source->moments, false);
    1673     PS_PTR_CHECK_NULL(source->peak, false);
    1674     PS_PTR_CHECK_NULL(source->pixels, false);
    1675     PS_PTR_CHECK_NULL(source->models, false);
    1676     PS_IMAGE_CHECK_NULL(image, false);
    1677     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
     1671    PS_ASSERT_PTR_NON_NULL(source, false);
     1672    PS_ASSERT_PTR_NON_NULL(source->moments, false);
     1673    PS_ASSERT_PTR_NON_NULL(source->peak, false);
     1674    PS_ASSERT_PTR_NON_NULL(source->pixels, false);
     1675    PS_ASSERT_PTR_NON_NULL(source->models, false);
     1676    PS_ASSERT_IMAGE_NON_NULL(image, false);
     1677    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
    16781678    psBool rc;
    16791679
    … …  
    17581758                             psS32 flag)
    17591759{
    1760     PS_PTR_CHECK_NULL(src, false);
    1761     PS_PTR_CHECK_NULL(src->moments, false);
    1762     PS_PTR_CHECK_NULL(src->peak, false);
    1763     PS_PTR_CHECK_NULL(src->pixels, false);
    1764     PS_PTR_CHECK_NULL(src->models, false);
    1765     PS_IMAGE_CHECK_NULL(image, false);
    1766     PS_IMAGE_CHECK_TYPE(image, PS_TYPE_F32, false);
     1760    PS_ASSERT_PTR_NON_NULL(src, false);
     1761    PS_ASSERT_PTR_NON_NULL(src->moments, false);
     1762    PS_ASSERT_PTR_NON_NULL(src->peak, false);
     1763    PS_ASSERT_PTR_NON_NULL(src->pixels, false);
     1764    PS_ASSERT_PTR_NON_NULL(src->models, false);
     1765    PS_ASSERT_IMAGE_NON_NULL(image, false);
     1766    PS_ASSERT_IMAGE_TYPE(image, PS_TYPE_F32, false);
    17671767
    17681768    psVector *x = psVectorAlloc(2, PS_TYPE_F32);
Note: See TracChangeset for help on using the changeset viewer.