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

Timestamp:

May 18, 2005, 7:18:20 PM (21 years ago)

Author:

desonia

Message:

fixes to psRegion.

File:

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

trunk/psLib/src/image/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.51 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-04-29 02:25:10 $
+ *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-19 05:18:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -110 +110 @@
 /** Create a psRegion with the specified attributes.
  *
- * Uses psLib memory allocation functions to create a psRegion the
- * specified x0, x1, y0, and y1.
- *
- * @return psRegion* : Pointer to psRegion.
- *
- */
-psRegion* psRegionAlloc(
+ * @return psRegion : a cooresponding psRegion.
+ */
+psRegion psRegionSet(
     psF32 x0,                         ///< the first column of the region.
-    psF32 x1,                         ///< the last 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.
+    psF32 y1                          ///< the last row of the region + 1.
 );
 
@@ -128 +124 @@
  *  shall be of the standard IRAF form '[x0:x1,y0:y1]'
  *
- *  @return psRegion*:  A new psRegion struct, or NULL is not successful.
- */
-psRegion* psRegionFromString(
+ *  @return psRegion:  A new psRegion struct, or NULL is not successful.
+ */
+psRegion psRegionFromString(
     char* region                       ///< image rectangular region in the form '[x0:x1,y0:y1]'
 );
@@ -140 +136 @@
  */
 char* psRegionToString(
-    psRegion* region                   ///< the psRegion to convert to a string
+    psRegion region                   ///< the psRegion to convert to a string
 );
 
@@ -153 +149 @@
     psU32 numRows,                     ///< the desired number of rows in image
     const psElemType type              ///< the desired datatype of the image
-);
-
-/** Makes a copy of a psImage
- *
- * @return psImage* Copy of the input psImage.  This may not be equal to the
- * output parameter
- *
- */
-psImage* psImageCopy(
-    psImage* output,                   ///< if not NULL, a psImage that could be recycled.
-    const psImage* input,              ///< the psImage to copy
-    psElemType type                    ///< the desired datatype of the returned copy
 );