Index: trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c
===================================================================
--- trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c	(revision 2021)
+++ trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c	(revision 2204)
@@ -29,6 +29,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-08 02:48:01 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 00:57:31 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -88,6 +88,6 @@
 #define SCALAR_VECTOR(OUT,IN1,OP,IN2,TYPE)                                                                   \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int npt = 0;                                                                                             \
+    psS32 i = 0;                                                                                               \
+    psS32 npt = 0;                                                                                             \
     ps##TYPE *o = NULL;                                                                                      \
     ps##TYPE *i1 = NULL;                                                                                     \
@@ -104,8 +104,8 @@
 #define SCALAR_IMAGE(OUT,IN1,OP,IN2,TYPE)                                                                    \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int j = 0;                                                                                               \
-    int numRows = 0;                                                                                         \
-    int numCols = 0;                                                                                         \
+    psS32 i = 0;                                                                                               \
+    psS32 j = 0;                                                                                               \
+    psS32 numRows = 0;                                                                                         \
+    psS32 numCols = 0;                                                                                         \
     ps##TYPE *o = NULL;                                                                                      \
     ps##TYPE *i1 = NULL;                                                                                     \
@@ -126,6 +126,6 @@
 #define VECTOR_SCALAR(OUT,IN1,OP,IN2,TYPE)                                                                   \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int n1 = 0;                                                                                              \
+    psS32 i = 0;                                                                                               \
+    psS32 n1 = 0;                                                                                              \
     ps##TYPE *o = NULL;                                                                                      \
     ps##TYPE *i1 = NULL;                                                                                     \
@@ -142,7 +142,7 @@
 #define VECTOR_VECTOR(OUT,IN1,OP,IN2,TYPE)                                                                   \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int n1 = 0;                                                                                              \
-    int n2 = 0;                                                                                              \
+    psS32 i = 0;                                                                                               \
+    psS32 n1 = 0;                                                                                              \
+    psS32 n2 = 0;                                                                                              \
     ps##TYPE *o = NULL;                                                                                      \
     ps##TYPE *i1 = NULL;                                                                                     \
@@ -167,9 +167,9 @@
 #define VECTOR_IMAGE(OUT,IN1,OP,IN2,TYPE)                                                                    \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int j = 0;                                                                                               \
-    int n1 = 0;                                                                                              \
-    int numRows2 = 0;                                                                                        \
-    int numCols2 = 0;                                                                                        \
+    psS32 i = 0;                                                                                               \
+    psS32 j = 0;                                                                                               \
+    psS32 n1 = 0;                                                                                              \
+    psS32 numRows2 = 0;                                                                                        \
+    psS32 numCols2 = 0;                                                                                        \
     psDimen dim1 = 0;                                                                                        \
     ps##TYPE *o = NULL;                                                                                      \
@@ -221,8 +221,8 @@
 #define IMAGE_SCALAR(OUT,IN1,OP,IN2,TYPE)                                                                    \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int j = 0;                                                                                               \
-    int numRows = 0;                                                                                         \
-    int numCols = 0;                                                                                         \
+    psS32 i = 0;                                                                                               \
+    psS32 j = 0;                                                                                               \
+    psS32 numRows = 0;                                                                                         \
+    psS32 numCols = 0;                                                                                         \
     ps##TYPE *o = NULL;                                                                                      \
     ps##TYPE *i1 = NULL;                                                                                     \
@@ -242,9 +242,9 @@
 #define IMAGE_VECTOR(OUT,IN1,OP,IN2,TYPE)                                                                    \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int j = 0;                                                                                               \
-    int n2 = 0;                                                                                              \
-    int numRows1 = 0;                                                                                        \
-    int numCols1 = 0;                                                                                        \
+    psS32 i = 0;                                                                                               \
+    psS32 j = 0;                                                                                               \
+    psS32 n2 = 0;                                                                                              \
+    psS32 numRows1 = 0;                                                                                        \
+    psS32 numCols1 = 0;                                                                                        \
     psDimen dim2 = 0;                                                                                        \
     ps##TYPE *o = NULL;                                                                                      \
@@ -295,10 +295,10 @@
 #define IMAGE_IMAGE(OUT,IN1,OP,IN2,TYPE)                                                                     \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int j = 0;                                                                                               \
-    int numRows1 = 0;                                                                                        \
-    int numCols1 = 0;                                                                                        \
-    int numRows2 = 0;                                                                                        \
-    int numCols2 = 0;                                                                                        \
+    psS32 i = 0;                                                                                               \
+    psS32 j = 0;                                                                                               \
+    psS32 numRows1 = 0;                                                                                        \
+    psS32 numCols1 = 0;                                                                                        \
+    psS32 numRows2 = 0;                                                                                        \
+    psS32 numCols2 = 0;                                                                                        \
     ps##TYPE *o = NULL;                                                                                      \
     ps##TYPE *i1 = NULL;                                                                                     \
@@ -417,5 +417,5 @@
 }
 
-void *psBinaryOp(void *out, void *in1, char *op, void *in2)
+psPtr psBinaryOp(psPtr out, psPtr in1, char *op, psPtr in2)
 {
     psDimen dim1 = 0;
@@ -605,7 +605,7 @@
 #define VECTOR(OUT,IN,OP,TYPE)                                                                               \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int nIn = 0;                                                                                             \
-    int nOut = 0;                                                                                            \
+    psS32 i = 0;                                                                                               \
+    psS32 nIn = 0;                                                                                             \
+    psS32 nOut = 0;                                                                                            \
     ps##TYPE *o = NULL;                                                                                      \
     ps##TYPE *i1 = NULL;                                                                                     \
@@ -629,10 +629,10 @@
 #define IMAGE(OUT,IN,OP,TYPE)                                                                                \
 {                                                                                                            \
-    int i = 0;                                                                                               \
-    int j = 0;                                                                                               \
-    int numRowsIn = 0;                                                                                       \
-    int numColsIn = 0;                                                                                       \
-    int numRowsOut = 0;                                                                                      \
-    int numColsOut = 0;                                                                                      \
+    psS32 i = 0;                                                                                               \
+    psS32 j = 0;                                                                                               \
+    psS32 numRowsIn = 0;                                                                                       \
+    psS32 numColsIn = 0;                                                                                       \
+    psS32 numRowsOut = 0;                                                                                      \
+    psS32 numColsOut = 0;                                                                                      \
     ps##TYPE *o = NULL;                                                                                      \
     ps##TYPE *i1 = NULL;                                                                                     \
@@ -818,5 +818,5 @@
 }
 
-void *psUnaryOp(void *out, void *in, char *op)
+psPtr psUnaryOp(psPtr out, psPtr in, char *op)
 {
     psDimen dimIn = 0;