IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 27, 2006, 3:12:17 PM (21 years ago)
Author:
desonia
Message:

changed 'complex' to 'double complex' to be more C99 compliant.

Location:
trunk/psLib/src/mathtypes
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r5841 r6227  
    99 *  @author Ross Harman, MHPCC
    1010 *
    11  *  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
    12  *  @date $Date: 2005-12-24 00:33:18 $
     11 *  @version $Revision: 1.94 $ $Name: not supported by cvs2svn $
     12 *  @date $Date: 2006-01-28 01:12:14 $
    1313 *
    1414 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    289289                int x,
    290290                int y,
    291                 complex value)
     291                double complex value)
    292292{
    293293    if (image == NULL) {
    … …  
    359359}
    360360
    361 complex psImageGet(const psImage *image,
    362                    int x,
    363                    int y)
     361double complex psImageGet(const psImage *image,
     362                          int x,
     363                          int y)
    364364{
    365365    if (image == NULL) {
    … …  
    668668}
    669669
    670 complex psImagePixelInterpolate(const psImage* input,
    671                                 float x,
    672                                 float y,
    673                                 const psImage* mask,
    674                                 psMaskType maskVal,
    675                                 complex unexposedValue,
    676                                 psImageInterpolateMode mode)
     670double complex psImagePixelInterpolate(const psImage* input,
     671                                       float x,
     672                                       float y,
     673                                       const psImage* mask,
     674                                       psMaskType maskVal,
     675                                       double complex unexposedValue,
     676                                       psImageInterpolateMode mode)
    677677{
    678678

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

    r5530 r6227  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-11-16 23:06:21 $
     13 *  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2006-01-28 01:12:14 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    206206    int x,                             ///< x-position
    207207    int y,                             ///< y-position
    208     complex value                      ///< specified value to set
     208    double complex value               ///< specified value to set
    209209);
    210210
    … …  
    213213 *  A negative value for the x or y positions means index from the end.
    214214 *
    215  *  @return complex:        The value at the specified x,y position.
    216  */
    217 complex psImageGet(
     215 *  @return complex: The value at the specified x,y position.
     216 */
     217double complex psImageGet(
    218218    const psImage *image,              ///< the image from which to get
    219219    int x,                             ///< x-position
    … …  
    272272/** Interpolate image pixel value given floating point coordinates.
    273273 *
    274  *  @return psF32    Pixel value interpolated from image or unexposedValue if
     274 *  @return complex    Pixel value interpolated from image or unexposedValue if
    275275 *                   given x,y doesn't coorespond to a valid image location
    276276 */
    277 complex psImagePixelInterpolate(
     277double complex psImagePixelInterpolate(
    278278    const psImage* input,              ///< input image for interpolation
    279279    float x,                           ///< column location to derive value of
    … …  
    281281    const psImage* mask,               ///< if not NULL, the mask of the input image
    282282    psMaskType maskVal,                ///< the mask value
    283     complex unexposedValue,            ///< return value if x,y location is not in image.
     283    double complex unexposedValue,            ///< return value if x,y location is not in image.
    284284    psImageInterpolateMode mode        ///< interpolation mode
    285285);

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

    r4935 r6227  
    88 *  @author Ross Harman, MHPCC
    99 *
    10  *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-08-31 22:00:10 $
     10 *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2006-01-28 01:12:14 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    2727}
    2828
    29 psScalar* psScalarAlloc(complex value, psElemType type)
     29psScalar* psScalarAlloc(double complex value, psElemType type)
    3030{
    3131    psScalar* scalar = NULL;

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

    r5057 r6227  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-09-15 21:22:22 $
     13 *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2006-01-28 01:12:14 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    6666 */
    6767psScalar* psScalarAlloc(
    68     complex value,                     ///< Data to be put into psScalar.
     68    double complex value,              ///< Data to be put into psScalar.
    6969    psElemType type                    ///< Type of data to be held by psScalar.
    7070);

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

    r5841 r6227  
    99*  @author Robert DeSonia, MHPCC
    1010*
    11 *  @version $Revision: 1.63 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2005-12-24 00:33:18 $
     11*  @version $Revision: 1.64 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2006-01-28 01:12:14 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    818818bool psVectorSet(const psVector *input,
    819819                 long position,
    820                  complex value)
     820                 double complex value)
    821821{
    822822    if (input == NULL) {
    … …  
    890890}
    891891
    892 complex psVectorGet(const psVector *input,
    893                     long position)
     892double complex psVectorGet(const psVector *input,
     893                           long position)
    894894{
    895895    if (input == NULL) {

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

    r5530 r6227  
    1111 *  @author Ross Harman, MHPCC
    1212 *
    13  *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
    14  *  @date $Date: 2005-11-16 23:06:21 $
     13 *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
     14 *  @date $Date: 2006-01-28 01:12:14 $
    1515 *
    1616 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    235235    const psVector *input,             ///< Input vector to set
    236236    long position,                     ///< vector position
    237     complex value                      ///< value to set
     237    double complex value               ///< value to set
    238238);
    239239
    … …  
    244244 *  @return complex:        Value of the input vector at the specified position.
    245245 */
    246 complex psVectorGet(
     246double complex psVectorGet(
    247247    const psVector *input,             ///< Input vector from which to get value
    248248    long position                      ///< vector position
Note: See TracChangeset for help on using the changeset viewer.