IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 17, 2005, 5:13:02 PM (21 years ago)
Author:
drobbin
Message:

* empty log message *

Location:
trunk/psLib/src/imageops
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r4315 r4316  
    55 *  @author Robert DeSonia, MHPCC
    66 *
    7  *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-06-18 02:30:49 $
     7 *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2005-06-18 03:13:02 $
    99 *
    1010 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727static void freeKernel(psKernel* ptr);
    2828
    29 psKernel* psKernelAlloc(psS32 xMin, psS32 xMax, psS32 yMin, psS32 yMax)
     29psKernel* psKernelAlloc(int xMin, int xMax, int yMin, int yMax)
    3030{
    3131    psKernel* result;
    … …  
    9090                           const psVector* xShifts,
    9191                           const psVector* yShifts,
    92                            psBool relative)
     92                           bool relative)
    9393{
    9494    psS32 lastX;

  • trunk/psLib/src/imageops/psImageConvolve.h

    r4315 r4316  
    77 *  @author Robert DeSonia, MHPCC
    88 *
    9  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-06-18 02:30:49 $
     9 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2005-06-18 03:13:02 $
    1111 *
    1212 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    7171 */
    7272psKernel* psKernelAlloc(
    73     psS32 xMin,                          ///< Most negative x index
    74     psS32 xMax,                          ///< Most positive x index
    75     psS32 yMin,                          ///< Most negative y index
    76     psS32 yMax                           ///< Most positive y index
     73    int xMin,                          ///< Most negative x index
     74    int xMax,                          ///< Most positive x index
     75    int yMin,                          ///< Most negative y index
     76    int yMax                           ///< Most positive y index
    7777);
    7878
    … …  
    9797    const psVector* xShifts,           ///< list of x-axis shifts
    9898    const psVector* yShifts,           ///< list of y-axis shifts
    99     psBool relative
     99    bool relative
    100100    /**< specifies the starting point for the shifts; true=relative to previous shift
    101101     *  false = relative to some other starting point.  */

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

    r4308 r4316  
    1010 *  @author Ross Harman, MHPCC
    1111 *
    12  *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-06-17 23:44:21 $
     12 *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2005-06-18 03:13:02 $
    1414 *
    1515 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    174174psImage* psImageResample(psImage* out,
    175175                         const psImage* in,
    176                          psS32 scale,
     176                         int scale,
    177177                         psImageInterpolateMode mode)
    178178{
    … …  
    251251
    252252psImage* psImageRoll(psImage* out,
    253                      const psImage* in,
    254                      psS32 dx,
    255                      psS32 dy)
     253                     const psImage* input,
     254                     int dx,
     255                     int dy)
    256256{
    257257    psS32 outRows;
    … …  
    259259    psS32 elementSize;
    260260
    261     if (in == NULL) {
     261    if (input == NULL) {
    262262        psError(PS_ERR_BAD_PARAMETER_NULL, true,
    263263                PS_ERRORTEXT_psImage_IMAGE_NULL);
    … …  
    267267    // create an output image of the same size
    268268    // and type
    269     outRows = in->numRows;
    270     outCols = in->numCols;
    271     elementSize = PSELEMTYPE_SIZEOF(in->type.type);
    272     out = psImageRecycle(out, outCols, outRows, in->type.type);
     269    outRows = input->numRows;
     270    outCols = input->numCols;
     271    elementSize = PSELEMTYPE_SIZEOF(input->type.type);
     272    out = psImageRecycle(out, outCols, outRows, input->type.type);
    273273
    274274    // make dx and dy between 0 and outCols or
    … …  
    292292            inRowNumber -= outRows;
    293293        }
    294         psU8* inRow = in->data.U8[inRowNumber]; // use byte arithmetic for all types
     294        psU8* inRow = input->data.U8[inRowNumber]; // use byte arithmetic for all types
    295295        psU8* outRow = out->data.U8[row];
    296296

  • trunk/psLib/src/imageops/psImageGeomManip.h

    r4287 r4316  
    88 *  @author Robert DeSonia, MHPCC
    99 *
    10  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-06-16 22:07:41 $
     10 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2005-06-18 03:13:02 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5757    psImage* out,                      ///< an psImage to recycle.  If NULL, a new image is created
    5858    const psImage* in,                 ///< input image
    59     psS32 scale,                       ///< resample scaling factor
     59    int scale,                       ///< resample scaling factor
    6060    psImageInterpolateMode mode        ///< the interpolation mode used in resampling
    6161);
    … …  
    111111psImage* psImageRoll(
    112112    psImage* out,                      ///< an psImage to recycle.  If NULL, a new image is created
    113     const psImage* in,                 ///< input image
    114     psS32 dx,                          ///< number of pixels to roll in the x-dimension
    115     psS32 dy                           ///< number of pixels to roll in the y-dimension
     113    const psImage* input,              ///< input image
     114    int dx,                            ///< number of pixels to roll in the x-dimension
     115    int dy                             ///< number of pixels to roll in the y-dimension
    116116);
    117117
    … …  
    151151    const psRegion region,             ///< the size of the transformed image
    152152    const psPixels* pixels,            /**< if not NULL, consists of psPixelCoords and specifies which pixels in
    153                                                  *  output image shall be transformed; otherwise, entire image generated*/
     153                                                     *  output image shall be transformed; otherwise, entire image generated*/
    154154    psImageInterpolateMode mode,       ///< the interpolation scheme to be used
    155155    int exposedValue                   ///< Exposed value to which non-corresponding pixels are set
Note: See TracChangeset for help on using the changeset viewer.