Changeset 4493 for trunk/psLib/src/image

Timestamp:

Jul 6, 2005, 4:17:54 PM (21 years ago)

Author:

drobbin

Message:

made revisions according to psLib SDRS rev 15

Location:

trunk/psLib/src/image

Files:

• psImage.c (modified) (2 diffs)
• psImage.h (modified) (5 diffs)
• psImageStructManip.c (modified) (2 diffs)

trunk/psLib/src/image/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-28 20:17:52 $
+ *  @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-07 02:17:53 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -91 +91 @@
 }
 
-psRegion psRegionSet(psF32 x0,
-                     psF32 x1,
-                     psF32 y0,
-                     psF32 y1)
+psRegion psRegionSet(float x0,
+                     float x1,
+                     float y0,
+                     float y1)
 {
     psRegion out;

trunk/psLib/src/image/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-28 20:17:52 $
+ *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-07 02:17:53 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
 typedef struct psImage
 {
-    const psType type;                 ///< Image data type and dimension.
+    const psMathType type;                 ///< Image data type and dimension.
     const psU32 numCols;               ///< Number of columns in image
     const psU32 numRows;               ///< Number of rows in image.
@@ -87 +87 @@
 typedef struct
 {
-    psF32 x0;                         ///< the first column of the region.
-    psF32 x1;                         ///< the last column of the region.
-    psF32 y0;                         ///< the first row of the region.
-    psF32 y1;                         ///< the last row of the region.
+    float x0;                         ///< the first column of the region.
+    float x1;                         ///< the last column of the region.
+    float y0;                         ///< the first row of the region.
+    float y1;                         ///< the last row of the region.
 }
 psRegion;
@@ -113 +113 @@
  */
 psRegion psRegionSet(
-    psF32 x0,                         ///< the first column of the region.
-    psF32 x1,                         ///< the last column of the region + 1.
-    psF32 y0,                         ///< the first row of the region.
-    psF32 y1                          ///< the last row of the region + 1.
+    float x0,                         ///< the first column of the region.
+    float x1,                         ///< the last column of the region + 1.
+    float y0,                         ///< the first row of the region.
+    float y1                          ///< the last row of the region + 1.
 );
 
@@ -152 +152 @@
 
 /** Copy an image to a new buffer
- *  
+ *
  *  @return True if image copied or false if error
  */

trunk/psLib/src/image/psImageStructManip.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-19 05:18:20 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-07 02:17:53 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -94 +94 @@
 
     out->data.V = psRealloc(out->data.V,sizeof(psPtr)*numRows); // resize row pointer array
-    *(psType*)&out->type = image->type;
+    *(psMathType*)&out->type = image->type;
     *(psU32*)&out->numCols = numCols;
     *(psU32*)&out->numRows = numRows;