Changeset 7579 for trunk/psLib/src/mathtypes

Timestamp:

Jun 14, 2006, 4:29:12 PM (20 years ago)

Author:

drobbin

Message:

removed 'const' from ImageSet/VectorSet and worked on indice problem ([row][col] or [y][x])

Location:

trunk/psLib/src/mathtypes

Files:

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

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.106 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-13 19:53:54 $
+ *  @version $Revision: 1.107 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-15 02:29:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -363 +363 @@
     #define IMAGE_SET_CASE(TYPE) \
 case PS_TYPE_##TYPE: \
-    image->data.TYPE[y][x] = value; \
+    image->data.TYPE[y][x] = (ps##TYPE)value; \
     break;
 
@@ -400 +400 @@
                 "Invalid x-position %d.  Position out of range (%d-%d)\n",
                 x, image->col0, image->numCols+image->col0-1 );
-        return false;
+        return NAN;
     } else if ( y >= (image->row0 + image->numRows) ) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
                 "Invalid y-position %d.  Position out of range (%d-%d)\n",
                 y, image->row0, image->numRows+image->row0-1 );
-        return false;
+        return NAN;
     } else if (x < image->col0 && x >= 0) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
                 "Invalid x-position %d.  Position out of range (%d-%d)\n",
                 x, image->col0, image->numCols+image->col0-1 );
-        return false;
+        return NAN;
     } else if (y < image->row0 && y >= 0) {
         psError(PS_ERR_BAD_PARAMETER_SIZE, true,
                 "Invalid y-position %d.  Position out of range (%d-%d)\n",
                 y, image->row0, image->numRows+image->row0-1 );
-        return false;
+        return NAN;
     } else if (x < 0 || y < 0) {
         if (x < 0) {
@@ -424 +424 @@
                     "Invalid x-position %d.  Position out of range (%d-%d)\n",
                     (x+image->col0), image->col0, image->numCols+image->col0-1 );
-            return false;
+            return NAN;
         }
         if (y < 0) {
@@ -433 +433 @@
                     "Invalid y-position %d.  Position out of range (%d-%d)\n",
                     (y+image->row0), image->row0, image->numRows+image->row0-1 );
-            return false;
+            return NAN;
         }
     } else {

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.78 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-14 01:29:16 $
+ *  @version $Revision: 1.79 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-15 02:29:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -93 +93 @@
  */
 psImage* psImageAlloc(
-    int numCols,                       ///< Number of rows in image.
-    int numRows,                       ///< Number of columns in image.
+    int numCols,                       ///< Number of columns in image.
+    int numRows,                       ///< Number of rows in image.
     psElemType type                    ///< Type of data for image.
 )

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-06-01 01:00:03 $
+*  @version $Revision: 1.76 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-06-15 02:29:12 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -873 +873 @@
 }
 
-bool psVectorSet(const psVector *input,
+bool psVectorSet(psVector *input,
                  long position,
                  double complex value)
@@ -904 +904 @@
     switch (input->type.type) {
     case PS_TYPE_U8:
-        *(psU8*)&input->data.U8[position] = value;
+        input->data.U8[position] = (psU8)value;
         break;
     case PS_TYPE_U16:
-        *(psU16*)&input->data.U16[position] = value;
+        input->data.U16[position] = (psU16)value;
         break;
     case PS_TYPE_U32:
-        *(psU32*)&input->data.U32[position] = value;
+        input->data.U32[position] = (psU32)value;
         break;
     case PS_TYPE_U64:
-        *(psU64*)&input->data.U64[position] = value;
+        input->data.U64[position] = (psU64)value;
         break;
     case PS_TYPE_S8:
-        *(psS8*)&input->data.S8[position] = value;
+        input->data.S8[position] = (psS8)value;
         break;
     case PS_TYPE_S16:
-        *(psS16*)&input->data.S16[position] = value;
+        input->data.S16[position] = (psS16)value;
         break;
     case PS_TYPE_S32:
-        *(psS32*)&input->data.S32[position] = value;
+        input->data.S32[position] = (psS32)value;
         break;
     case PS_TYPE_S64:
-        *(psS64*)&input->data.S64[position] = value;
+        input->data.S64[position] = (psS64)value;
         break;
     case PS_TYPE_F32:
-        *(psF32*)&input->data.F32[position] = value;
+        input->data.F32[position] = (psF32)value;
         break;
     case PS_TYPE_F64:
-        *(psF64*)&input->data.F64[position] = value;
+        input->data.F64[position] = (psF64)value;
         break;
     case PS_TYPE_C32:
-        *(psC32*)&input->data.C32[position] = value;
+        input->data.C32[position] = (psC32)value;
         break;
     case PS_TYPE_C64:
-        *(psC64*)&input->data.C64[position] = value;
+        input->data.C64[position] = (psC64)value;
         break;
     default:

trunk/psLib/src/mathtypes/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-02-28 02:53:03 $
+ *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-15 02:29:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -233 +233 @@
  */
 bool psVectorSet(
-    const psVector *input,             ///< Input vector to set
+    psVector *input,                   ///< Input vector to set
     long position,                     ///< vector position
     double complex value               ///< value to set