[Teem-commit] teem/src/limn/test soid.c,1.11,1.12 tbc.c,1.3,1.4 tcamanim.c,1.5,1.6

[Gordon K. <kin...@us...>]

Update of /cvsroot/teem/teem/src/limn/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17368/test

Modified Files:
	soid.c tbc.c tcamanim.c 
Log Message:
fixed warning messages

Index: tbc.c
===================================================================
RCS file: /cvsroot/teem/teem/src/limn/test/tbc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tbc.c	7 Jan 2004 15:34:30 -0000	1.3
--- tbc.c	10 May 2004 19:46:50 -0000	1.4
***************
*** 53,57 ****
    hestOpt *hopt=NULL;
    airArray *mop;
!   int bi, ci, i, N, M, pause, loop;
    Nrrd *ncptA, *ncptB, *nout;
    double *out, minT, maxT, scale, tran[2], B, C;
--- 53,57 ----
    hestOpt *hopt=NULL;
    airArray *mop;
!   int bi, ci, i, N, M, loop;
    Nrrd *ncptA, *ncptB, *nout;
    double *out, minT, maxT, scale, tran[2], B, C;
***************
*** 108,113 ****
    }
  
-   pause = M/150;
- 
    printf("%%!\n");
    printf("1 setlinewidth\n");
--- 108,111 ----

Index: tcamanim.c
===================================================================
RCS file: /cvsroot/teem/teem/src/limn/test/tcamanim.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tcamanim.c	10 May 2004 19:27:25 -0000	1.5
--- tcamanim.c	10 May 2004 19:46:50 -0000	1.6
***************
*** 30,38 ****
    char me[]="_limnReadCamanim", err[AIR_STRLEN_MED];
    char line[AIR_STRLEN_HUGE];
!   int lret, ki;
    double *tmp, *dwell, di, dn, df, fr[3], at[3], up[3], va;
    airArray *mop, *camA, *dwellA;
    
!   if (!( 0 < (lret = airOneLine(fin, line, AIR_STRLEN_HUGE)) 
  	 && !strcmp(_LIMNMAGIC, line) )) {
      sprintf(err, "%s: couldn't read first line or it wasn't \"%s\"",
--- 30,38 ----
    char me[]="_limnReadCamanim", err[AIR_STRLEN_MED];
    char line[AIR_STRLEN_HUGE];
!   int ki;
    double *tmp, *dwell, di, dn, df, fr[3], at[3], up[3], va;
    airArray *mop, *camA, *dwellA;
    
!   if (!( 0 < airOneLine(fin, line, AIR_STRLEN_HUGE)
  	 && !strcmp(_LIMNMAGIC, line) )) {
      sprintf(err, "%s: couldn't read first line or it wasn't \"%s\"",
***************
*** 40,44 ****
      biffAdd(LIMN, err); return 1;
    }
!   if (!( 0 < (lret = airOneLine(fin, line, AIR_STRLEN_HUGE))
  	 && 2 == (airStrtrans(airStrtrans(line, '{', ' '), '}', ' '),
  		  sscanf(line, "imgSize %d %d", imgSize+0, imgSize+1)) )) {
--- 40,44 ----
      biffAdd(LIMN, err); return 1;
    }
!   if (!( 0 < airOneLine(fin, line, AIR_STRLEN_HUGE)
  	 && 2 == (airStrtrans(airStrtrans(line, '{', ' '), '}', ' '),
  		  sscanf(line, "imgSize %d %d", imgSize+0, imgSize+1)) )) {
***************
*** 54,58 ****
    airMopAdd(mop, dwellA, (airMopper)airArrayNuke, airMopAlways);
  
!   while ( 0 < (lret = airOneLine(fin, line, AIR_STRLEN_HUGE)) ) {
      airStrtrans(airStrtrans(line, '{', ' '), '}', ' ');
      ki = airArrayIncrLen(camA, 1);
--- 54,58 ----
    airMopAdd(mop, dwellA, (airMopper)airArrayNuke, airMopAlways);
  
!   while ( 0 < airOneLine(fin, line, AIR_STRLEN_HUGE) ) {
      airStrtrans(airStrtrans(line, '{', ' '), '}', ' ');
      ki = airArrayIncrLen(camA, 1);

Index: soid.c
===================================================================
RCS file: /cvsroot/teem/teem/src/limn/test/soid.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** soid.c	1 Mar 2004 21:59:03 -0000	1.11
--- soid.c	10 May 2004 19:46:50 -0000	1.12
***************
*** 27,36 ****
    char *me, *err, *outS;
    float p[3], q[4], mR[9], eval[3], scale[3], len, sh, cl, cp, qA, qB;
!   float matA[16], matB[16], os, rad, edgeWidth[5], AB[2];
    hestOpt *hopt=NULL;
    airArray *mop;
    limnObject *obj;
    limnLook *look; int lookRod, lookSoid;
!   limnPart *part; int partIdx=-1; /* sssh */
    int res, axis, sphere;
    FILE *file;
--- 27,36 ----
    char *me, *err, *outS;
    float p[3], q[4], mR[9], eval[3], scale[3], len, sh, cl, cp, qA, qB;
!   float matA[16], matB[16], os, rad, AB[2];
    hestOpt *hopt=NULL;
    airArray *mop;
    limnObject *obj;
    limnLook *look; int lookRod, lookSoid;
!   int partIdx=-1; /* sssh */
    int res, axis, sphere;
    FILE *file;
***************
*** 38,43 ****
    mop = airMopNew();
    
-   edgeWidth[0] = 0;
-   edgeWidth[1] = 0;
    me = argv[0];
    hestOptAdd(&hopt, "sc", "scalings", airTypeFloat, 3, 3, scale, "1 1 1",
--- 38,41 ----
***************
*** 117,121 ****
  					  axis, qA, qB, 2*res, res);
    }
-   part = obj->part + partIdx;
    ELL_4M_IDENTITY_SET(matA);
    ELL_4M_SCALE_SET(matB, scale[0], scale[1], scale[2]);
--- 115,118 ----