IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2226


Ignore:
Timestamp:
Oct 27, 2004, 2:45:44 PM (22 years ago)
Author:
gusciora
Message:

...

Location:
trunk/psLib
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/dataManip/psStats.c

    r2224 r2226  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-28 00:22:53 $
     11 *  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-28 00:45:44 $
    1313n *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    15461546    PS_VECTOR_CHECK_TYPE(out->nums, PS_TYPE_U32, NULL);
    15471547    PS_INT_CHECK_NON_NEGATIVE(out->nums->n, NULL);
    1548     PS_VECTOR_CHECK_NULL(in, NULL);
     1548    PS_VECTOR_CHECK_NULL(in, out);
    15491549    if (mask != NULL) {
    15501550        PS_VECTOR_CHECK_SIZE_EQUAL(in, mask, NULL);
    … …  
    16791679{
    16801680    PS_PTR_CHECK_NULL(stats, NULL);
    1681     PS_VECTOR_CHECK_NULL(in, NULL);
     1681    PS_VECTOR_CHECK_NULL(in, stats);
    16821682    if (mask != NULL) {
    1683         PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, NULL);
    1684         PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, NULL);
     1683        PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, stats);
     1684        PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, stats);
    16851685    }
    16861686    psVector* inF32;

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

    r2224 r2226  
    99 *  @author GLG, MHPCC
    1010 *
    11  *  @version $Revision: 1.77 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2004-10-28 00:22:53 $
     11 *  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2004-10-28 00:45:44 $
    1313n *
    1414 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    15461546    PS_VECTOR_CHECK_TYPE(out->nums, PS_TYPE_U32, NULL);
    15471547    PS_INT_CHECK_NON_NEGATIVE(out->nums->n, NULL);
    1548     PS_VECTOR_CHECK_NULL(in, NULL);
     1548    PS_VECTOR_CHECK_NULL(in, out);
    15491549    if (mask != NULL) {
    15501550        PS_VECTOR_CHECK_SIZE_EQUAL(in, mask, NULL);
    … …  
    16791679{
    16801680    PS_PTR_CHECK_NULL(stats, NULL);
    1681     PS_VECTOR_CHECK_NULL(in, NULL);
     1681    PS_VECTOR_CHECK_NULL(in, stats);
    16821682    if (mask != NULL) {
    1683         PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, NULL);
    1684         PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, NULL);
     1683        PS_VECTOR_CHECK_SIZE_EQUAL(mask, in, stats);
     1684        PS_VECTOR_CHECK_TYPE(mask, PS_TYPE_U8, stats);
    16851685    }
    16861686    psVector* inF32;

  • trunk/psLib/test/dataManip/tst_psHist02.c

    r2204 r2226  
    114114                             "Calling psVectorHistogram() with various NULL inputs." );
    115115
     116
     117
     118    // ********************************************************************
    116119    // Verify the return value is null and program execution doesn't stop,
    117120    // if input parameter myHist is null.
    … …  
    125128
    126129
    127     // Verify the retrun value is the same as the input parameter myHist and
     130    // ********************************************************************
     131    // Verify the return value is the same as the input parameter myHist and
    128132    // program execution doesn't stop, if the input parameter myArray is
    129133    // null.
    … …  
    138142
    139143
     144    exit(0);
     145    // ********************************************************************
    140146    // Verify the return value is the same as the input parameter myHist and
    141147    // program execution doesn't stop, if the input parameter myArray has no

  • trunk/psLib/test/dataManip/tst_psStats00.c

    r2204 r2226  
    1111{
    1212    psStats *myStats    = NULL;
    13     psStats *myStats2    = NULL;
    1413    psS32 testStatus      = true;
    1514    psS32 globalTestStatus = true;
    … …  
    164163                "PS_STAT_SAMPLE_MEAN: with vector mask=3",
    165164                testStatus);
     165
    166166    /*************************************************************************/
    167167    /*  Call psVectorStats() with NULL inputs.                               */
    168168    /*************************************************************************/
     169
    169170    printPositiveTestHeader(stdout,
    170171                            "psStats functions",
    … …  
    172173
    173174    myStats = psVectorStats(myStats, NULL, NULL, 0);
    174     myStats2 = psVectorStats(NULL, myVector, NULL, 0);
     175    psStats *myStats2 = psVectorStats(NULL, myVector, NULL, 0);
    175176
    176177    printFooter(stdout,
    … …  
    195196        psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks);
    196197    }
     198    psFree(myStats2);
    197199
    198200    printFooter(stdout,
Note: See TracChangeset for help on using the changeset viewer.