Changeset 2204 for trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c
- Timestamp:
- Oct 26, 2004, 2:57:34 PM (22 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/src/dataManip/psMatrixVectorArithmetic.c
r2021 r2204 29 29 * @author Ross Harman, MHPCC 30 30 * 31 * @version $Revision: 1.2 8$ $Name: not supported by cvs2svn $32 * @date $Date: 2004-10- 08 02:48:01 $31 * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ 32 * @date $Date: 2004-10-27 00:57:31 $ 33 33 * 34 34 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 88 88 #define SCALAR_VECTOR(OUT,IN1,OP,IN2,TYPE) \ 89 89 { \ 90 inti = 0; \91 intnpt = 0; \90 psS32 i = 0; \ 91 psS32 npt = 0; \ 92 92 ps##TYPE *o = NULL; \ 93 93 ps##TYPE *i1 = NULL; \ … … 104 104 #define SCALAR_IMAGE(OUT,IN1,OP,IN2,TYPE) \ 105 105 { \ 106 inti = 0; \107 intj = 0; \108 intnumRows = 0; \109 intnumCols = 0; \106 psS32 i = 0; \ 107 psS32 j = 0; \ 108 psS32 numRows = 0; \ 109 psS32 numCols = 0; \ 110 110 ps##TYPE *o = NULL; \ 111 111 ps##TYPE *i1 = NULL; \ … … 126 126 #define VECTOR_SCALAR(OUT,IN1,OP,IN2,TYPE) \ 127 127 { \ 128 inti = 0; \129 intn1 = 0; \128 psS32 i = 0; \ 129 psS32 n1 = 0; \ 130 130 ps##TYPE *o = NULL; \ 131 131 ps##TYPE *i1 = NULL; \ … … 142 142 #define VECTOR_VECTOR(OUT,IN1,OP,IN2,TYPE) \ 143 143 { \ 144 inti = 0; \145 intn1 = 0; \146 intn2 = 0; \144 psS32 i = 0; \ 145 psS32 n1 = 0; \ 146 psS32 n2 = 0; \ 147 147 ps##TYPE *o = NULL; \ 148 148 ps##TYPE *i1 = NULL; \ … … 167 167 #define VECTOR_IMAGE(OUT,IN1,OP,IN2,TYPE) \ 168 168 { \ 169 inti = 0; \170 intj = 0; \171 intn1 = 0; \172 intnumRows2 = 0; \173 intnumCols2 = 0; \169 psS32 i = 0; \ 170 psS32 j = 0; \ 171 psS32 n1 = 0; \ 172 psS32 numRows2 = 0; \ 173 psS32 numCols2 = 0; \ 174 174 psDimen dim1 = 0; \ 175 175 ps##TYPE *o = NULL; \ … … 221 221 #define IMAGE_SCALAR(OUT,IN1,OP,IN2,TYPE) \ 222 222 { \ 223 inti = 0; \224 intj = 0; \225 intnumRows = 0; \226 intnumCols = 0; \223 psS32 i = 0; \ 224 psS32 j = 0; \ 225 psS32 numRows = 0; \ 226 psS32 numCols = 0; \ 227 227 ps##TYPE *o = NULL; \ 228 228 ps##TYPE *i1 = NULL; \ … … 242 242 #define IMAGE_VECTOR(OUT,IN1,OP,IN2,TYPE) \ 243 243 { \ 244 inti = 0; \245 intj = 0; \246 intn2 = 0; \247 intnumRows1 = 0; \248 intnumCols1 = 0; \244 psS32 i = 0; \ 245 psS32 j = 0; \ 246 psS32 n2 = 0; \ 247 psS32 numRows1 = 0; \ 248 psS32 numCols1 = 0; \ 249 249 psDimen dim2 = 0; \ 250 250 ps##TYPE *o = NULL; \ … … 295 295 #define IMAGE_IMAGE(OUT,IN1,OP,IN2,TYPE) \ 296 296 { \ 297 inti = 0; \298 intj = 0; \299 intnumRows1 = 0; \300 intnumCols1 = 0; \301 intnumRows2 = 0; \302 intnumCols2 = 0; \297 psS32 i = 0; \ 298 psS32 j = 0; \ 299 psS32 numRows1 = 0; \ 300 psS32 numCols1 = 0; \ 301 psS32 numRows2 = 0; \ 302 psS32 numCols2 = 0; \ 303 303 ps##TYPE *o = NULL; \ 304 304 ps##TYPE *i1 = NULL; \ … … 417 417 } 418 418 419 void *psBinaryOp(void *out, void *in1, char *op, void *in2)419 psPtr psBinaryOp(psPtr out, psPtr in1, char *op, psPtr in2) 420 420 { 421 421 psDimen dim1 = 0; … … 605 605 #define VECTOR(OUT,IN,OP,TYPE) \ 606 606 { \ 607 inti = 0; \608 intnIn = 0; \609 intnOut = 0; \607 psS32 i = 0; \ 608 psS32 nIn = 0; \ 609 psS32 nOut = 0; \ 610 610 ps##TYPE *o = NULL; \ 611 611 ps##TYPE *i1 = NULL; \ … … 629 629 #define IMAGE(OUT,IN,OP,TYPE) \ 630 630 { \ 631 inti = 0; \632 intj = 0; \633 intnumRowsIn = 0; \634 intnumColsIn = 0; \635 intnumRowsOut = 0; \636 intnumColsOut = 0; \631 psS32 i = 0; \ 632 psS32 j = 0; \ 633 psS32 numRowsIn = 0; \ 634 psS32 numColsIn = 0; \ 635 psS32 numRowsOut = 0; \ 636 psS32 numColsOut = 0; \ 637 637 ps##TYPE *o = NULL; \ 638 638 ps##TYPE *i1 = NULL; \ … … 818 818 } 819 819 820 void *psUnaryOp(void *out, void *in, char *op)820 psPtr psUnaryOp(psPtr out, psPtr in, char *op) 821 821 { 822 822 psDimen dimIn = 0;
Note:
See TracChangeset
for help on using the changeset viewer.
