IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3442


Ignore:
Timestamp:
Mar 17, 2005, 9:02:01 AM (21 years ago)
Author:
desonia
Message:

added interpolation types; code support to come.

Location:
trunk/psLib/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r3264 r3442  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-02-17 19:26:24 $
     11 *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-03-17 19:02:01 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    413413}
    414414
    415 /*****************************************************************************
    416 XXX: update function description.
    417  
    418 p_psImagePixelInterpolation(image, x, y): this routine takes as input an
    419 image and coordinates (x, y) and produces as output the corresponding pixel
    420 value at the those coordinates.  For fractional corrdinates (x, y), 2-D
    421 linear interpolation is performed on the image.
    422  *****************************************************************************/
    423415psC64 psImagePixelInterpolate(const psImage* input,
    424416                              float x,

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

    r3264 r3442  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-02-17 19:26:24 $
     13 *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-03-17 19:02:01 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3131 */
    3232typedef enum {
    33     PS_INTERPOLATE_FLAT = 1,           ///< 'flat' interpolation (nearest pixel)
     33    PS_INTERPOLATE_FLAT,               ///< 'flat' interpolation (nearest pixel)
    3434    PS_INTERPOLATE_BILINEAR,           ///< bi-linear interpolation
    35     PS_INTERPOLATE_BICUBIC,            ///< bi-cubic interpolation
    36     PS_INTERPOLATE_SINC,               ///< sinc interpolation
    37     PS_INTERPOLATE_NUM_MODES           ///< end-marker of list of modes; not a valid interpolation mode
     35    PS_INTERPOLATE_LANCZOS2,           ///< Sinc interpolation with 4x4 pixel kernel
     36    PS_INTERPOLATE_LANCZOS3,           ///< Sinc interpolation with 6x6 pixel kernel
     37    PS_INTERPOLATE_LANCZOS4,           ///< Sinc interpolation with 8x8 pixel kernel
     38    PS_INTERPOLATE_BILINEAR_VARIANCE,  ///< Variance version of PS_INTERPOLATE_BILINEAR
     39    PS_INTERPOLATE_LANCZOS2_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS2
     40    PS_INTERPOLATE_LANCZOS3_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS3
     41    PS_INTERPOLATE_LANCZOS4_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS4
     42    PS_INTERPOLATE_NUM_MODES           ///< enum end-marker; does not coorespond to a interpolation mode
    3843} psImageInterpolateMode;
    3944
    … …  
    4752{
    4853    const psType type;                 ///< Image data type and dimension.
    49     const psU32 numCols;        ///< Number of columns in image
    50     const psU32 numRows;        ///< Number of rows in image.
    51     const psS32 col0;                    ///< Column position relative to parent.
    52     const psS32 row0;                    ///< Row position relative to parent.
     54    const psU32 numCols;               ///< Number of columns in image
     55    const psU32 numRows;               ///< Number of rows in image.
     56    const psS32 col0;                  ///< Column position relative to parent.
     57    const psS32 row0;                  ///< Row position relative to parent.
    5358
    5459    union {

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

    r3264 r3442  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-02-17 19:26:24 $
     11 *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2005-03-17 19:02:01 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    413413}
    414414
    415 /*****************************************************************************
    416 XXX: update function description.
    417  
    418 p_psImagePixelInterpolation(image, x, y): this routine takes as input an
    419 image and coordinates (x, y) and produces as output the corresponding pixel
    420 value at the those coordinates.  For fractional corrdinates (x, y), 2-D
    421 linear interpolation is performed on the image.
    422  *****************************************************************************/
    423415psC64 psImagePixelInterpolate(const psImage* input,
    424416                              float x,

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

    r3264 r3442  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-02-17 19:26:24 $
     13 *  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2005-03-17 19:02:01 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    3131 */
    3232typedef enum {
    33     PS_INTERPOLATE_FLAT = 1,           ///< 'flat' interpolation (nearest pixel)
     33    PS_INTERPOLATE_FLAT,               ///< 'flat' interpolation (nearest pixel)
    3434    PS_INTERPOLATE_BILINEAR,           ///< bi-linear interpolation
    35     PS_INTERPOLATE_BICUBIC,            ///< bi-cubic interpolation
    36     PS_INTERPOLATE_SINC,               ///< sinc interpolation
    37     PS_INTERPOLATE_NUM_MODES           ///< end-marker of list of modes; not a valid interpolation mode
     35    PS_INTERPOLATE_LANCZOS2,           ///< Sinc interpolation with 4x4 pixel kernel
     36    PS_INTERPOLATE_LANCZOS3,           ///< Sinc interpolation with 6x6 pixel kernel
     37    PS_INTERPOLATE_LANCZOS4,           ///< Sinc interpolation with 8x8 pixel kernel
     38    PS_INTERPOLATE_BILINEAR_VARIANCE,  ///< Variance version of PS_INTERPOLATE_BILINEAR
     39    PS_INTERPOLATE_LANCZOS2_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS2
     40    PS_INTERPOLATE_LANCZOS3_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS3
     41    PS_INTERPOLATE_LANCZOS4_VARIANCE,  ///< Variance version of PS_INTERPOLATE_LANCZOS4
     42    PS_INTERPOLATE_NUM_MODES           ///< enum end-marker; does not coorespond to a interpolation mode
    3843} psImageInterpolateMode;
    3944
    … …  
    4752{
    4853    const psType type;                 ///< Image data type and dimension.
    49     const psU32 numCols;        ///< Number of columns in image
    50     const psU32 numRows;        ///< Number of rows in image.
    51     const psS32 col0;                    ///< Column position relative to parent.
    52     const psS32 row0;                    ///< Row position relative to parent.
     54    const psU32 numCols;               ///< Number of columns in image
     55    const psU32 numRows;               ///< Number of rows in image.
     56    const psS32 col0;                  ///< Column position relative to parent.
     57    const psS32 row0;                  ///< Row position relative to parent.
    5358
    5459    union {
Note: See TracChangeset for help on using the changeset viewer.