Changeset 4526 for trunk/psLib/src/image/psImage.h

Timestamp:

Jul 8, 2005, 3:24:30 PM (21 years ago)

Author:

drobbin

Message:

Revised psLib based on SDRS rev. 15 changes

File:

• trunk/psLib/src/image/psImage.h (modified) (6 diffs)

trunk/psLib/src/image/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-07 02:17:53 $
+ *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-09 01:24:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51 +51 @@
 typedef struct psImage
 {
-    const psMathType type;                 ///< Image data type and dimension.
-    const psU32 numCols;               ///< Number of columns in image
-    const psU32 numRows;               ///< Number of rows in image.
-    const psS32 col0;                  ///< Column position relative to parent.
-    const psS32 row0;                  ///< Row position relative to parent.
+    const psMathType type;             ///< Image data type and dimension.
+    const int numCols;                 ///< Number of columns in image
+    const int numRows;                 ///< Number of rows in image.
+    const int col0;                    ///< Column position relative to parent.
+    const int row0;                    ///< Row position relative to parent.
 
     union {
@@ -77 +77 @@
 
     psPtr rawDataBuffer;               ///< Raw data buffer for Allocating/Freeing Images
+    void *lock;                        ///< Optional lock for thread safety
 }
 psImage;
@@ -103 +104 @@
  */
 psImage* psImageAlloc(
-    psU32 numCols,                     ///< Number of rows in image.
-    psU32 numRows,                     ///< Number of columns in image.
+    int numCols,                       ///< Number of rows in image.
+    int numRows,                       ///< Number of columns in image.
     psElemType type                    ///< Type of data for image.
-);
+)
+;
 
 /** Create a psRegion with the specified attributes.
@@ -113 +115 @@
  */
 psRegion psRegionSet(
-    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.
+    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.
 );
 
@@ -146 +148 @@
 psImage* psImageRecycle(
     psImage* old,                      ///< the psImage to recycle by resizing image buffer
-    psU32 numCols,                     ///< the desired number of columns in image
-    psU32 numRows,                     ///< the desired number of rows in image
+    int numCols,                       ///< the desired number of columns in image
+    int numRows,                       ///< the desired number of rows in image
     const psElemType type              ///< the desired datatype of the image
 );