Changeset 4315 for trunk/psLib/src/imageops

Timestamp:

Jun 17, 2005, 4:30:50 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib/src/imageops

Files:

• psImageConvolve.c (modified) (2 diffs)
• psImageConvolve.h (modified) (2 diffs)
• psImagePixelManip.c (modified) (4 diffs)
• psImagePixelManip.h (modified) (4 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -5 +5 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-07 02:29:44 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 02:30:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -279 +279 @@
 }
 
-psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, psBool direct)
+psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, bool direct)
 {
     if (in == NULL) {

trunk/psLib/src/imageops/psImageConvolve.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-14 02:54:15 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 02:30:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -123 +123 @@
     const psImage* in,                 ///< the psImage to convolve
     const psKernel* kernel,            ///< kernel to colvolve with
-    psBool direct                        ///< specifies method, true=direct convolution, false=fourier
+    bool direct                        ///< specifies method, true=direct convolution, false=fourier
 );
 

trunk/psLib/src/imageops/psImagePixelManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 02:08:21 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 02:30:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -31 +31 @@
 #include "psCoord.h"
 
-psS32 psImageClip(psImage* input,
-                  psF64 min,
-                  psF64 vmin,
-                  psF64 max,
-                  psF64 vmax)
+int psImageClip(psImage* input,
+                double min,
+                double vmin,
+                double max,
+                double vmax)
 {
     psS32 numClipped = 0;
@@ -140 +140 @@
 }
 
-psS32 psImageClipNaN(psImage* input,
-                     psF64 value)
+int psImageClipNaN(psImage* input,
+                   float value)
 {
     psS32 numClipped = 0;
@@ -310 +310 @@
 }
 
-psS32 psImageClipComplexRegion(psImage* input,
-                               psC64 min,
-                               psC64 vmin,
-                               psC64 max,
-                               psC64 vmax)
+int psImageClipComplexRegion(psImage* input,
+                             psC64 min,
+                             psC64 vmin,
+                             psC64 max,
+                             psC64 vmax)
 {
     psS32 numClipped = 0;

trunk/psLib/src/imageops/psImagePixelManip.h

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-18 02:30:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
  *  @return psS32     The number of clipped pixels
  */
-psS32 psImageClip(
+int psImageClip(
     psImage* input,                    ///< the image to clip
-    psF64 min,                         ///< the minimum image value allowed
-    psF64 vmin,                        ///< the value pixels < min are set to
-    psF64 max,                         ///< the maximum image value allowed
-    psF64 vmax                         ///< the value pixels > max are set to
+    double min,                        ///< the minimum image value allowed
+    double vmin,                       ///< the value pixels < min are set to
+    double max,                        ///< the maximum image value allowed
+    double vmax                        ///< the value pixels > max are set to
 );
 
@@ -49 +49 @@
  *  @return psS32     The number of clipped pixels
  */
-psS32 psImageClipComplexRegion(
+int psImageClipComplexRegion(
     psImage* input,                    ///< the image to clip
     psC64 min,                         ///< the minimum image value allowed
@@ -64 +64 @@
  *  @return psS32     The number of clipped pixels
  */
-psS32 psImageClipNaN(
+int psImageClipNaN(
     psImage* input,                    ///< the image to clip
-    psF64 value                        ///< the value to set all NaN/Inf values to
+    float value                        ///< the value to set all NaN/Inf values to
 );