IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 27, 2004, 10:20:11 AM (22 years ago)
Author:
gusciora
Message:

I've been unifying the naming conventions for various macros that check
functions parameters for type, size, non-NULL ...

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/math/psMatrix.c

    r2213 r2214  
    2020 *  @author Ross Harman, MHPCC
    2121 *   
    22  *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
    23  *  @date $Date: 2004-10-27 20:11:47 $
     22 *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
     23 *  @date $Date: 2004-10-27 20:20:11 $
    2424 *
    2525 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4242
    4343/** Preprocessor macro to generate error a NULL image */
    44 #define PS_VECTOR_CHEC_NULL(NAME, RETURN)                                                          \
     44#define PS_VECTOR_CHECK_NULL(NAME, RETURN)                                                          \
    4545if (NAME == NULL || NAME->data.V == NULL) {                                                         \
    4646    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
    … …  
    6262
    6363/** Preprocessor macro to generate error a NULL image */
    64 #define PS_CHECK_NULL_IMAGE(NAME, RETURN)                                                           \
     64#define PS_IMAGE_CHECK_NULL(NAME, RETURN)                                                           \
    6565if (NAME == NULL || NAME->data.V == NULL) {                                                         \
    6666    psError(__func__,"Invalid operation: %s or its data is NULL.", #NAME);                          \
    … …  
    128128    // Error checks
    129129    PS_CHECK_POINTERS(inImage, outImage, outImage);
    130     PS_CHECK_NULL_IMAGE(inImage, outImage);
     130    PS_IMAGE_CHECK_NULL(inImage, outImage);
    131131    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    132132    PS_CHECK_SIZE_IMAGE(inImage, outImage);
    … …  
    135135    PS_CHECK_SIZE_IMAGE(outImage, outImage);
    136136    PS_CHECK_ALLOC_VECTOR(outPerm, inImage->numRows, inImage->type.type);
    137     PS_VECTOR_CHEC_NULL(outPerm, outImage);
     137    PS_VECTOR_CHECK_NULL(outPerm, outImage);
    138138    PS_CHECK_DIMEN_AND_TYPE(outPerm, PS_DIMEN_VECTOR, outImage);
    139139
    … …  
    177177    PS_CHECK_POINTERS(inVector, inPerm, outVector);
    178178    PS_CHECK_POINTERS(outVector, inPerm, outVector);
    179     PS_CHECK_NULL_IMAGE(inImage, outVector);
     179    PS_IMAGE_CHECK_NULL(inImage, outVector);
    180180    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector);
    181181    PS_CHECK_SIZE_IMAGE(inImage, outVector);
    182182    PS_CHECK_ALLOC_VECTOR(outVector, inImage->numRows, inImage->type.type);
    183     PS_VECTOR_CHEC_NULL(outVector, outVector);
     183    PS_VECTOR_CHECK_NULL(outVector, outVector);
    184184    PS_CHECK_DIMEN_AND_TYPE(outVector, PS_DIMEN_VECTOR, outVector);
    185     PS_VECTOR_CHEC_NULL(inVector, outVector);
     185    PS_VECTOR_CHECK_NULL(inVector, outVector);
    186186    PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outVector);
    187     PS_VECTOR_CHEC_NULL(inPerm, outVector);
     187    PS_VECTOR_CHECK_NULL(inPerm, outVector);
    188188    PS_CHECK_DIMEN_AND_TYPE(inPerm, PS_DIMEN_VECTOR, outVector);
    189189
    … …  
    231231    }
    232232    PS_CHECK_POINTERS(inImage, outImage, outImage);
    233     PS_CHECK_NULL_IMAGE(inImage, outImage);
     233    PS_IMAGE_CHECK_NULL(inImage, outImage);
    234234    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    235235    PS_CHECK_SIZE_IMAGE(inImage, outImage);
    … …  
    280280
    281281    // Error checks
    282     PS_CHECK_NULL_IMAGE(inImage, NULL);
     282    PS_IMAGE_CHECK_NULL(inImage, NULL);
    283283    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, NULL);
    284284    PS_CHECK_SIZE_IMAGE(inImage, NULL);
    … …  
    323323    PS_CHECK_POINTERS(inImage1, outImage, outImage);
    324324    PS_CHECK_POINTERS(inImage1, inImage2, outImage);
    325     PS_CHECK_NULL_IMAGE(inImage1, outImage);
     325    PS_IMAGE_CHECK_NULL(inImage1, outImage);
    326326    PS_CHECK_DIMEN_AND_TYPE(inImage1, PS_DIMEN_IMAGE, outImage);
    327327    PS_CHECK_SIZE_IMAGE(inImage1, outImage);
    328     PS_CHECK_NULL_IMAGE(inImage2, outImage);
     328    PS_IMAGE_CHECK_NULL(inImage2, outImage);
    329329    PS_CHECK_DIMEN_AND_TYPE(inImage2, PS_DIMEN_IMAGE, outImage);
    330330    PS_CHECK_SIZE_IMAGE(inImage2, outImage);
    … …  
    362362    // Error checks
    363363    PS_CHECK_POINTERS(inImage, outImage, outImage);
    364     PS_CHECK_NULL_IMAGE(inImage, outImage);
     364    PS_IMAGE_CHECK_NULL(inImage, outImage);
    365365    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    366366    PS_CHECK_SIZE_IMAGE(inImage, outImage);
    … …  
    401401    // Error checks
    402402    PS_CHECK_POINTERS(inImage, outImage, outImage);
    403     PS_CHECK_NULL_IMAGE(inImage, outImage);
     403    PS_IMAGE_CHECK_NULL(inImage, outImage);
    404404    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    405405    PS_CHECK_SIZE_IMAGE(inImage, outImage);
    … …  
    439439
    440440    // Error checks
    441     PS_CHECK_NULL_IMAGE(inImage, outVector);
     441    PS_IMAGE_CHECK_NULL(inImage, outVector);
    442442    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outVector);
    443443    PS_CHECK_SIZE_IMAGE(inImage, outVector);
    … …  
    456456    }
    457457
    458     PS_VECTOR_CHEC_NULL(outVector, outVector);
     458    PS_VECTOR_CHECK_NULL(outVector, outVector);
    459459
    460460    // More checks
    … …  
    498498
    499499    // Error checks
    500     PS_VECTOR_CHEC_NULL(inVector, outImage);
     500    PS_VECTOR_CHECK_NULL(inVector, outImage);
    501501
    502502    if (inVector->type.dimen == PS_DIMEN_VECTOR) {
    … …  
    531531    }
    532532
    533     PS_CHECK_NULL_IMAGE(outImage, outImage);
     533    PS_IMAGE_CHECK_NULL(outImage, outImage);
    534534    PS_CHECK_DIMEN_AND_TYPE(outImage, PS_DIMEN_IMAGE, outImage);
    535535
Note: See TracChangeset for help on using the changeset viewer.