Changeset 6227 for trunk/psLib/src/imageops

Timestamp:

Jan 27, 2006, 3:12:17 PM (20 years ago)

Author:

desonia

Message:

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

Location:

trunk/psLib/src/imageops

Files:

• psImageGeomManip.c (modified) (3 diffs)
• psImageGeomManip.h (modified) (4 diffs)
• psImagePixelManip.c (modified) (2 diffs)
• psImagePixelManip.h (modified) (2 diffs)

trunk/psLib/src/imageops/psImageGeomManip.c

@@ -10 +10 @@
  *  @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 +305 @@
                        const psImage* input,
                        float angle,
-                       complex exposed,
+                       double complex exposed,
                        psImageInterpolateMode mode)
 {
@@ -597 +597 @@
                       float dx,
                       float dy,
-                      complex exposed,
+                      double complex exposed,
                       psImageInterpolateMode mode)
 {

trunk/psLib/src/imageops/psImageGeomManip.h

@@ -8 +8 @@
  *  @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 +77 @@
     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 +97 @@
     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 +151 @@
     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

trunk/psLib/src/imageops/psImagePixelManip.c

@@ -10 +10 @@
  *  @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 +311 @@
 
 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;

trunk/psLib/src/imageops/psImagePixelManip.h

@@ -8 +8 @@
  *  @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 +51 @@
 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
 );