Changeset 4934

Timestamp:

Aug 31, 2005, 11:58:22 AM (21 years ago)

Author:

drobbin

Message:

complex double switched back to complex. RegionForImage test fixed.

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.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 02:07:11 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-31 21:58:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -305 +305 @@
                        const psImage* input,
                        float angle,
-                       complex double exposed,
+                       complex exposed,
                        psImageInterpolateMode mode)
 {
@@ -597 +597 @@
                       float dx,
                       float dy,
-                      complex double exposed,
+                      complex exposed,
                       psImageInterpolateMode mode)
 {

trunk/psLib/src/imageops/psImageGeomManip.h

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 02:07:11 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-31 21:58:22 $
  *
  *  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 double exposed,            ///< the output image pixel values for non-imagery areas
+    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 double exposed,            ///< the output image pixel values for non-imagery areas
+    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.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 02:07:11 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-31 21:58:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -311 +311 @@
 
 int psImageClipComplexRegion(psImage* input,
-                             complex double min,
-                             complex double vmin,
-                             complex double max,
-                             complex double vmax)
+                             complex min,
+                             complex vmin,
+                             complex max,
+                             complex vmax)
 {
     psS32 numClipped = 0;

trunk/psLib/src/imageops/psImagePixelManip.h

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 02:07:11 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-31 21:58:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
 int psImageClipComplexRegion(
     psImage* input,                    ///< the image to clip
-    complex double min,                       ///< the minimum image value allowed
-    complex double vmin,                      ///< the value pixels < min are set to
-    complex double max,                       ///< the maximum image value allowed
-    complex double vmax                       ///< the value pixels > max are set to
+    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
 );