Index: /trunk/psLib/src/imageops/psImageGeomManip.c =================================================================== --- /trunk/psLib/src/imageops/psImageGeomManip.c (revision 6226) +++ /trunk/psLib/src/imageops/psImageGeomManip.c (revision 6227) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-11-14 22:18:33 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -305,5 +305,5 @@ const psImage* input, float angle, - complex exposed, + double complex exposed, psImageInterpolateMode mode) { @@ -597,5 +597,5 @@ float dx, float dy, - complex exposed, + double complex exposed, psImageInterpolateMode mode) { Index: /trunk/psLib/src/imageops/psImageGeomManip.h =================================================================== --- /trunk/psLib/src/imageops/psImageGeomManip.h (revision 6226) +++ /trunk/psLib/src/imageops/psImageGeomManip.h (revision 6227) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-31 21:58:22 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -77,5 +77,5 @@ const psImage* input, ///< input image float angle, ///< the rotation angle in radians. - complex exposed, ///< the output image pixel values for non-imagery areas + double complex exposed, ///< the output image pixel values for non-imagery areas psImageInterpolateMode mode ///< the interpolation mode used ); @@ -97,5 +97,5 @@ float dx, ///< the shift in x direction. float dy, ///< the shift in y direction. - complex exposed, ///< the output image pixel values for non-imagery areas + double complex exposed, ///< the output image pixel values for non-imagery areas psImageInterpolateMode mode ///< the interpolation mode to use ); @@ -151,5 +151,5 @@ psRegion region, ///< the size of the transformed image const psPixels* pixels, /**< if not NULL, consists of psPixelCoords and specifies which pixels in - * output image shall be transformed; otherwise, entire image generated*/ + * output image shall be transformed; otherwise, entire image generated*/ psImageInterpolateMode mode, ///< the interpolation scheme to be used double exposedValue ///< Exposed value to which non-corresponding pixels are set Index: /trunk/psLib/src/imageops/psImagePixelManip.c =================================================================== --- /trunk/psLib/src/imageops/psImagePixelManip.c (revision 6226) +++ /trunk/psLib/src/imageops/psImagePixelManip.c (revision 6227) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-10-06 02:41:07 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -311,8 +311,8 @@ int psImageClipComplexRegion(psImage* input, - complex min, - complex vmin, - complex max, - complex vmax) + double complex min, + double complex vmin, + double complex max, + double complex vmax) { psS32 numClipped = 0; Index: /trunk/psLib/src/imageops/psImagePixelManip.h =================================================================== --- /trunk/psLib/src/imageops/psImagePixelManip.h (revision 6226) +++ /trunk/psLib/src/imageops/psImagePixelManip.h (revision 6227) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-10-06 02:41:07 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -51,8 +51,8 @@ int psImageClipComplexRegion( psImage* input, ///< the image to clip - complex min, ///< the minimum image value allowed - complex vmin, ///< the value pixels < min are set to - complex max, ///< the maximum image value allowed - complex vmax ///< the value pixels > max are set to + double complex min, ///< the minimum image value allowed + double complex vmin, ///< the value pixels < min are set to + double complex max, ///< the maximum image value allowed + double complex vmax ///< the value pixels > max are set to ); Index: /trunk/psLib/src/mathtypes/psImage.c =================================================================== --- /trunk/psLib/src/mathtypes/psImage.c (revision 6226) +++ /trunk/psLib/src/mathtypes/psImage.c (revision 6227) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.93 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-12-24 00:33:18 $ + * @version $Revision: 1.94 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:14 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -289,5 +289,5 @@ int x, int y, - complex value) + double complex value) { if (image == NULL) { @@ -359,7 +359,7 @@ } -complex psImageGet(const psImage *image, - int x, - int y) +double complex psImageGet(const psImage *image, + int x, + int y) { if (image == NULL) { @@ -668,11 +668,11 @@ } -complex psImagePixelInterpolate(const psImage* input, - float x, - float y, - const psImage* mask, - psMaskType maskVal, - complex unexposedValue, - psImageInterpolateMode mode) +double complex psImagePixelInterpolate(const psImage* input, + float x, + float y, + const psImage* mask, + psMaskType maskVal, + double complex unexposedValue, + psImageInterpolateMode mode) { Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 6226) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 6227) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.73 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-11-16 23:06:21 $ + * @version $Revision: 1.74 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:14 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -206,5 +206,5 @@ int x, ///< x-position int y, ///< y-position - complex value ///< specified value to set + double complex value ///< specified value to set ); @@ -213,7 +213,7 @@ * A negative value for the x or y positions means index from the end. * - * @return complex: The value at the specified x,y position. - */ -complex psImageGet( + * @return complex: The value at the specified x,y position. + */ +double complex psImageGet( const psImage *image, ///< the image from which to get int x, ///< x-position @@ -272,8 +272,8 @@ /** Interpolate image pixel value given floating point coordinates. * - * @return psF32 Pixel value interpolated from image or unexposedValue if + * @return complex Pixel value interpolated from image or unexposedValue if * given x,y doesn't coorespond to a valid image location */ -complex psImagePixelInterpolate( +double complex psImagePixelInterpolate( const psImage* input, ///< input image for interpolation float x, ///< column location to derive value of @@ -281,5 +281,5 @@ const psImage* mask, ///< if not NULL, the mask of the input image psMaskType maskVal, ///< the mask value - complex unexposedValue, ///< return value if x,y location is not in image. + double complex unexposedValue, ///< return value if x,y location is not in image. psImageInterpolateMode mode ///< interpolation mode ); Index: /trunk/psLib/src/mathtypes/psScalar.c =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.c (revision 6226) +++ /trunk/psLib/src/mathtypes/psScalar.c (revision 6227) @@ -8,6 +8,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-31 22:00:10 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:14 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ } -psScalar* psScalarAlloc(complex value, psElemType type) +psScalar* psScalarAlloc(double complex value, psElemType type) { psScalar* scalar = NULL; Index: /trunk/psLib/src/mathtypes/psScalar.h =================================================================== --- /trunk/psLib/src/mathtypes/psScalar.h (revision 6226) +++ /trunk/psLib/src/mathtypes/psScalar.h (revision 6227) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-15 21:22:22 $ + * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:14 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -66,5 +66,5 @@ */ psScalar* psScalarAlloc( - complex value, ///< Data to be put into psScalar. + double complex value, ///< Data to be put into psScalar. psElemType type ///< Type of data to be held by psScalar. ); Index: /trunk/psLib/src/mathtypes/psVector.c =================================================================== --- /trunk/psLib/src/mathtypes/psVector.c (revision 6226) +++ /trunk/psLib/src/mathtypes/psVector.c (revision 6227) @@ -9,6 +9,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.63 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-12-24 00:33:18 $ +* @version $Revision: 1.64 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-28 01:12:14 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -818,5 +818,5 @@ bool psVectorSet(const psVector *input, long position, - complex value) + double complex value) { if (input == NULL) { @@ -890,6 +890,6 @@ } -complex psVectorGet(const psVector *input, - long position) +double complex psVectorGet(const psVector *input, + long position) { if (input == NULL) { Index: /trunk/psLib/src/mathtypes/psVector.h =================================================================== --- /trunk/psLib/src/mathtypes/psVector.h (revision 6226) +++ /trunk/psLib/src/mathtypes/psVector.h (revision 6227) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-11-16 23:06:21 $ + * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:14 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -235,5 +235,5 @@ const psVector *input, ///< Input vector to set long position, ///< vector position - complex value ///< value to set + double complex value ///< value to set ); @@ -244,5 +244,5 @@ * @return complex: Value of the input vector at the specified position. */ -complex psVectorGet( +double complex psVectorGet( const psVector *input, ///< Input vector from which to get value long position ///< vector position Index: /trunk/psLib/src/sys/psType.h =================================================================== --- /trunk/psLib/src/sys/psType.h (revision 6226) +++ /trunk/psLib/src/sys/psType.h (revision 6227) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.42 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-10-29 00:05:52 $ +* @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-01-28 01:12:15 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,6 +67,6 @@ #else // SWIG -typedef float _Complex psC32; ///< complex with 32-bit floating point Real and Imagary numbers -typedef double _Complex psC64; ///< complex with 64-bit floating point Real and Imagary numbers +typedef float complex psC32; ///< complex with 32-bit floating point Real and Imagary numbers +typedef double complex psC64; ///< complex with 64-bit floating point Real and Imagary numbers #endif // !SWIG Index: /trunk/psLib/test/astro/tst_psTime_04.c =================================================================== --- /trunk/psLib/test/astro/tst_psTime_04.c (revision 6226) +++ /trunk/psLib/test/astro/tst_psTime_04.c (revision 6227) @@ -18,6 +18,6 @@ * @author David Robbins, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-01-26 23:32:49 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-01-28 01:12:17 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -161,5 +161,5 @@ psError(PS_ERR_BAD_PARAMETER_VALUE, false, "psTime_TideUT1Corr failed to return correct values.\n"); - printf("\nsec = %ld, nsec = %u\n", (long)(empty->sec), empty->nsec); + printf("\nsec = %ld, nsec = %u\n", (long int)empty->sec, empty->nsec); return 2; }