IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3276


Ignore:
Timestamp:
Feb 17, 2005, 12:33:16 PM (21 years ago)
Author:
desonia
Message:

merged in the changes cooresponding to the fix of Bug 299.

Location:
branches/rel4/psLib/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/rel4/psLib/src/dataManip/psMatrix.c

    r3026 r3276  
    1919 *
    2020 *  @author Ross Harman, MHPCC
     21 *  @author Robert DeSonia, MHPCC
    2122 *
    22  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    23  *  @date $Date: 2005-01-17 22:17:29 $
     23 *  @version $Revision: 1.22.2.1 $ $Name: not supported by cvs2svn $
     24 *  @date $Date: 2005-02-17 22:33:16 $
    2425 *
    25  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     26 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    2627 */
    2728
    … …  
    191192    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    192193    PS_PTR_CHECK_NULL_GENERAL(outPerm, psMatrixLUD_EXIT);
    193     psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
     194
     195    outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
     196
    194197    PS_CHECK_SQUARE(inImage, outImage);
    195198    PS_CHECK_SQUARE(outImage, outImage);
    … …  
    299302    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    300303    PS_IMAGE_CHECK_EMPTY(inImage, outImage);
    301     psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
     304    outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
    302305    PS_CHECK_SQUARE(inImage, outImage);
    303306    PS_CHECK_SQUARE(outImage, outImage);
    … …  
    383386    PS_IMAGE_CHECK_EMPTY(inImage2, outImage);
    384387    PS_CHECK_DIMEN_AND_TYPE(inImage1, PS_DIMEN_IMAGE, outImage);
    385     psImageRecycle(outImage, inImage2->numCols, inImage2->numRows, inImage2->type.type);
     388
     389    outImage = psImageRecycle(outImage, inImage2->numCols, inImage2->numRows, inImage2->type.type);
     390
    386391    PS_CHECK_SQUARE(inImage1, outImage);
    387392    PS_CHECK_SQUARE(inImage2, outImage);
    … …  
    473478    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    474479    PS_IMAGE_CHECK_EMPTY(inImage, outImage);
    475     psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
     480
     481    outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
    476482
    477483    // Initialize data
    … …  
    582588        PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outImage);
    583589        PS_VECTOR_CHECK_EMPTY(inVector, outImage);
    584         psImageRecycle(outImage, 1, inVector->n, PS_TYPE_F64);
     590        outImage = psImageRecycle(outImage, 1, inVector->n, PS_TYPE_F64);
    585591        // More checks for PS_DIMEN_VECTOR
    586592        if (outImage->numCols > 1) {
    … …  
    601607        PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_TRANSV, outImage);
    602608        PS_VECTOR_CHECK_EMPTY(inVector, outImage);
    603         psImageRecycle(outImage, inVector->n, 1, PS_TYPE_F64);
     609        outImage = psImageRecycle(outImage, inVector->n, 1, PS_TYPE_F64);
    604610        // More checks for PS_DIMEN_TRANSV
    605611        if (outImage->numRows > 1) {

  • branches/rel4/psLib/src/math/psMatrix.c

    r3026 r3276  
    1919 *
    2020 *  @author Ross Harman, MHPCC
     21 *  @author Robert DeSonia, MHPCC
    2122 *
    22  *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
    23  *  @date $Date: 2005-01-17 22:17:29 $
     23 *  @version $Revision: 1.22.2.1 $ $Name: not supported by cvs2svn $
     24 *  @date $Date: 2005-02-17 22:33:16 $
    2425 *
    25  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
     26 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    2627 */
    2728
    … …  
    191192    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    192193    PS_PTR_CHECK_NULL_GENERAL(outPerm, psMatrixLUD_EXIT);
    193     psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
     194
     195    outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
     196
    194197    PS_CHECK_SQUARE(inImage, outImage);
    195198    PS_CHECK_SQUARE(outImage, outImage);
    … …  
    299302    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    300303    PS_IMAGE_CHECK_EMPTY(inImage, outImage);
    301     psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
     304    outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
    302305    PS_CHECK_SQUARE(inImage, outImage);
    303306    PS_CHECK_SQUARE(outImage, outImage);
    … …  
    383386    PS_IMAGE_CHECK_EMPTY(inImage2, outImage);
    384387    PS_CHECK_DIMEN_AND_TYPE(inImage1, PS_DIMEN_IMAGE, outImage);
    385     psImageRecycle(outImage, inImage2->numCols, inImage2->numRows, inImage2->type.type);
     388
     389    outImage = psImageRecycle(outImage, inImage2->numCols, inImage2->numRows, inImage2->type.type);
     390
    386391    PS_CHECK_SQUARE(inImage1, outImage);
    387392    PS_CHECK_SQUARE(inImage2, outImage);
    … …  
    473478    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, outImage);
    474479    PS_IMAGE_CHECK_EMPTY(inImage, outImage);
    475     psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
     480
     481    outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
    476482
    477483    // Initialize data
    … …  
    582588        PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_VECTOR, outImage);
    583589        PS_VECTOR_CHECK_EMPTY(inVector, outImage);
    584         psImageRecycle(outImage, 1, inVector->n, PS_TYPE_F64);
     590        outImage = psImageRecycle(outImage, 1, inVector->n, PS_TYPE_F64);
    585591        // More checks for PS_DIMEN_VECTOR
    586592        if (outImage->numCols > 1) {
    … …  
    601607        PS_CHECK_DIMEN_AND_TYPE(inVector, PS_DIMEN_TRANSV, outImage);
    602608        PS_VECTOR_CHECK_EMPTY(inVector, outImage);
    603         psImageRecycle(outImage, inVector->n, 1, PS_TYPE_F64);
     609        outImage = psImageRecycle(outImage, inVector->n, 1, PS_TYPE_F64);
    604610        // More checks for PS_DIMEN_TRANSV
    605611        if (outImage->numRows > 1) {
Note: See TracChangeset for help on using the changeset viewer.