|
From: Gordon K. <kin...@us...> - 2004-05-10 19:32:31
|
Update of /cvsroot/teem/teem/src/ell In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14425 Modified Files: ellMacros.h Log Message: we can always use more macros Index: ellMacros.h =================================================================== RCS file: /cvsroot/teem/teem/src/ell/ellMacros.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** ellMacros.h 7 May 2004 19:07:44 -0000 1.42 --- ellMacros.h 10 May 2004 19:32:21 -0000 1.43 *************** *** 216,219 **** --- 216,222 ---- (v3)[2] = AIR_MAX((v1)[2], (v2)[2])) + #define ELL_3V_EXISTS(v) \ + (AIR_EXISTS((v)[0]) && AIR_EXISTS((v)[1]) && AIR_EXISTS((v)[2])) + #define ELL_3V_AFFINE(v,i,x,I,o,O) ( \ (v)[0] = AIR_AFFINE((i)[0],(x)[0],(I)[0],(o)[0],(O)[0]), \ *************** *** 469,472 **** --- 472,479 ---- (length = ELL_4V_LEN(v1), ELL_4V_SCALE(v2, 1.0/length, v1)) + #define ELL_4V_EXISTS(v) \ + (AIR_EXISTS((v)[0]) && AIR_EXISTS((v)[1]) \ + && AIR_EXISTS((v)[2]) && AIR_EXISTS((v)[3])) + #define ELL_4M_ADD2(m3, m1, m2) \ (ELL_4V_ADD2((m3)+ 0, (m1)+ 0, (m2)+ 0), \ |