IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 895


Ignore:
Timestamp:
Jun 6, 2004, 5:49:20 PM (22 years ago)
Author:
gusciora
Message:

...

Location:
trunk/psLib/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/image/psImageStats.c

    r889 r895  
    2020/// This routine must determine the various statistics for the image.
    2121/*****************************************************************************
    22     GUS: verify that image/mask have the
    23  correct types
    24  sizes
     22    GUS: verify that image/mask have the correct types, and sizes.
    2523 *****************************************************************************/
    2624psStats *psImageStats(psStats *stats,
    … …  
    3533    int j = 0;
    3634
     35    // GUS: Verify this action.
     36    if ((stats == NULL) ||
     37            (in == NULL)) {
     38        return(NULL);
     39    }
     40    // GUS: Verify this action.
     41    if (stats->options == 0) {
     42        return(stats);
     43    }
     44
    3745    junkData = psVectorAlloc(in->numRows * in->numCols, in->type.type);
    3846    junkData->n = junkData->nalloc;
    … …  
    6472        stats = psVectorStats(stats, junkData, NULL, 0);
    6573    }
    66 
    6774    psVectorFree(junkData);
    68 
    6975    return(stats);
    7076}
    … …  
    7379    NOTE: We assume that the psHistogram structure out has already been
    7480    allocated and initialized.
    75  
    76     GUS: verify that image/mask have the
    77  correct types
    78  sizes
     81    GUS: verify that image/mask have the, correct types and  sizes.
    7982 *****************************************************************************/
    8083psHistogram *psImageHistogram(psHistogram *out,
    … …  
    8891    int i = 0;
    8992    int j = 0;
     93
     94    // GUS: Verify this action.
     95    if ((out == NULL) ||
     96            (in == NULL)) {
     97        return(NULL);
     98    }
    9099
    91100    junkData = psVectorAlloc(in->numRows * in->numCols, in->type.type);

  • trunk/psLib/src/imageops/psImageStats.c

    r889 r895  
    2020/// This routine must determine the various statistics for the image.
    2121/*****************************************************************************
    22     GUS: verify that image/mask have the
    23  correct types
    24  sizes
     22    GUS: verify that image/mask have the correct types, and sizes.
    2523 *****************************************************************************/
    2624psStats *psImageStats(psStats *stats,
    … …  
    3533    int j = 0;
    3634
     35    // GUS: Verify this action.
     36    if ((stats == NULL) ||
     37            (in == NULL)) {
     38        return(NULL);
     39    }
     40    // GUS: Verify this action.
     41    if (stats->options == 0) {
     42        return(stats);
     43    }
     44
    3745    junkData = psVectorAlloc(in->numRows * in->numCols, in->type.type);
    3846    junkData->n = junkData->nalloc;
    … …  
    6472        stats = psVectorStats(stats, junkData, NULL, 0);
    6573    }
    66 
    6774    psVectorFree(junkData);
    68 
    6975    return(stats);
    7076}
    … …  
    7379    NOTE: We assume that the psHistogram structure out has already been
    7480    allocated and initialized.
    75  
    76     GUS: verify that image/mask have the
    77  correct types
    78  sizes
     81    GUS: verify that image/mask have the, correct types and  sizes.
    7982 *****************************************************************************/
    8083psHistogram *psImageHistogram(psHistogram *out,
    … …  
    8891    int i = 0;
    8992    int j = 0;
     93
     94    // GUS: Verify this action.
     95    if ((out == NULL) ||
     96            (in == NULL)) {
     97        return(NULL);
     98    }
    9099
    91100    junkData = psVectorAlloc(in->numRows * in->numCols, in->type.type);
Note: See TracChangeset for help on using the changeset viewer.