Changeset 5101 for trunk/psLib/src/mathtypes

Timestamp:

Sep 22, 2005, 2:04:36 PM (21 years ago)

Author:

drobbin

Message:

Added and update PixelGet/Set, ImageGet/Set, and test fxns

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (2 diffs)
• psImage.h (modified) (2 diffs)
• psVector.c (modified) (2 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-16 23:56:51 $
+ *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-23 00:04:36 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -267 +267 @@
 }
 
+bool psImageSet(const psImage *image,
+                int x,
+                int y,
+                complex value)
+{
+    if (image == NULL)
+        return false;
+    if (x >= image->numRows || y >= image->numCols)
+        return false;
+    if(x < 0)
+        x += image->numRows;
+    if(y < 0)
+        y += image->numCols;
+
+    switch (image->type.type) {
+    case PS_TYPE_U8:
+        *(psU8*)&image->data.U8[x][y] = value;
+        break;
+    case PS_TYPE_U16:
+        *(psU16*)&image->data.U16[x][y] = value;
+        break;
+    case PS_TYPE_U32:
+        *(psU32*)&image->data.U32[x][y] = value;
+        break;
+    case PS_TYPE_U64:
+        *(psU64*)&image->data.U64[x][y] = value;
+        break;
+    case PS_TYPE_S8:
+        *(psS8*)&image->data.S8[x][y] = value;
+        break;
+    case PS_TYPE_S16:
+        *(psS16*)&image->data.S16[x][y] = value;
+        break;
+    case PS_TYPE_S32:
+        *(psS32*)&image->data.S32[x][y] = value;
+        break;
+    case PS_TYPE_S64:
+        *(psS64*)&image->data.S64[x][y] = value;
+        break;
+    case PS_TYPE_F32:
+        *(psF32*)&image->data.F32[x][y] = value;
+        break;
+    case PS_TYPE_F64:
+        *(psF64*)&image->data.F64[x][y] = value;
+        break;
+    case PS_TYPE_C32:
+        *(psC32*)&image->data.C32[x][y] = value;
+        break;
+    case PS_TYPE_C64:
+        *(psC64*)&image->data.C64[x][y] = value;
+        break;
+    default:
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Invalid psImage Data Type\n");
+        return false;
+    }
+
+    return true;
+}
+
+complex psImageGet(const psImage *image,
+                   int x,
+                   int y)
+{
+    if (image == NULL)
+        return NAN;
+    if (x >= image->numRows || y >= image->numCols)
+        return NAN;
+    if(x < 0)
+        x += image->numRows;
+    if(y < 0)
+        y += image->numCols;
+
+    switch (image->type.type) {
+    case PS_TYPE_U8:
+        return image->data.U8[x][y];
+        break;
+    case PS_TYPE_U16:
+        return image->data.U16[x][y];
+        break;
+    case PS_TYPE_U32:
+        return image->data.U32[x][y];
+        break;
+    case PS_TYPE_U64:
+        return image->data.U64[x][y];
+        break;
+    case PS_TYPE_S8:
+        return image->data.S8[x][y];
+        break;
+    case PS_TYPE_S16:
+        return image->data.S16[x][y];
+        break;
+    case PS_TYPE_S32:
+        return image->data.S32[x][y];
+        break;
+    case PS_TYPE_S64:
+        return image->data.S64[x][y];
+        break;
+    case PS_TYPE_F32:
+        return image->data.F32[x][y];
+        break;
+    case PS_TYPE_F64:
+        return image->data.F64[x][y];
+        break;
+    case PS_TYPE_C32:
+        return image->data.C32[x][y];
+        break;
+    case PS_TYPE_C64:
+        return image->data.C64[x][y];
+        break;
+    default:
+        return NAN;
+    }
+}
 
 psImage* psImageRecycle(psImage* old,

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-19 22:50:29 $
+ *  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-23 00:04:36 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -193 +193 @@
 );
 
+/** Sets the value of the image at the specified x,y position to value.
+ *
+ *  A negative value for the x or y positions means index from the end.
+ *
+ *  @return bool:       True on success, otherwise false.
+ */
+bool psImageSet(
+    const psImage *image,              ///< the image to set
+    int x,                             ///< x-position
+    int y,                             ///< y-position
+    complex value                      ///< specified value to set
+);
+
+/** Returns the value of the image at the specified x,y position.
+ *
+ *  A negative value for the x or y positions means index from the end.
+ *
+ *  @return complex:        The value at the specified x,y position.
+ */
+complex psImageGet(
+    const psImage *image,              ///< the image from which to get
+    int x,                             ///< x-position
+    int y                              ///< y-position
+);
+
 /** Resize a given image to the given size/type.
  *

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-22 02:32:00 $
+*  @version $Revision: 1.55 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-23 00:04:36 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -863 +863 @@
     default:
         psError(PS_ERR_BAD_PARAMETER_TYPE, true, "Invalid psVector Data Type\n");
+        return false;
     }