IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1634


Ignore:
Timestamp:
Aug 27, 2004, 9:05:40 AM (22 years ago)
Author:
desonia
Message:

Change the prototype of psImagePixelInterpolate. See bug #147.

Location:
trunk/psLib/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r1606 r1634  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2004-08-23 22:36:03 $
     12 *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2004-08-27 19:05:40 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4040/*****************************************************************************/
    4141
    42 psImage* psImageAlloc(unsigned int numCols, unsigned int numRows, const psElemType type)
     42psImage* psImageAlloc(unsigned int numCols,
     43                      unsigned int numRows,
     44                      const psElemType type)
    4345{
    4446    int area = 0;
    … …  
    122124}
    123125
    124 psImage* psImageRecycle(psImage* old, unsigned int numCols, unsigned int numRows, const psElemType type)
     126psImage* psImageRecycle(psImage* old,
     127                        unsigned int numCols,
     128                        unsigned int numRows,
     129                        const psElemType type)
    125130{
    126131    int elementSize = PSELEMTYPE_SIZEOF(type);  // element
    … …  
    215220linear interpolation is performed on the image.
    216221 *****************************************************************************/
    217 psF32 psImagePixelInterpolate(const psImage* input,
    218                               float x, float y, psF32 unexposedValue, psImageInterpolateMode mode)
     222psC64 psImagePixelInterpolate(const psImage* input,
     223                              float x,
     224                              float y,
     225                              psC64 unexposedValue,
     226                              psImageInterpolateMode mode)
    219227{
    220228
    … …  
    311319PSIMAGE_PIXEL_INTERPOLATE_FLAT_COMPLEX(C32)
    312320PSIMAGE_PIXEL_INTERPOLATE_FLAT_COMPLEX(C64)
     321
    313322#define PSIMAGE_PIXEL_INTERPOLATE_BILINEAR(TYPE) \
    314323inline psF64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage* input, \

  • trunk/psLib/src/image/psImage.h

    r1606 r1634  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2004-08-23 22:36:03 $
     14 *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2004-08-27 19:05:40 $
    1616 *
    1717 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    113113 *                   given x,y doesn't coorespond to a valid image location
    114114 */
    115 psF32 psImagePixelInterpolate(
     115psC64 psImagePixelInterpolate(
    116116    const psImage* input,              ///< input image for interpolation
    117117    float x,                           ///< column location to derive value of
    118118    float y,                           ///< row location ot derive value of
    119     psF32 unexposedValue,              ///< return value if x,y location is not in image.
     119    psC64 unexposedValue,              ///< return value if x,y location is not in image.
    120120    psImageInterpolateMode mode        ///< interpolation mode
    121121);

  • trunk/psLib/src/mathtypes/psImage.c

    r1606 r1634  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2004-08-23 22:36:03 $
     12 *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2004-08-27 19:05:40 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    4040/*****************************************************************************/
    4141
    42 psImage* psImageAlloc(unsigned int numCols, unsigned int numRows, const psElemType type)
     42psImage* psImageAlloc(unsigned int numCols,
     43                      unsigned int numRows,
     44                      const psElemType type)
    4345{
    4446    int area = 0;
    … …  
    122124}
    123125
    124 psImage* psImageRecycle(psImage* old, unsigned int numCols, unsigned int numRows, const psElemType type)
     126psImage* psImageRecycle(psImage* old,
     127                        unsigned int numCols,
     128                        unsigned int numRows,
     129                        const psElemType type)
    125130{
    126131    int elementSize = PSELEMTYPE_SIZEOF(type);  // element
    … …  
    215220linear interpolation is performed on the image.
    216221 *****************************************************************************/
    217 psF32 psImagePixelInterpolate(const psImage* input,
    218                               float x, float y, psF32 unexposedValue, psImageInterpolateMode mode)
     222psC64 psImagePixelInterpolate(const psImage* input,
     223                              float x,
     224                              float y,
     225                              psC64 unexposedValue,
     226                              psImageInterpolateMode mode)
    219227{
    220228
    … …  
    311319PSIMAGE_PIXEL_INTERPOLATE_FLAT_COMPLEX(C32)
    312320PSIMAGE_PIXEL_INTERPOLATE_FLAT_COMPLEX(C64)
     321
    313322#define PSIMAGE_PIXEL_INTERPOLATE_BILINEAR(TYPE) \
    314323inline psF64 p_psImagePixelInterpolateBILINEAR_##TYPE(const psImage* input, \

  • trunk/psLib/src/mathtypes/psImage.h

    r1606 r1634  
    1212 *  @author Ross Harman, MHPCC
    1313 *
    14  *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
    15  *  @date $Date: 2004-08-23 22:36:03 $
     14 *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
     15 *  @date $Date: 2004-08-27 19:05:40 $
    1616 *
    1717 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    113113 *                   given x,y doesn't coorespond to a valid image location
    114114 */
    115 psF32 psImagePixelInterpolate(
     115psC64 psImagePixelInterpolate(
    116116    const psImage* input,              ///< input image for interpolation
    117117    float x,                           ///< column location to derive value of
    118118    float y,                           ///< row location ot derive value of
    119     psF32 unexposedValue,              ///< return value if x,y location is not in image.
     119    psC64 unexposedValue,              ///< return value if x,y location is not in image.
    120120    psImageInterpolateMode mode        ///< interpolation mode
    121121);
Note: See TracChangeset for help on using the changeset viewer.