teem-commit — gets email notification of all Teem svn commits

[Teem-commit] teemdoc/html/nrrd/files index.html,1.4,1.5

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

Update of /cvsroot/teem/teemdoc/html/nrrd/files
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21253/nrrd/files

Modified Files:
	index.html 
Log Message:
various updates

Index: index.html
===================================================================
RCS file: /cvsroot/teem/teemdoc/html/nrrd/files/index.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** index.html	9 Jan 2004 19:46:46 -0000	1.4
--- index.html	19 Feb 2004 22:51:12 -0000	1.5
***************
*** 256,260 ****
  as the <tt>aneurism.raw.gz</tt> file, then we're done.  We
  can immediately start using <a
! href="../unrrdu/index.html"><tt>unu</tt></a>, for instance, to start
  inspecting the data:
  
--- 256,260 ----
  as the <tt>aneurism.raw.gz</tt> file, then we're done.  We
  can immediately start using <a
! href="../../unrrdu/index.html"><tt>unu</tt></a>, for instance, to start
  inspecting the data:
  

[Teem-commit] teemdoc/html/nrrd lib.html,1.5,1.6

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

Update of /cvsroot/teem/teemdoc/html/nrrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21253/nrrd

Modified Files:
	lib.html 
Log Message:
various updates

Index: lib.html
===================================================================
RCS file: /cvsroot/teem/teemdoc/html/nrrd/lib.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lib.html	9 Jan 2004 19:46:46 -0000	1.5
--- lib.html	19 Feb 2004 22:51:12 -0000	1.6
***************
*** 127,131 ****
    ** Comments.  Read from, and written to, header.
    ** The comment array "cmt" is NOT NULL-terminated.
!   ** The number of comments is cmtArr->len.
    */
    char **cmt;
--- 127,131 ----
    ** Comments.  Read from, and written to, header.
    ** The comment array "cmt" is NOT NULL-terminated.
!   ** The number of comments is cmtArr->len.
    */
    char **cmt;
***************
*** 310,313 ****
--- 310,368 ----
  </ul>
  
+ <h2>Reading a NRRD with a different memory allocator</h2>
+ 
+ In some cases you want to read a NRRD in, but you want to do the
+ memory allocation, instead of the nrrd library doing it for you.  This
+ is supported in nrrd, but you have to read the nrrd in two steps: the
+ first time reads the nrrd header so that you can figure out how much
+ memory to allocate, and the second time reads in the data (as well
+ as re-reading the header).  This function demonstrates this:
+ 
+ <blockquote><pre>
+ Nrrd *
+ customLoad(char *filename) {
+   char me[]="demoIO", *err;
+   NrrdIoState *nios;
+   Nrrd *nin;
+   void *data;
+   
+   /* create a new nrrd */
+   nin = nrrdNew();
+   
+   /* tell nrrdLoad to only read the header, not the data */
+   nios = nrrdIoStateNew();
+   nrrdIoStateSet(nios, nrrdIoStateSkipData, AIR_TRUE);
+   
+   /* read in the nrrd header from file */
+   if (nrrdLoad(nin, filename, nios)) {
+     err = biffGetDone(NRRD);
+     fprintf(stderr, "%s: trouble reading \"%s\" header:\n%s",
+             me, filename, err);
+     free(err); nios = nrrdIoStateNix(nios);
+     return NULL;
+   }
+   
+   /* we're done with the nrrdIoState, this sets it to NULL */
+   nios = nrrdIoStateNix(nios);
+   
+   /* load the nrrd again, this time the data will be read, but 
+      the existing nin-&gt;data memory will be used, because nrrdRead
+      (called by nrrdLoad) remembers the address and size of incoming
+      allocated data, and eventually it will get used, instead of
+      nrrd allocating new memory */
+   if (nrrdLoad(nin, filename, NULL)) {
+     err = biffGetDone(NRRD);
+     fprintf(stderr, "%s: trouble reading \"%s\" data:\n%s",
+ 	    me, filename, err);
+     free(err);
+     return NULL;
+   }
+ 
+   /* return the nrrd.  Remember that you probably want to nrrdNix this
+      nrrd, and not nrrdNuke, since nrrdNuke will free(nin-&gt;data) */
+   return nin;
+ }
+ </pre></blockquote>
+ 
  <h2>Getting data into and out of nrrds</h2>
  
***************
*** 378,382 ****
  nval = nrrdNew();
  nrrdAlloc(nval, nrrdTypeDouble, 3, sx, sy, sz);
! val = (double*)nval->data;
  val[10 + sx*(20 + sy*30)] = 42;     /* val[x=10,y=20,z=30] = 42 */
  ...
--- 433,437 ----
  nval = nrrdNew();
  nrrdAlloc(nval, nrrdTypeDouble, 3, sx, sy, sz);
! val = (double*)nval-&gt;data;
  val[10 + sx*(20 + sy*30)] = 42;     /* val[x=10,y=20,z=30] = 42 */
  ...
***************
*** 650,654 ****
  <td align=right><tt>nrrdContentSet</tt>
  <td><b>-</b>
! <td align=left>printf-style setting of the nrrd->content field
  <tr>
  <td align=right><tt>nrrdCheck</tt>
--- 705,709 ----
  <td align=right><tt>nrrdContentSet</tt>
  <td><b>-</b>
! <td align=left>printf-style setting of the nrrd-&gt;content field
  <tr>
  <td align=right><tt>nrrdCheck</tt>
***************
*** 740,747 ****
  <td><b>-</b>
  <td align=left>reverses the byte-ordering of the data in memory
- <tr>
- <td align=right><tt></tt>
- <td><b>-</b>
- <td align=left>
  </table>
  </center>
--- 795,798 ----
***************
*** 761,766 ****
    size_t I, N;
    
!   lup = nrrdDLookup[nrrd->type];
!   ins = nrrdDInsert[nrrd->type];
    N = nrrdElementNumber(nrrd);
    for (I=0; I&lt;N; I++) {
--- 812,817 ----
    size_t I, N;
    
!   lup = nrrdDLookup[nrrd-&gt;type];
!   ins = nrrdDInsert[nrrd-&gt;type];
    N = nrrdElementNumber(nrrd);
    for (I=0; I&lt;N; I++) {

[Teem-commit] teemdoc/html/download index.html,1.20,1.21

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

Update of /cvsroot/teem/teemdoc/html/download
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21253/download

Modified Files:
	index.html 
Log Message:
various updates

Index: index.html
===================================================================
RCS file: /cvsroot/teem/teemdoc/html/download/index.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** index.html	11 Jan 2004 22:31:23 -0000	1.20
--- index.html	19 Feb 2004 22:51:12 -0000	1.21
***************
*** 133,136 ****
--- 133,138 ----
  for storing the data, if it happens to be exactly the right size.
  
+ <li> <tt>overrgb</tt> can now composite against a given background image
+ 
  <li> <tt>unu tile</tt>, <tt>unu untile</tt>: convenient generation of tiled
  images (2-D arrays of 2-D images)

[Teem-commit] teem/src/bin mrender.c,1.31,1.32

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

Update of /cvsroot/teem/teem/src/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv406

Modified Files:
	mrender.c 
Log Message:
debugging rendering of tensors

Index: mrender.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/mrender.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** mrender.c	19 Feb 2004 07:11:12 -0000	1.31
--- mrender.c	19 Feb 2004 11:15:13 -0000	1.32
***************
*** 80,83 ****
--- 80,84 ----
    Nrrd *nin;            /* input volume to render */
    gageKind *kind;       /* the kind of volume it is */
+   int verbPixel[2];     /* which pixel to do verbose stuff on */
    double rayStep,       /* distance between sampling planes */
      fromNaN;            /* what to convert non-existent value to */
***************
*** 320,323 ****
--- 321,331 ----
    tt->ui = uIndex;
    tt->vi = vIndex;
+   if (!( -1 == uu->verbPixel[0] && -1 == uu->verbPixel[1] )) {
+     if (uIndex == uu->verbPixel[0] && vIndex == uu->verbPixel[1]) {
+       gageParmSet(uu->gctx0, gageParmVerbose, AIR_TRUE);
+     } else {
+       gageParmSet(uu->gctx0, gageParmVerbose, AIR_FALSE);
+     }
+   }
    tt->rayLen = rayLen;
    tt->rayStep = (uu->rayStep*tt->rayLen /
***************
*** 434,438 ****
    hestOpt *hopt=NULL;
    hestParm *hparm;
!   int E, Ecode, renorm;
    char *me, *errS, *whatS;
    mrendUser *uu;
--- 442,446 ----
    hestOpt *hopt=NULL;
    hestParm *hparm;
!   int E, Ecode, renorm, base;
    char *me, *errS, *whatS;
    mrendUser *uu;
***************
*** 493,496 ****
--- 501,507 ----
  	     &(uu->hctx->numThreads),
  	     "1", "number of threads hoover should use");
+   hestOptAdd(&hopt, "vp", "img coords", airTypeInt, 2, 2, &(uu->verbPixel),
+ 	     "-1 -1", "pixel coordinates for which to turn on all verbose "
+ 	     "debugging messages, or \"-1 -1\" to disable this.");
    hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &(uu->outS),
  	     NULL, "file to write output nrrd to");
***************
*** 526,536 ****
    
    /* set remaining fields of hoover context */
!   nrrdAxisInfoGet_nva(uu->nin, nrrdAxisInfoSize, uu->hctx->volSize);
!   nrrdAxisInfoGet_nva(uu->nin, nrrdAxisInfoSpacing, uu->hctx->volSpacing);
!   if (nrrdCenterUnknown != uu->nin->axis[0].center) {
!     uu->hctx->volCentering = uu->nin->axis[0].center;
      fprintf(stderr, "%s: setting volCentering to %s\n", me,
! 	    airEnumStr(nrrdCenter, uu->nin->axis[0].center));
    }
    /* this is reasonable for now */
    uu->hctx->imgCentering = nrrdCenterCell;
--- 537,554 ----
    
    /* set remaining fields of hoover context */
!   base = uu->kind->baseDim;
!   uu->hctx->volSize[0] = uu->nin->axis[base+0].size;
!   uu->hctx->volSize[1] = uu->nin->axis[base+1].size;
!   uu->hctx->volSize[2] = uu->nin->axis[base+2].size;
!   uu->hctx->volSpacing[0] = uu->nin->axis[base+0].spacing;
!   uu->hctx->volSpacing[1] = uu->nin->axis[base+1].spacing;
!   uu->hctx->volSpacing[2] = uu->nin->axis[base+2].spacing;
!   if (nrrdCenterUnknown != uu->nin->axis[base].center) {
!     uu->hctx->volCentering = uu->nin->axis[base].center;
      fprintf(stderr, "%s: setting volCentering to %s\n", me,
! 	    airEnumStr(nrrdCenter, uu->nin->axis[base].center));
    }
+   fprintf(stderr, "!%s: uu->hctx->volCentering = %d\n",
+ 	  me, uu->hctx->volCentering);
    /* this is reasonable for now */
    uu->hctx->imgCentering = nrrdCenterCell;

[Teem-commit] teem/src/ten enumsTen.c,1.14,1.15 ten.h,1.72,1.73 tenGage.c,1.12,1.13

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

Update of /cvsroot/teem/teem/src/ten
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32668

Modified Files:
	enumsTen.c ten.h tenGage.c 
Log Message:
added some parent items

Index: enumsTen.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/enumsTen.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** enumsTen.c	13 Feb 2004 23:00:08 -0000	1.14
--- enumsTen.c	19 Feb 2004 11:14:09 -0000	1.15
***************
*** 67,73 ****
--- 67,75 ----
    "trace",
    "frob",
+   "eigenvalues",
    "eigenvalue0",
    "eigenvalue1",
    "eigenvalue2",
+   "eigenvectors",
    "eigenvector0",
    "eigenvector1",
***************
*** 91,97 ****
--- 93,101 ----
    "tensor trace",
    "frob(tensor)",
+   "3 tensor eigenvalues",
    "tensor eigenvalue 0",
    "tensor eigenvalue 1",
    "tensor eigenvalue 2",
+   "3 tensor eigenvectors",
    "tensor eigenvector 0",
    "tensor eigenvector 1",
***************
*** 115,121 ****
--- 119,127 ----
    tenGageTrace,
    tenGageFrobTensor,
+   tenGageEval,
    tenGageEval0,
    tenGageEval1,
    tenGageEval2,
+   tenGageEvec,
    tenGageEvec0,
    tenGageEvec1,
***************
*** 136,142 ****
--- 142,150 ----
  #define TG_TR   tenGageTrace
  #define TG_FT   tenGageFrobTensor
+ #define TG_AL   tenGageEval
  #define TG_AL0   tenGageEval0
  #define TG_AL1   tenGageEval1
  #define TG_AL2   tenGageEval2
+ #define TG_EC   tenGageEvec
  #define TG_EC0   tenGageEvec0
  #define TG_EC1   tenGageEvec1
***************
*** 158,164 ****
--- 166,174 ----
    "tr", "trace",
    "frt", "fro", "frob", "frobt",
+   "eval", "eigenvalue",
    "eval0", "eigenvalue0",
    "eval1", "eigenvalue1",
    "eval2", "eigenvalue2",
+   "evec", "eigenvector",
    "evec0", "eigenvector0",
    "evec1", "eigenvector1",
***************
*** 182,188 ****
--- 192,200 ----
    TG_TR, TG_TR,
    TG_FT, TG_FT, TG_FT, TG_FT,
+   TG_AL, TG_AL,
    TG_AL0, TG_AL0,
    TG_AL1, TG_AL1,
    TG_AL2, TG_AL2,
+   TG_EC, TG_EC,
    TG_EC0, TG_EC0,
    TG_EC1, TG_EC1,

Index: ten.h
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/ten.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** ten.h	19 Feb 2004 03:44:06 -0000	1.72
--- ten.h	19 Feb 2004 11:14:09 -0000	1.73
***************
*** 145,175 ****
    tenGageUnknown = -1,  /* -1: nobody knows */
    tenGageTensor,        /*  0: "t", the reconstructed tensor: GT[7] */
!   tenGageTrace,         /*  1: "tr", trace of tensor: *GT */
!   tenGageFrobTensor,    /*  2: "fro", frobenius norm of tensor: *GT */
!   tenGageEval0,         /*  3: "eval0", major eigenvalue of tensor : *GT */
!   tenGageEval1,         /*  4: "eval1", medium eigenvalue of tensor : *GT */
!   tenGageEval2,         /*  5: "eval2", minor eigenvalue of tensor : *GT */
!   tenGageEvec0,         /*  6: "evec0", major eigenvectors of tensor: GT[3] */
!   tenGageEvec1,         /*  7: "evec1", medium eigenvectors of tensor: GT[3] */
!   tenGageEvec2,         /*  8: "evec2", minor eigenvectors of tensor: GT[3] */
!   tenGageTensorGrad,    /*  9: "tg", all tensor component gradients, starting
  			       with the confidence value gradient: GT[21] */
!   tenGageQ,             /* 10: "q", Q anisotropy (or 9 times it): *GT */
!   tenGageQGradVec,      /* 11: "qv", gradient of Q anisotropy: GT[3] */
!   tenGageQGradMag,      /* 12: "qg", grad mag of Q anisotropy: *GT */
!   tenGageQNormal,       /* 13: "qn", normalized gradient of Q
! 			       anisotropy: GT[3] */
!   tenGageMultiGrad,     /* 14: "mg", sum of outer products of gradients of 
  			       tensor elements, correctly counting the
  			       off-diagonal entries twice, but not counting
  			       the confidence value: GT[9] */
!   tenGageFrobMG,        /* 15: "frmg", frobenius norm of multi gradient: *GT */
!   tenGageMGEval,        /* 16: "mgeval", eigenvalues of multi gradient: GT[3]*/
!   tenGageMGEvec,        /* 17: "mgevec", eigenvectors of multi
  			       gradient: GT[9] */
!   tenGageAniso,         /* 18: "an", all anisotropies: GT[TEN_ANISO_MAX+1] */
    tenGageLast
  };
! #define TEN_GAGE_ITEM_MAX  18
  
  /*
--- 145,176 ----
    tenGageUnknown = -1,  /* -1: nobody knows */
    tenGageTensor,        /*  0: "t", the reconstructed tensor: GT[7] */
!   tenGageTrace,         /*  1: "tr", trace of tensor: GT[1] */
!   tenGageFrobTensor,    /*  2: "fro", frobenius norm of tensor: GT[1] */
!   tenGageEval,          /*  3: "eval", all eigenvalues of tensor : GT[3] */
!   tenGageEval0,         /*  4: "eval0", major eigenvalue of tensor : GT[1] */
!   tenGageEval1,         /*  5: "eval1", medium eigenvalue of tensor : GT[1] */
!   tenGageEval2,         /*  6: "eval2", minor eigenvalue of tensor : GT[1] */
!   tenGageEvec,          /*  7: "evec", major eigenvectors of tensor: GT[9] */
!   tenGageEvec0,         /*  8: "evec0", major eigenvectors of tensor: GT[3] */
!   tenGageEvec1,         /*  9: "evec1", medium eigenvectors of tensor: GT[3] */
!   tenGageEvec2,         /* 10: "evec2", minor eigenvectors of tensor: GT[3] */
!   tenGageTensorGrad,    /* 11: "tg", all tensor component gradients, starting
  			       with the confidence value gradient: GT[21] */
!   tenGageQ,             /* 12: "q", Q anisotropy (or 9 times it): GT[1] */
!   tenGageQGradVec,      /* 13: "qv", gradient vector of Q: GT[3] */
!   tenGageQGradMag,      /* 14: "qg", gradient magnitude of Q: GT[1] */
!   tenGageQNormal,       /* 15: "qn", normalized gradient of Q GT[3] */
!   tenGageMultiGrad,     /* 16: "mg", sum of outer products of gradients of 
  			       tensor elements, correctly counting the
  			       off-diagonal entries twice, but not counting
  			       the confidence value: GT[9] */
!   tenGageFrobMG,        /* 17: "frmg", frob. norm of multi gradient: GT[1] */
!   tenGageMGEval,        /* 18: "mgeval", eigenvalues of multi gradient: GT[3]*/
!   tenGageMGEvec,        /* 19: "mgevec", eigenvectors of multi
  			       gradient: GT[9] */
!   tenGageAniso,         /* 20: "an", all anisotropies: GT[TEN_ANISO_MAX+1] */
    tenGageLast
  };
! #define TEN_GAGE_ITEM_MAX  20
  
  /*

Index: tenGage.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tenGage.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** tenGage.c	13 Feb 2004 23:16:04 -0000	1.12
--- tenGage.c	19 Feb 2004 11:14:09 -0000	1.13
***************
*** 23,37 ****
  
  gageItemEntry
! _tenGageTable[GAGE_SCL_ITEM_MAX+1] = {
    /* enum value              len,deriv,  prereqs,                                       parent item, index*/
    {tenGageTensor,              7,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1},
    {tenGageTrace,               1,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
    {tenGageFrobTensor,          1,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
!   {tenGageEval0,               1,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
!   {tenGageEval1,               1,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
!   {tenGageEval2,               1,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
!   {tenGageEvec0,               3,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
!   {tenGageEvec1,               3,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
!   {tenGageEvec2,               3,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
    {tenGageTensorGrad,         21,  1,  {-1, -1, -1, -1, -1},                                    -1,  -1},
    {tenGageQ,                   1,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1},
--- 23,39 ----
  
  gageItemEntry
! _tenGageTable[TEN_GAGE_ITEM_MAX+1] = {
    /* enum value              len,deriv,  prereqs,                                       parent item, index*/
    {tenGageTensor,              7,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1},
    {tenGageTrace,               1,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
    {tenGageFrobTensor,          1,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
!   {tenGageEval,                3,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
!   {tenGageEval0,               1,  0,  {tenGageEval, -1, -1, -1, -1},                  tenGageEval,   0},
!   {tenGageEval1,               1,  0,  {tenGageEval, -1, -1, -1, -1},                  tenGageEval,   1},
!   {tenGageEval2,               1,  0,  {tenGageEval, -1, -1, -1, -1},                  tenGageEval,   2},
!   {tenGageEvec,                9,  0,  {tenGageTensor, -1, -1, -1, -1},                         -1,  -1},
!   {tenGageEvec0,               3,  0,  {tenGageEvec, -1, -1, -1, -1},                  tenGageEvec,   0},
!   {tenGageEvec1,               3,  0,  {tenGageEvec, -1, -1, -1, -1},                  tenGageEvec,   3},
!   {tenGageEvec2,               3,  0,  {tenGageEvec, -1, -1, -1, -1},                  tenGageEvec,   6},
    {tenGageTensorGrad,         21,  1,  {-1, -1, -1, -1, -1},                                    -1,  -1},
    {tenGageQ,                   1,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1},
***************
*** 109,113 ****
    gage_t *tenAns, *tgradAns, *QgradAns, *evalAns, *evecAns, tmptmp=0,
      dtA=0, dtB=0, dtC=0, dtD=0, dtE=0, dtF=0, cbA, cbB;
-   int wantEvals, wantEvecs;
  
  #if !GAGE_TYPE_FLOAT
--- 111,114 ----
***************
*** 119,124 ****
    tgradAns = pvl->directAnswer[tenGageTensorGrad];
    QgradAns = pvl->directAnswer[tenGageQGradVec];
!   evalAns = pvl->directAnswer[tenGageEval0];
!   evecAns = pvl->directAnswer[tenGageEvec0];
    if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageTensor)) {
      /* done if doV */
--- 120,125 ----
    tgradAns = pvl->directAnswer[tenGageTensorGrad];
    QgradAns = pvl->directAnswer[tenGageQGradVec];
!   evalAns = pvl->directAnswer[tenGageEval];
!   evecAns = pvl->directAnswer[tenGageEvec];
    if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageTensor)) {
      /* done if doV */
***************
*** 142,152 ****
  						   + 2*dtE*dtE + dtF*dtF);
    }
!   wantEvals = ((GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEval0)) || 
! 	       (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEval1)) ||
! 	       (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEval2)));
!   wantEvecs = ((GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEvec0)) || 
! 	       (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEvec1)) ||
! 	       (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEvec2)));
!   if (wantEvecs) {
      /* we do the longer process to get eigenvectors, and in the process
         we always find the eigenvalues, whether or not they were asked for */
--- 143,147 ----
  						   + 2*dtE*dtE + dtF*dtF);
    }
!   if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEvec)) {
      /* we do the longer process to get eigenvectors, and in the process
         we always find the eigenvalues, whether or not they were asked for */
***************
*** 159,163 ****
      ELL_3M_COPY(evecAns, evecAnsF);
  #endif
!   } else if (wantEvals) {
      /* else eigenvectors are NOT needed, but eigenvalues ARE needed */
  #if GAGE_TYPE_FLOAT
--- 154,158 ----
      ELL_3M_COPY(evecAns, evecAnsF);
  #endif
!   } else if (GAGE_QUERY_ITEM_TEST(pvl->query, tenGageEval)) {
      /* else eigenvectors are NOT needed, but eigenvalues ARE needed */
  #if GAGE_TYPE_FLOAT

[Teem-commit] teem/src/ell eigen.c,1.16,1.17

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

Update of /cvsroot/teem/teem/src/ell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32097

Modified Files:
	eigen.c 
Log Message:
ell_3m_eigenvalues_d was not sorting the eigenvalues, even though ell_3m_eigensolve_d (called tenEigensolve) did do the sorting

Index: eigen.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ell/eigen.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** eigen.c	7 Jan 2004 15:34:29 -0000	1.16
--- eigen.c	19 Feb 2004 11:10:34 -0000	1.17
***************
*** 178,183 ****
  int
  ell_3m_eigenvalues_d(double _eval[3], double _m[9], int newton) {
!   double A, B, C, scale, frob, m[9], eval[3];
!   int ret;
  
    frob = ELL_3M_FROB(_m);
--- 178,183 ----
  int
  ell_3m_eigenvalues_d(double _eval[3], double _m[9], int newton) {
!   double A, B, C, scale, frob, m[9], eval[3], tmp;
!   int roots;
  
    frob = ELL_3M_FROB(_m);
***************
*** 196,202 ****
      + (m[0]*m[5] - m[2]*m[3])*m[7]
      + (m[1]*m[3] - m[0]*m[4])*m[8];
!   ret = ell_cubic(eval, A, B, C, newton);
    ELL_3V_SCALE(_eval, 1.0/scale, eval);
!   return ret;
  }
  
--- 196,206 ----
      + (m[0]*m[5] - m[2]*m[3])*m[7]
      + (m[1]*m[3] - m[0]*m[4])*m[8];
!   roots = ell_cubic(eval, A, B, C, newton);
!   if (ell_cubic_root_three == roots 
!       || ell_cubic_root_single_double == roots) {
!     ELL_SORT3(eval[0], eval[1], eval[2], tmp);
!   }
    ELL_3V_SCALE(_eval, 1.0/scale, eval);
!   return roots;
  }
  

[Teem-commit] teem/src/bin mrender.c,1.30,1.31

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

Update of /cvsroot/teem/teem/src/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21205/bin

Modified Files:
	mrender.c 
Log Message:
removed pointless warning message about inability to use multiple threads when not compiled with TEEM_PTHREAD

Index: mrender.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/mrender.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** mrender.c	19 Feb 2004 03:59:53 -0000	1.30
--- mrender.c	19 Feb 2004 07:11:12 -0000	1.31
***************
*** 544,548 ****
    uu->hctx->renderEnd = (hooverRenderEnd_t *)mrendRenderEnd;
  
!   if (!airThreadCapable) {
      fprintf(stderr, "%s: This teem not compiled with "
  	    "multi-threading support.\n", me);
--- 544,548 ----
    uu->hctx->renderEnd = (hooverRenderEnd_t *)mrendRenderEnd;
  
!   if (!airThreadCapable && 1 != uu->hctx->numThreads) {
      fprintf(stderr, "%s: This teem not compiled with "
  	    "multi-threading support.\n", me);

[Teem-commit] teem/src/nrrd winKernel.c,1.8,1.9

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

Update of /cvsroot/teem/teem/src/nrrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/nrrd

Modified Files:
	winKernel.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: winKernel.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/winKernel.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** winKernel.c	7 Jan 2004 15:34:30 -0000	1.8
--- winKernel.c	19 Feb 2004 06:45:12 -0000	1.9
***************
*** 20,24 ****
  #include "nrrd.h"
  
! #define _SINC(x) (sin(M_PI*x)/(M_PI*x))
  
  double
--- 20,24 ----
  #include "nrrd.h"
  
! #define _SINC(x) (sin(AIR_PI*x)/(AIR_PI*x))
  
  double
***************
*** 100,106 ****
     (x > R ? 0 : (x < -R ? 0 : (\
     (x < R/50000 && x > -R/50000) \
!      ? 1.1 - x*x*(M_PI*M_PI*(3 + 2*R*R)/(12*R*R) \
!                 + M_PI*M_PI*M_PI*M_PI*(5 + 2*R*R*(5 + 2*R*R))*x*x/(240*R*R*R*R)) \
!      : (1 + cos(M_PI*x/R))*_SINC(x)/2) \
      ))
  
--- 100,106 ----
     (x > R ? 0 : (x < -R ? 0 : (\
     (x < R/50000 && x > -R/50000) \
!      ? 1.1 - x*x*(AIR_PI*AIR_PI*(3 + 2*R*R)/(12*R*R) \
!                 + AIR_PI*AIR_PI*AIR_PI*AIR_PI*(5 + 2*R*R*(5 + 2*R*R))*x*x/(240*R*R*R*R)) \
!      : (1 + cos(AIR_PI*x/R))*_SINC(x)/2) \
      ))
  
***************
*** 124,130 ****
     (x > R ? 0.0 : (x < -R ? 0.0 : (                               \
      (x < R/50000 && x > -R/50000)                                 \
!      ? -x*M_PI*M_PI*(3 + 2*R*R)/(6*R*R)                           \
!      : ((R*(1 + cos(M_PI*x/R))*(M_PI*x*cos(M_PI*x) - sin(M_PI*x)) \
!        - M_PI*x*sin(M_PI*x)*sin(M_PI*x/R))/(2*R*M_PI*x*x))        \
     )))
  
--- 124,130 ----
     (x > R ? 0.0 : (x < -R ? 0.0 : (                               \
      (x < R/50000 && x > -R/50000)                                 \
!      ? -x*AIR_PI*AIR_PI*(3 + 2*R*R)/(6*R*R)                           \
!      : ((R*(1 + cos(AIR_PI*x/R))*(AIR_PI*x*cos(AIR_PI*x) - sin(AIR_PI*x)) \
!        - AIR_PI*x*sin(AIR_PI*x)*sin(AIR_PI*x/R))/(2*R*AIR_PI*x*x))        \
     )))
  
***************
*** 146,159 ****
  
  #define _DDHANN_A(x, R) \
!   (2*M_PI*R*cos(M_PI*x)*(R + R*cos(M_PI*x/R) + M_PI*x*sin(M_PI*x/R)))
  #define _DDHANN_B(x, R)                                      \
!   (cos(M_PI*x/R)*(M_PI*M_PI*x*x + R*R*(M_PI*M_PI*x*x - 2)) + \
!    R*(R*(M_PI*M_PI*x*x - 2) - 2*M_PI*x*sin(M_PI*x/R)))
  #define _DDHANN(x, R)                                                         \
     (x > R ? 0 : (x < -R ? 0 : (                                               \
       (x < R/50000 && x > -R/50000)                                            \
!       ? (M_PI*M_PI/(2*R*R))*( -(3 + 2*R*R)/3                                  \
!                              + M_PI*M_PI*(5 + 2*R*R*(5 + R*R))*x*x/(10*R*R))  \
!       : -(_DDHANN_A(x,R) + sin(M_PI*x)*_DDHANN_B(x,R)/x)/(2*M_PI*R*R*x*x)     \
      )))
  
--- 146,159 ----
  
  #define _DDHANN_A(x, R) \
!   (2*AIR_PI*R*cos(AIR_PI*x)*(R + R*cos(AIR_PI*x/R) + AIR_PI*x*sin(AIR_PI*x/R)))
  #define _DDHANN_B(x, R)                                      \
!   (cos(AIR_PI*x/R)*(AIR_PI*AIR_PI*x*x + R*R*(AIR_PI*AIR_PI*x*x - 2)) + \
!    R*(R*(AIR_PI*AIR_PI*x*x - 2) - 2*AIR_PI*x*sin(AIR_PI*x/R)))
  #define _DDHANN(x, R)                                                         \
     (x > R ? 0 : (x < -R ? 0 : (                                               \
       (x < R/50000 && x > -R/50000)                                            \
!       ? (AIR_PI*AIR_PI/(2*R*R))*( -(3 + 2*R*R)/3                                  \
!                              + AIR_PI*AIR_PI*(5 + 2*R*R*(5 + R*R))*x*x/(10*R*R))  \
!       : -(_DDHANN_A(x,R) + sin(AIR_PI*x)*_DDHANN_B(x,R)/x)/(2*AIR_PI*R*R*x*x)     \
      )))
  
***************
*** 178,182 ****
      (x < R/50000 && x > -R/50000)                                \
       ? 1.0 - x*x*(1.6449340668482264 + 4.046537804446637/(R*R))  \
!      : (0.42 + cos(M_PI*x/R)/2 + 0.08*cos(2*M_PI*x/R))*_SINC(x)  \
     )))
  
--- 178,182 ----
      (x < R/50000 && x > -R/50000)                                \
       ? 1.0 - x*x*(1.6449340668482264 + 4.046537804446637/(R*R))  \
!      : (0.42 + cos(AIR_PI*x/R)/2 + 0.08*cos(2*AIR_PI*x/R))*_SINC(x)  \
     )))
  
***************
*** 198,211 ****
  
  #define _DBLACK_A(x, R)                                   \
!   R*x*cos(M_PI*x)*(2.638937829015426 + M_PI*cos(M_PI*x/R) \
!                    + 0.5026548245743669*cos(2*M_PI*x/R))
  #define _DBLACK_B(x, R)                                                     \
!   sin(M_PI*x)*(-0.84*R - R*cos(M_PI*x/R) - 0.16*R*cos(2*M_PI*x/R) -         \
!                M_PI*x*sin(M_PI*x/R) - 1.0053096491487339*x*sin(2*M_PI*x/R))
  #define _DBLACK(x, R)                                 \
    (x > R ? 0.0 : (x < -R ? 0.0 : (                    \
     (x < R/50000 && x > -R/50000)                      \
     ? -x*(3.289868133696453 + 8.093075608893272/(R*R)) \
!    : (_DBLACK_A(x,R) + _DBLACK_B(x,R))/(2*M_PI*R*x*x) \
    )))
  
--- 198,211 ----
  
  #define _DBLACK_A(x, R)                                   \
!   R*x*cos(AIR_PI*x)*(2.638937829015426 + AIR_PI*cos(AIR_PI*x/R) \
!                    + 0.5026548245743669*cos(2*AIR_PI*x/R))
  #define _DBLACK_B(x, R)                                                     \
!   sin(AIR_PI*x)*(-0.84*R - R*cos(AIR_PI*x/R) - 0.16*R*cos(2*AIR_PI*x/R) -         \
!                AIR_PI*x*sin(AIR_PI*x/R) - 1.0053096491487339*x*sin(2*AIR_PI*x/R))
  #define _DBLACK(x, R)                                 \
    (x > R ? 0.0 : (x < -R ? 0.0 : (                    \
     (x < R/50000 && x > -R/50000)                      \
     ? -x*(3.289868133696453 + 8.093075608893272/(R*R)) \
!    : (_DBLACK_A(x,R) + _DBLACK_B(x,R))/(2*AIR_PI*R*x*x) \
    )))
  
***************
*** 231,245 ****
     ? (-(3.289868133696453 + 8.093075608893272/(R*R))                            \
        + x*x*(9.7409091034 + 86.694091020262/(R*R*R*R) + 79.8754546479/(R*R)))   \
!    : ((R*x*cos(M_PI*x)*(-2.638937829015426*R - M_PI*R*cos((M_PI*x)/R)           \
! 	    - 0.5026548245743669*R*cos((2*M_PI*x)/R)                            \
! 	    - M_PI*M_PI*x*sin((M_PI*x)/R)                                       \
! 	    - 3.158273408348595*x*sin((2*M_PI*x)/R))                            \
!   + sin(M_PI*x)*((-4.934802200544679*x*x                                        \
! 	   + R*R*(1 - 4.934802200544679*x*x))*cos((M_PI*x)/R)                   \
  	  + (-3.158273408348595*x*x                                             \
! 	     + R*R*(0.16 - 0.7895683520871487*x*x))*cos((2*M_PI*x)/R)           \
  	  + R*(0.84*R - 4.14523384845753*R*x*x                                  \
! 	       + M_PI*x*sin((M_PI*x)/R)                                         \
! 	       + 1.0053096491487339*x*sin((2*M_PI*x)/R))))/(M_PI*R*R*x*x*x))    \
     )))
  
--- 231,245 ----
     ? (-(3.289868133696453 + 8.093075608893272/(R*R))                            \
        + x*x*(9.7409091034 + 86.694091020262/(R*R*R*R) + 79.8754546479/(R*R)))   \
!    : ((R*x*cos(AIR_PI*x)*(-2.638937829015426*R - AIR_PI*R*cos((AIR_PI*x)/R)           \
! 	    - 0.5026548245743669*R*cos((2*AIR_PI*x)/R)                            \
! 	    - AIR_PI*AIR_PI*x*sin((AIR_PI*x)/R)                                       \
! 	    - 3.158273408348595*x*sin((2*AIR_PI*x)/R))                            \
!   + sin(AIR_PI*x)*((-4.934802200544679*x*x                                        \
! 	   + R*R*(1 - 4.934802200544679*x*x))*cos((AIR_PI*x)/R)                   \
  	  + (-3.158273408348595*x*x                                             \
! 	     + R*R*(0.16 - 0.7895683520871487*x*x))*cos((2*AIR_PI*x)/R)           \
  	  + R*(0.84*R - 4.14523384845753*R*x*x                                  \
! 	       + AIR_PI*x*sin((AIR_PI*x)/R)                                         \
! 	       + 1.0053096491487339*x*sin((2*AIR_PI*x)/R))))/(AIR_PI*R*R*x*x*x))    \
     )))
  

[Teem-commit] teem/src/ten glyph.c,1.32,1.33 tendHelix.c,1.4,1.5

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

Update of /cvsroot/teem/teem/src/ten
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/ten

Modified Files:
	glyph.c tendHelix.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: glyph.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/glyph.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** glyph.c	13 Feb 2004 23:00:08 -0000	1.32
--- glyph.c	19 Feb 2004 06:45:13 -0000	1.33
***************
*** 224,232 ****
      case 0:
        edge0[1] = edge1[2] = 0;
!       ELL_4M_ROTATE_Y_SET(sRot, M_PI/2);
        break;
      case 1:
        edge0[0] = edge1[2] = 0;
!       ELL_4M_ROTATE_X_SET(sRot, M_PI/2);
        break;
      case 2: default:
--- 224,232 ----
      case 0:
        edge0[1] = edge1[2] = 0;
!       ELL_4M_ROTATE_Y_SET(sRot, AIR_PI/2);
        break;
      case 1:
        edge0[0] = edge1[2] = 0;
!       ELL_4M_ROTATE_X_SET(sRot, AIR_PI/2);
        break;
      case 2: default:

Index: tendHelix.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/tendHelix.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tendHelix.c	7 Jan 2004 15:34:31 -0000	1.4
--- tendHelix.c	19 Feb 2004 06:45:13 -0000	1.5
***************
*** 62,66 ****
  	vpos[0] = AIR_AFFINE(0, xi, sx-1, nout->axis[1].min,nout->axis[1].max);
  
! #define WPOS(pos, th) ELL_3V_SET((pos), R*cos(th), R*sin(th), S*(th)/(2*M_PI))
  #define VAL(th) (WPOS(wpos, th), ELL_3V_DIST(wpos, vpos))
  #define RR 0.61803399
--- 62,66 ----
  	vpos[0] = AIR_AFFINE(0, xi, sx-1, nout->axis[1].min,nout->axis[1].max);
  
! #define WPOS(pos, th) ELL_3V_SET((pos), R*cos(th), R*sin(th), S*(th)/(2*AIR_PI))
  #define VAL(th) (WPOS(wpos, th), ELL_3V_DIST(wpos, vpos))
  #define RR 0.61803399
***************
*** 70,78 ****
  	
  	th = atan2(vpos[1], vpos[0]);
! 	th += 2*M_PI*floor(0.5 + vpos[2]/S - th/(2*M_PI));
! 	if (S*th/(2*M_PI) > vpos[2]) {
! 	  t0 = th - M_PI; t3 = th;
  	} else {
! 	  t0 = th; t3 = th + M_PI;
  	}
  	t1 = RR*t0 + CC*t3;
--- 70,78 ----
  	
  	th = atan2(vpos[1], vpos[0]);
! 	th += 2*AIR_PI*floor(0.5 + vpos[2]/S - th/(2*AIR_PI));
! 	if (S*th/(2*AIR_PI) > vpos[2]) {
! 	  t0 = th - AIR_PI; t3 = th;
  	} else {
! 	  t0 = th; t3 = th + AIR_PI;
  	}
  	t1 = RR*t0 + CC*t3;
***************
*** 94,98 ****
  	WPOS(wpos, t1);
  	ELL_3V_SUB(wpos, vpos, wpos);
! 	ELL_3V_SET(fv, -R*sin(t1), R*cos(t1), S/M_PI);
  	ELL_3V_NORM(fv, fv, len);
  	ELL_3V_COPY(rv, wpos);
--- 94,98 ----
  	WPOS(wpos, t1);
  	ELL_3V_SUB(wpos, vpos, wpos);
! 	ELL_3V_SET(fv, -R*sin(t1), R*cos(t1), S/AIR_PI);
  	ELL_3V_NORM(fv, fv, len);
  	ELL_3V_COPY(rv, wpos);

[Teem-commit] teem/src/nrrd/test genvol.c,1.13,1.14

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

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

Modified Files:
	genvol.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: genvol.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/test/genvol.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** genvol.c	7 Jan 2004 15:34:31 -0000	1.13
--- genvol.c	19 Feb 2004 06:45:13 -0000	1.14
***************
*** 26,30 ****
  float
  rho(float r) {
!   return cos(2*M_PI*6.0*cos(M_PI*r/2));
  }
  
--- 26,30 ----
  float
  rho(float r) {
!   return cos(2*AIR_PI*6.0*cos(AIR_PI*r/2));
  }
  
***************
*** 38,46 ****
    */
    /* marschner-lobb, the real thing
!   return ((1 - sin(M_PI*z/2))
  	  + 0.25*(1 + rho(sqrt(x*x + y*y))))/(2*(1 + 0.25));
  	   */
    /* marschner-lobb, linear variation in Z */
!   return (1 - (M_PI*z + 3)/5) + 0.25*(1 + rho(sqrt(x*x + y*y)))/(2*(1 + 0.25));
  
    /* cone 
--- 38,47 ----
    */
    /* marschner-lobb, the real thing
!   return ((1 - sin(AIR_PI*z/2))
  	  + 0.25*(1 + rho(sqrt(x*x + y*y))))/(2*(1 + 0.25));
  	   */
    /* marschner-lobb, linear variation in Z */
!   return (1 - (AIR_PI*z + 3)/5
! 	  + 0.25*(1 + rho(sqrt(x*x + y*y)))/(2*(1 + 0.25)));
  
    /* cone 

[Teem-commit] teem/src/moss xform.c,1.12,1.13

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

Update of /cvsroot/teem/teem/src/moss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/moss

Modified Files:
	xform.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: xform.c
===================================================================
RCS file: /cvsroot/teem/teem/src/moss/xform.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** xform.c	7 Jan 2004 15:34:30 -0000	1.12
--- xform.c	19 Feb 2004 06:45:12 -0000	1.13
***************
*** 94,98 ****
  mossMatRotateSet (double *mat, double angle) {
  
!   angle *= M_PI/180.0;
    MOSS_MAT_SET(mat, cos(angle), sin(angle), -sin(angle), cos(angle), 0, 0);
    return mat;
--- 94,98 ----
  mossMatRotateSet (double *mat, double angle) {
  
!   angle *= AIR_PI/180.0;
    MOSS_MAT_SET(mat, cos(angle), sin(angle), -sin(angle), cos(angle), 0, 0);
    return mat;

[Teem-commit] teem/src/limn/test tcamanim.c,1.3,1.4

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

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

Modified Files:
	tcamanim.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: tcamanim.c
===================================================================
RCS file: /cvsroot/teem/teem/src/limn/test/tcamanim.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tcamanim.c	7 Jan 2004 15:34:30 -0000	1.3
--- tcamanim.c	19 Feb 2004 06:45:12 -0000	1.4
***************
*** 76,80 ****
      ELL_3V_COPY((*keycamP)[ki].at, at);
      ELL_3V_COPY((*keycamP)[ki].up, up);
!     vm = tan((M_PI/180)*(va/2))*di;
      um = vm*imgSize[0]/imgSize[1];
      (*keycamP)[ki].uRange[0] = -um;
--- 76,80 ----
      ELL_3V_COPY((*keycamP)[ki].at, at);
      ELL_3V_COPY((*keycamP)[ki].up, up);
!     vm = tan((AIR_PI/180)*(va/2))*di;
      um = vm*imgSize[0]/imgSize[1];
      (*keycamP)[ki].uRange[0] = -um;
***************
*** 90,94 ****
    *timeP = (double*)calloc(*numKeysP, sizeof(double));
    for (ki=0; ki<*numKeysP; ki++) {
!     tmp[ki] = tan(AIR_AFFINE(-0.01, dwell[ki], 2.01, 0.0, M_PI/2));
    }
    (*timeP)[0] = 0;
--- 90,94 ----
    *timeP = (double*)calloc(*numKeysP, sizeof(double));
    for (ki=0; ki<*numKeysP; ki++) {
!     tmp[ki] = tan(AIR_AFFINE(-0.01, dwell[ki], 2.01, 0.0, AIR_PI/2));
    }
    (*timeP)[0] = 0;
***************
*** 116,120 ****
      di = cam[fi].dist;
      vm = cam[fi].vRange[1];
!     va = 2*atan2(vm, di)/(M_PI/180);
      fprintf(fout, "isoValue %g cam.di %g cam.at {%g %g %g } "
  	    "cam.up {%g %g %g } cam.dn %g cam.df %g cam.va %g "
--- 116,120 ----
      di = cam[fi].dist;
      vm = cam[fi].vRange[1];
!     va = 2*atan2(vm, di)/(AIR_PI/180);
      fprintf(fout, "isoValue %g cam.di %g cam.at {%g %g %g } "
  	    "cam.up {%g %g %g } cam.dn %g cam.df %g cam.va %g "

[Teem-commit] teem/src/limn renderLimn.c,1.21,1.22 shapes.c,1.16,1.17

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

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

Modified Files:
	renderLimn.c shapes.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: renderLimn.c
===================================================================
RCS file: /cvsroot/teem/teem/src/limn/renderLimn.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** renderLimn.c	13 Feb 2004 22:57:30 -0000	1.21
--- renderLimn.c	19 Feb 2004 06:45:12 -0000	1.22
***************
*** 257,262 ****
  	  edge->type = limnEdgeTypeBorder;
  	} else {
! 	  angle = 180/M_PI*acos(ELL_3V_DOT(face0->worldNormal, 
! 					   face1->worldNormal));
  	  if (face0->visible && face1->visible) {
  	    edge->type = (angle > win->ps.creaseAngle
--- 257,262 ----
  	  edge->type = limnEdgeTypeBorder;
  	} else {
! 	  angle = 180/AIR_PI*acos(ELL_3V_DOT(face0->worldNormal, 
! 					     face1->worldNormal));
  	  if (face0->visible && face1->visible) {
  	    edge->type = (angle > win->ps.creaseAngle
***************
*** 334,339 ****
        edge->type = limnEdgeTypeBorder;
      } else {
!       angle = 180/M_PI*acos(ELL_3V_DOT(face0->worldNormal,
! 				       face1->worldNormal));
        if (face0->visible && face1->visible) {
  	edge->type = (angle > win->ps.creaseAngle
--- 334,339 ----
        edge->type = limnEdgeTypeBorder;
      } else {
!       angle = 180/AIR_PI*acos(ELL_3V_DOT(face0->worldNormal,
! 					 face1->worldNormal));
        if (face0->visible && face1->visible) {
  	edge->type = (angle > win->ps.creaseAngle

Index: shapes.c
===================================================================
RCS file: /cvsroot/teem/teem/src/limn/shapes.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** shapes.c	9 Feb 2004 22:48:01 -0000	1.16
--- shapes.c	19 Feb 2004 06:45:12 -0000	1.17
***************
*** 90,94 ****
  
    for (ii=0; ii<=res-1; ii++) {
!     theta = AIR_AFFINE(0, ii, res, 0, 2*M_PI);
      switch(axis) {
      case 0:
--- 90,94 ----
  
    for (ii=0; ii<=res-1; ii++) {
!     theta = AIR_AFFINE(0, ii, res, 0, 2*AIR_PI);
      switch(axis) {
      case 0:
***************
*** 146,150 ****
    partIdx = limnObjectPartAdd(obj);
    for (ii=0; ii<=res-1; ii++) {
!     th = AIR_AFFINE(0, ii, res, 0, 2*M_PI);
      switch(axis) {
      case 0:
--- 146,150 ----
    partIdx = limnObjectPartAdd(obj);
    for (ii=0; ii<=res-1; ii++) {
!     th = AIR_AFFINE(0, ii, res, 0, 2*AIR_PI);
      switch(axis) {
      case 0:
***************
*** 209,215 ****
    }
    for (pi=1; pi<=phiRes-1; pi++) {
!     p = AIR_AFFINE(0, pi, phiRes, 0, M_PI);
      for (ti=0; ti<=thetaRes-1; ti++) {
!       t = AIR_AFFINE(0, ti, thetaRes, 0, 2*M_PI);
        switch(axis) {
        case 0:
--- 209,215 ----
    }
    for (pi=1; pi<=phiRes-1; pi++) {
!     p = AIR_AFFINE(0, pi, phiRes, 0, AIR_PI);
      for (ti=0; ti<=thetaRes-1; ti++) {
!       t = AIR_AFFINE(0, ti, thetaRes, 0, 2*AIR_PI);
        switch(axis) {
        case 0:
***************
*** 281,287 ****
    }
    for (pi=1; pi<=phiRes-1; pi++) {
!     p = AIR_AFFINE(0, pi, phiRes, 0, M_PI);
      for (ti=0; ti<=thetaRes-1; ti++) {
!       t = AIR_AFFINE(0, ti, thetaRes, 0, 2*M_PI);
        switch(axis) {
        case 0:
--- 281,287 ----
    }
    for (pi=1; pi<=phiRes-1; pi++) {
!     p = AIR_AFFINE(0, pi, phiRes, 0, AIR_PI);
      for (ti=0; ti<=thetaRes-1; ti++) {
!       t = AIR_AFFINE(0, ti, thetaRes, 0, 2*AIR_PI);
        switch(axis) {
        case 0:

[Teem-commit] teem/src/gage sclanswer.c,1.17,1.18

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

Update of /cvsroot/teem/teem/src/gage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/gage

Modified Files:
	sclanswer.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: sclanswer.c
===================================================================
RCS file: /cvsroot/teem/teem/src/gage/sclanswer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sclanswer.c	19 Feb 2004 03:50:02 -0000	1.17
--- sclanswer.c	19 Feb 2004 06:45:12 -0000	1.18
***************
*** 174,178 ****
    if (GAGE_QUERY_ITEM_TEST(pvl->query,  gageSclShapeIndex)) {
      pvl->directAnswer[gageSclShapeIndex][0] = 
!       -(2/M_PI)*atan2(*k1 + *k2, *k1 - *k2);
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageSclCurvDir1)) {
--- 174,178 ----
    if (GAGE_QUERY_ITEM_TEST(pvl->query,  gageSclShapeIndex)) {
      pvl->directAnswer[gageSclShapeIndex][0] = 
!       -(2/AIR_PI)*atan2(*k1 + *k2, *k1 - *k2);
    }
    if (GAGE_QUERY_ITEM_TEST(pvl->query, gageSclCurvDir1)) {

[Teem-commit] teem/src/ell/test tq.c,1.4,1.5

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

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

Modified Files:
	tq.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: tq.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ell/test/tq.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tq.c	7 Jan 2004 15:34:29 -0000	1.4
--- tq.c	19 Feb 2004 06:45:12 -0000	1.5
***************
*** 47,51 ****
      ELL_3V_SET(axisA_f, 2*airRand()-1, 2*airRand()-1, 2*airRand()-1);
      ELL_3V_NORM(axisA_f, axisA_f, tmp); /* yea, not uniform, so what */
!     angleA_f = M_PI*(2*airRand()-1);
      ell_aa_to_q_f(qA_f, angleA_f, axisA_f);
  
--- 47,51 ----
      ELL_3V_SET(axisA_f, 2*airRand()-1, 2*airRand()-1, 2*airRand()-1);
      ELL_3V_NORM(axisA_f, axisA_f, tmp); /* yea, not uniform, so what */
!     angleA_f = AIR_PI*(2*airRand()-1);
      ell_aa_to_q_f(qA_f, angleA_f, axisA_f);
  

[Teem-commit] teem/src/ell cubicEll.c,1.6,1.7

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

Update of /cvsroot/teem/teem/src/ell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/ell

Modified Files:
	cubicEll.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: cubicEll.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ell/cubicEll.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cubicEll.c	7 Jan 2004 15:34:29 -0000	1.6
--- cubicEll.c	19 Feb 2004 06:45:11 -0000	1.7
***************
*** 59,64 ****
      t = 2*sqrt(-p);
      root[0] = t*cos(phi) - sub;
!     root[1] = t*cos(phi + 2*M_PI/3.0) - sub;
!     root[2] = t*cos(phi - 2*M_PI/3.0) - sub;
      /*
      if (!AIR_EXISTS(root[0])) {
--- 59,64 ----
      t = 2*sqrt(-p);
      root[0] = t*cos(phi) - sub;
!     root[1] = t*cos(phi + 2*AIR_PI/3.0) - sub;
!     root[2] = t*cos(phi - 2*AIR_PI/3.0) - sub;
      /*
      if (!AIR_EXISTS(root[0])) {

[Teem-commit] teem/src/echo/test trend.c,1.57,1.58

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

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

Modified Files:
	trend.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: trend.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/test/trend.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** trend.c	7 Jan 2004 15:34:29 -0000	1.57
--- trend.c	19 Feb 2004 06:45:11 -0000	1.58
***************
*** 406,410 ****
      ELL_4M_SCALE_SET(mb, 1.0/(N+2), 0.8, 3.0/(N+2));
      ell_4m_POST_MUL(ma, mb);
!     ELL_4M_ROTATE_X_SET(mb, AIR_AFFINE(0, i, N-1, -M_PI/2, M_PI/2));
      ell_4m_POST_MUL(ma, mb);
      ELL_4M_TRANSLATE_SET(mb, AIR_AFFINE(0, i, N-1, -0.8, 0.8), 0, 1);
--- 406,410 ----
      ELL_4M_SCALE_SET(mb, 1.0/(N+2), 0.8, 3.0/(N+2));
      ell_4m_POST_MUL(ma, mb);
!     ELL_4M_ROTATE_X_SET(mb, AIR_AFFINE(0, i, N-1, -AIR_PI/2, AIR_PI/2));
      ell_4m_POST_MUL(ma, mb);
      ELL_4M_TRANSLATE_SET(mb, AIR_AFFINE(0, i, N-1, -0.8, 0.8), 0, 1);

[Teem-commit] teem/src/air air.h,1.38,1.39 miscAir.c,1.21,1.22

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

Update of /cvsroot/teem/teem/src/air
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/air

Modified Files:
	air.h miscAir.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: air.h
===================================================================
RCS file: /cvsroot/teem/teem/src/air/air.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** air.h	14 Feb 2004 18:56:54 -0000	1.38
--- air.h	19 Feb 2004 06:45:11 -0000	1.39
***************
*** 50,60 ****
  #  pragma warning ( disable : 4309 )
  #  pragma warning ( disable : 4273 )
- /* add essential math definitions */
- #  ifndef M_PI
- #    define M_PI 3.14159265358979323846
- #  endif
- #  ifndef M_E
- #    define M_E  2.71828182845904523536
- #  endif
  #endif
  
--- 50,53 ----
***************
*** 75,78 ****
--- 68,75 ----
  #endif
  
+ /* This is annoying, thanks to windows */
+ #define AIR_PI 3.14159265358979323846
+ #define AIR_E  2.71828182845904523536
+ 
  #define AIR_STRLEN_SMALL (128+1)
  #define AIR_STRLEN_MED   (256+1)

Index: miscAir.c
===================================================================
RCS file: /cvsroot/teem/teem/src/air/miscAir.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** miscAir.c	13 Feb 2004 18:46:51 -0000	1.21
--- miscAir.c	19 Feb 2004 06:45:11 -0000	1.22
***************
*** 483,487 ****
    
    x = x - mean;
!   return exp(-(x*x)/(2*stdv*stdv))/(stdv*sqrt(2*M_PI));
  }
  
--- 483,487 ----
    
    x = x - mean;
!   return exp(-(x*x)/(2*stdv*stdv))/(stdv*sqrt(2*AIR_PI));
  }
  

[Teem-commit] teem/src/echo intx.c,1.39,1.40 model.c,1.4,1.5

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

Update of /cvsroot/teem/teem/src/echo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/echo

Modified Files:
	intx.c model.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: intx.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/intx.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** intx.c	7 Jan 2004 15:34:28 -0000	1.39
--- intx.c	19 Feb 2004 06:45:11 -0000	1.40
***************
*** 158,164 ****
    if (intx->norm[0] || intx->norm[1]) {
      u = atan2(intx->norm[1], intx->norm[0]);
!     intx->u = AIR_AFFINE(-M_PI, u, M_PI, 0.0, 1.0);
      v = -asin(intx->norm[2]);
!     intx->v = AIR_AFFINE(-M_PI/2, v, M_PI/2, 0.0, 1.0);
    }
    else {
--- 158,164 ----
    if (intx->norm[0] || intx->norm[1]) {
      u = atan2(intx->norm[1], intx->norm[0]);
!     intx->u = AIR_AFFINE(-AIR_PI, u, AIR_PI, 0.0, 1.0);
      v = -asin(intx->norm[2]);
!     intx->v = AIR_AFFINE(-AIR_PI/2, v, AIR_PI/2, 0.0, 1.0);
    }
    else {
***************
*** 487,493 ****
    if (norm[0] || norm[1]) {
      u = atan2(norm[1], norm[0]);
!     intx->u = AIR_AFFINE(-M_PI, u, M_PI, 0.0, 1.0);
      v = -asin(norm[2]);
!     intx->v = AIR_AFFINE(-M_PI/2, v, M_PI/2, 0.0, 1.0);
    }
    else {
--- 487,493 ----
    if (norm[0] || norm[1]) {
      u = atan2(norm[1], norm[0]);
!     intx->u = AIR_AFFINE(-AIR_PI, u, AIR_PI, 0.0, 1.0);
      v = -asin(norm[2]);
!     intx->v = AIR_AFFINE(-AIR_PI/2, v, AIR_PI/2, 0.0, 1.0);
    }
    else {

Index: model.c
===================================================================
RCS file: /cvsroot/teem/teem/src/echo/model.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** model.c	7 Jan 2004 15:34:28 -0000	1.4
--- model.c	19 Feb 2004 06:45:11 -0000	1.5
***************
*** 51,57 ****
    ELL_3V_SET(tmp, 0, 0, 1); _echoPosSet(pos, matx, tmp); pos += 3;
    for (phidx=1; phidx<phiRes; phidx++) {
!     ph = AIR_AFFINE(0, phidx, phiRes, 0.0, M_PI);
      for (thidx=0; thidx<theRes; thidx++) {
!       th = AIR_AFFINE(0, thidx, theRes, 0.0, 2*M_PI);
        ELL_3V_SET(tmp, cos(th)*sin(ph), sin(th)*sin(ph), cos(ph));
        _echoPosSet(pos, matx, tmp); pos += 3;
--- 51,57 ----
    ELL_3V_SET(tmp, 0, 0, 1); _echoPosSet(pos, matx, tmp); pos += 3;
    for (phidx=1; phidx<phiRes; phidx++) {
!     ph = AIR_AFFINE(0, phidx, phiRes, 0.0, AIR_PI);
      for (thidx=0; thidx<theRes; thidx++) {
!       th = AIR_AFFINE(0, thidx, theRes, 0.0, 2*AIR_PI);
        ELL_3V_SET(tmp, cos(th)*sin(ph), sin(th)*sin(ph), cos(ph));
        _echoPosSet(pos, matx, tmp); pos += 3;

[Teem-commit] teem/src/bane trnsf.c,1.22,1.23

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

Update of /cvsroot/teem/teem/src/bane
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/bane

Modified Files:
	trnsf.c 
Log Message:
going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows

Index: trnsf.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bane/trnsf.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** trnsf.c	7 Jan 2004 15:34:27 -0000	1.22
--- trnsf.c	19 Feb 2004 06:45:11 -0000	1.23
***************
*** 221,225 ****
       the previous version of the code had a bug caused by
       mindless transcription of the erroneous equation 5.8 */
!   *sP = 2*maxg/(sqrt(M_E)*(maxh - minh));
  
    return 0;
--- 221,225 ----
       the previous version of the code had a bug caused by
       mindless transcription of the erroneous equation 5.8 */
!   *sP = 2*maxg/(sqrt(AIR_E)*(maxh - minh));
  
    return 0;

[Teem-commit] teem/win32/build teem_shared.dsp.tmpl,1.3,1.4

[<ik...@us...>]

Update of /cvsroot/teem/teem/win32/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1431/win32/build

Modified Files:
	teem_shared.dsp.tmpl 
Log Message:
teem.def is no longer used on win32

Index: teem_shared.dsp.tmpl
===================================================================
RCS file: /cvsroot/teem/teem/win32/build/teem_shared.dsp.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** teem_shared.dsp.tmpl	2 Oct 2003 06:08:35 -0000	1.3
--- teem_shared.dsp.tmpl	19 Feb 2004 04:59:31 -0000	1.4
***************
*** 45,49 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /Zi /Od /D "WIN32" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /Zi /Od /I "../../include" /I "../include" TEEMALLINC /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D TEEM_ENDIAN=1234 /D TEEM_QNANHIBIT=1 /D TEEM_DIO=0 /D TEEM_32BIT=1 /D TEEM_ZLIB=1 /D TEEM_BZIP2=1 /D TEEM_PNG=1 /D TEEM_BIGBITFIELD=1 /D "TEEM_STATIC" /YX /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
--- 45,49 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /Zi /Od /D "WIN32" /YX /FD /GZ /c
! # ADD CPP /nologo /MD /Zi /Od /I "../../include" /I "../include" TEEMALLINC /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D TEEM_ENDIAN=1234 /D TEEM_QNANHIBIT=1 /D TEEM_DIO=0 /D TEEM_32BIT=1 /D TEEM_ZLIB=1 /D TEEM_BZIP2=1 /D TEEM_PNG=1 /D TEEM_BIGBITFIELD=1 /D "TEEM_BUILD" /YX /FD /GZ /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
***************
*** 56,60 ****
  # ADD BASE LINK32 /nologo /dll /incremental:no /debug /machine:I386 /pdbtype:sept
  # SUBTRACT BASE LINK32 /pdb:none
! # ADD LINK32 /libpath:"../lib/shared" png.lib bz2.lib z.lib kernel32.lib /nologo /dll /incremental:no /debug /machine:I386 /def:"teem.def" /out:"../bin/teem_d.dll" /implib:"../lib/shared/teem_d.lib /pdb:"../lib/shared/teem_d.pdb" /pdbtype:sept
  # SUBTRACT LINK32 /pdb:none
  # Begin Special Build Tool
--- 56,60 ----
  # ADD BASE LINK32 /nologo /dll /incremental:no /debug /machine:I386 /pdbtype:sept
  # SUBTRACT BASE LINK32 /pdb:none
! # ADD LINK32 /libpath:"../lib/shared" png.lib bz2.lib z.lib kernel32.lib /nologo /dll /incremental:no /debug /machine:I386 /out:"../bin/teem_d.dll" /implib:"../lib/shared/teem_d.lib /pdb:"../lib/shared/teem_d.pdb" /pdbtype:sept
  # SUBTRACT LINK32 /pdb:none
  # Begin Special Build Tool
***************
*** 78,82 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /O2 /D "WIN32" /YX /FD /c
! # ADD CPP /nologo /MD /O2 /I "../../include" /I "../include" TEEMALLINC /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D TEEM_ENDIAN=1234 /D TEEM_QNANHIBIT=1 /D TEEM_DIO=0 /D TEEM_32BIT=1 /D TEEM_ZLIB=1 /D TEEM_BZIP2=1 /D TEEM_PNG=1 /D TEEM_BIGBITFIELD=1 /D "TEEM_STATIC" /YX /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32zlib-1.1.4/msvc6/lib/shared
--- 78,82 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /O2 /D "WIN32" /YX /FD /c
! # ADD CPP /nologo /MD /O2 /I "../../include" /I "../include" TEEMALLINC /D "WIN32" /D "WIN32_MEAN_AND_LEAN" /D "VC_EXTRALEAN" /D TEEM_ENDIAN=1234 /D TEEM_QNANHIBIT=1 /D TEEM_DIO=0 /D TEEM_32BIT=1 /D TEEM_ZLIB=1 /D TEEM_BZIP2=1 /D TEEM_PNG=1 /D TEEM_BIGBITFIELD=1 /D "TEEM_BUILD" /YX /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32zlib-1.1.4/msvc6/lib/shared
***************
*** 88,92 ****
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /dll /pdb:none /machine:I386
! # ADD LINK32 /libpath:"../lib/shared" png.lib bz2.lib z.lib kernel32.lib /nologo /dll /pdb:none /machine:I386 /out:"../bin/teem.dll" /implib:"../lib/shared/teem.lib" /def:"teem.def"
  # Begin Special Build Tool
  TargetName=teem
--- 88,92 ----
  LINK32=link.exe
  # ADD BASE LINK32 /nologo /dll /pdb:none /machine:I386
! # ADD LINK32 /libpath:"../lib/shared" png.lib bz2.lib z.lib kernel32.lib /nologo /dll /pdb:none /machine:I386 /out:"../bin/teem.dll" /implib:"../lib/shared/teem.lib"
  # Begin Special Build Tool
  TargetName=teem

[Teem-commit] teem/src/make win32.mk,1.4,1.5

[<ik...@us...>]

Update of /cvsroot/teem/teem/src/make
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1386/make

Modified Files:
	win32.mk 
Log Message:
teem.def is no longer used on win32

Index: win32.mk
===================================================================
RCS file: /cvsroot/teem/teem/src/make/win32.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** win32.mk	2 Oct 2003 09:10:57 -0000	1.4
--- win32.mk	19 Feb 2004 04:59:16 -0000	1.5
***************
*** 84,98 ****
  	@echo "done"
  
! def.build: $(WIN32.DEST)/teem.def
  
! $(WIN32.DEST)/teem.def: teem.dsp
! 	@echo "Creating teem.def..."
! 	@msdev $(WIN32.DEST)/teem_shared.dsp /make "teem_shared - Win32 Release" /clean
! 	@-msdev $(WIN32.DEST)/teem_shared.dsp /make "teem_shared - Win32 Release" /build
! 	@dlltool --export-all-symbols --output-def teem.def $(WIN32.DEST)/shared/release/*.obj
! 	@grep -v '; dlltool' teem.def | grep -v '_real' | grep -v '??' | grep -v '_airThreadWin32Body' > $(WIN32.DEST)/teem.def
! 	@rm teem.def
! 	@-msdev $(WIN32.DEST)/teem_shared.dsp /make "teem_shared - Win32 Release" /clean
! 	@echo "done"
  
  win32:
--- 84,100 ----
  	@echo "done"
  
! def.build: #$(WIN32.DEST)/teem.def
! 	@echo "Building teem.def is no longer necessary"
! 	@echo "Don't forget to #define TEEM_STATIC when using the static version"
  
! #$(WIN32.DEST)/teem.def: teem.dsp
! #	@echo "Creating teem.def..."
! #	@msdev $(WIN32.DEST)/teem_shared.dsp /make "teem_shared - Win32 Release" /clean
! #	@-msdev $(WIN32.DEST)/teem_shared.dsp /make "teem_shared - Win32 Release" /build
! #	@dlltool --export-all-symbols --output-def teem.def $(WIN32.DEST)/shared/release/*.obj
! #	@grep -v '; dlltool' teem.def | grep -v '_real' | grep -v '??' | grep -v '_airThreadWin32Body' > $(WIN32.DEST)/teem.def
! #	@rm teem.def
! #	@-msdev $(WIN32.DEST)/teem_shared.dsp /make "teem_shared - Win32 Release" /clean
! #	@echo "done"
  
  win32:

[Teem-commit] teem/src/bin mrender.c,1.29,1.30

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

Update of /cvsroot/teem/teem/src/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24494/bin

Modified Files:
	mrender.c 
Log Message:
mrender can now rendering vector and tensor datasets.   Except that it doesn't work yet...

Index: mrender.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/mrender.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** mrender.c	13 Feb 2004 23:01:12 -0000	1.29
--- mrender.c	19 Feb 2004 03:59:53 -0000	1.30
***************
*** 25,34 ****
  #include <teem/limn.h>
  #include <teem/hoover.h>
  
  
  #define MREND "mrender"
  
  char *info = ("A demonstration of hoover, gage, and nrrd measures. "
! 	      "Uses hoover to cast rays through a scalar volume, gage to "
  	      "measure one of various quantities along the rays, and a "
  	      "specified nrrd measure to reduce all the values along a ray "
--- 25,67 ----
  #include <teem/limn.h>
  #include <teem/hoover.h>
+ #include <teem/ten.h>
  
+ int
+ probeParseKind(void *ptr, char *str, char err[AIR_STRLEN_HUGE]) {
+   char me[] = "probeParseKind";
+   gageKind **kindP;
+   
+   if (!(ptr && str)) {
+     sprintf(err, "%s: got NULL pointer", me);
+     return 1;
+   }
+   kindP = ptr;
+   airToLower(str);
+   if (!strcmp("scalar", str)) {
+     *kindP = gageKindScl;
+   } else if (!strcmp("vector", str)) {
+     *kindP = gageKindVec;
+   } else if (!strcmp("tensor", str)) {
+     *kindP = tenGageKind;
+   } else {
+     sprintf(err, "%s: not \"scalar\", \"vector\", or \"tensor\"", me);
+     return 1;
+   }
+ 
+   return 0;
+ }
+ 
+ hestCB probeKindHestCB = {
+   sizeof(gageKind *),
+   "kind",
+   probeParseKind,
+   NULL
+ }; 
  
  #define MREND "mrender"
  
  char *info = ("A demonstration of hoover, gage, and nrrd measures. "
! 	      "Uses hoover to cast rays through a volume (scalar, vector, or "
! 	      "tensor), gage to "
  	      "measure one of various quantities along the rays, and a "
  	      "specified nrrd measure to reduce all the values along a ray "
***************
*** 46,49 ****
--- 79,83 ----
  typedef struct {
    Nrrd *nin;            /* input volume to render */
+   gageKind *kind;       /* the kind of volume it is */
    double rayStep,       /* distance between sampling planes */
      fromNaN;            /* what to convert non-existent value to */
***************
*** 69,72 ****
--- 103,107 ----
    uu = (mrendUser *)calloc(1, sizeof(mrendUser));
    uu->nin = NULL;
+   uu->kind = NULL;
    uu->rayStep = 0.0;
    uu->whatq = gageSclUnknown;
***************
*** 98,104 ****
    char me[]="mrendUserCheck", err[AIR_STRLEN_MED];
    
!   if (3 != uu->nin->dim) {
!     sprintf(err, "%s: input nrrd needs 3 dimensions, not %d", 
! 	    me, uu->nin->dim);
      biffAdd(MREND, err); return 1;
    }
--- 133,139 ----
    char me[]="mrendUserCheck", err[AIR_STRLEN_MED];
    
!   if (3 + uu->kind->baseDim != uu->nin->dim) {
!     sprintf(err, "%s: input nrrd needs %d dimensions, not %d", 
! 	    me,  + uu->kind->baseDim, uu->nin->dim);
      biffAdd(MREND, err); return 1;
    }
***************
*** 111,117 ****
      biffAdd(MREND, err); return 1;
    }
!   if (1 != gageKindScl->table[uu->whatq].answerLength) {
!     sprintf(err, "%s: quantity %s isn't a scalar; can't render it\n",
! 	    me, airEnumStr(gageKindScl->enm, uu->whatq));
      biffAdd(MREND, err); return 1;
    }
--- 146,153 ----
      biffAdd(MREND, err); return 1;
    }
!   if (1 != uu->kind->table[uu->whatq].answerLength) {
!     sprintf(err, "%s: quantity %s (in %s volumes) isn't a scalar; "
! 	    "can't render it",
! 	    me, airEnumStr(uu->kind->enm, uu->whatq), uu->kind->name);
      biffAdd(MREND, err); return 1;
    }
***************
*** 162,166 ****
  
    E = 0;
!   if (!E) E |= !(pvl = gagePerVolumeNew(uu->gctx0, uu->nin, gageKindScl));
    if (!E) E |= gagePerVolumeAttach(uu->gctx0, pvl);
    if (!E) E |= gageKernelSet(uu->gctx0, gageKernel00,
--- 198,202 ----
  
    E = 0;
!   if (!E) E |= !(pvl = gagePerVolumeNew(uu->gctx0, uu->nin, uu->kind));
    if (!E) E |= gagePerVolumeAttach(uu->gctx0, pvl);
    if (!E) E |= gageKernelSet(uu->gctx0, gageKernel00,
***************
*** 348,351 ****
--- 384,393 ----
  /* -------------------------------------------------------------- */
  
+ #if 0
+ 
+   this was nixed once mrender learned to handle volume of general
+   kind, instead of being restricted to scalars
+ 
+ 
  /*
  ** learned: if you're playing games with strings with two passes, where
***************
*** 386,389 ****
--- 428,433 ----
  }
  
+ #endif
+ 
  int
  main(int argc, char *argv[]) {
***************
*** 391,395 ****
    hestParm *hparm;
    int E, Ecode, renorm;
!   char *me, *errS, *buff;
    mrendUser *uu;
    airArray *mop;
--- 435,439 ----
    hestParm *hparm;
    int E, Ecode, renorm;
!   char *me, *errS, *whatS;
    mrendUser *uu;
    airArray *mop;
***************
*** 405,414 ****
    airMopAdd(mop, uu, (airMopper)mrendUserNix, airMopAlways);
  
-   buff = mrendGage("the quantity to measure at sample points along " \
- 		   "rays. Possibilities include:");
-   airMopAdd(mop, buff, airFree, airMopAlways);
- 
    hestOptAdd(&hopt, "i", "nin", airTypeOther, 1, 1, &(uu->nin), NULL,
  	     "input nrrd to render", NULL, NULL, nrrdHestNrrd);
    limnHestCameraOptAdd(&hopt, uu->hctx->cam,
  		       NULL, "0 0 0", "0 0 1",
--- 449,457 ----
    airMopAdd(mop, uu, (airMopper)mrendUserNix, airMopAlways);
  
    hestOptAdd(&hopt, "i", "nin", airTypeOther, 1, 1, &(uu->nin), NULL,
  	     "input nrrd to render", NULL, NULL, nrrdHestNrrd);
+   hestOptAdd(&hopt, "k", "kind", airTypeOther, 1, 1, &(uu->kind), NULL,
+ 	     "\"kind\" of volume (\"scalar\", \"vector\", or \"tensor\")",
+ 	     NULL, NULL, &probeKindHestCB);
    limnHestCameraOptAdd(&hopt, uu->hctx->cam,
  		       NULL, "0 0 0", "0 0 1",
***************
*** 433,439 ****
  	     "\"Accurate\" kernels don't need this; doing it always "
  	     "makes things go slower");
!   hestOptAdd(&hopt, "q", "quantity", airTypeEnum, 1, 1, &(uu->whatq), NULL,
! 	     buff,
! 	     NULL, gageKindScl->enm);
    hestOptAdd(&hopt, "m", "measure", airTypeEnum, 1, 1, &(uu->measr), NULL,
  	     "how to collapse list of ray samples into one scalar. "
--- 476,481 ----
  	     "\"Accurate\" kernels don't need this; doing it always "
  	     "makes things go slower");
!   hestOptAdd(&hopt, "q", "query", airTypeString, 1, 1, &whatS, NULL,
! 	     "the quantity (scalar, vector, or matrix) to learn by probing");
    hestOptAdd(&hopt, "m", "measure", airTypeEnum, 1, 1, &(uu->measr), NULL,
  	     "how to collapse list of ray samples into one scalar. "
***************
*** 459,462 ****
--- 501,515 ----
    airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
  
+   uu->whatq = airEnumVal(uu->kind->enm, whatS);
+   if (-1 == uu->whatq) {
+     /* -1 indeed always means "unknown" for any gageKind */
+     fprintf(stderr, "%s: couldn't parse \"%s\" as measure of \"%s\" volume\n",
+ 	    me, whatS, uu->kind->name);
+     hestUsage(stderr, hopt, me, hparm);
+     hestGlossary(stderr, hopt, hparm);
+     airMopError(mop);
+     return 1;
+   }
+ 
    if (mrendUserCheck(uu)) {
      fprintf(stderr, "%s: problem with input parameters:\n%s\n",
***************
*** 468,474 ****
    gageParmSet(uu->gctx0, gageParmRequireAllSpacings, AIR_FALSE);
    gageParmSet(uu->gctx0, gageParmRenormalize, renorm);
!   fprintf(stderr, "%s: will render %s of %s\n", me,
  	  airEnumStr(nrrdMeasure, uu->measr),
! 	  airEnumStr(gageKindScl->enm, uu->whatq));
    
    /* set remaining fields of hoover context */
--- 521,527 ----
    gageParmSet(uu->gctx0, gageParmRequireAllSpacings, AIR_FALSE);
    gageParmSet(uu->gctx0, gageParmRenormalize, renorm);
!   fprintf(stderr, "%s: will render %s of %s in %s volume\n", me,
  	  airEnumStr(nrrdMeasure, uu->measr),
! 	  airEnumStr(uu->kind->enm, uu->whatq), uu->kind->name);
    
    /* set remaining fields of hoover context */

[Teem-commit] teem/src/bin GNUmakefile,1.29,1.30

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

Update of /cvsroot/teem/teem/src/bin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24222/bin

Modified Files:
	GNUmakefile 
Log Message:
temporarily nixing miter and gkms bins

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/GNUmakefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** GNUmakefile	7 Jan 2004 15:34:28 -0000	1.29
--- GNUmakefile	19 Feb 2004 03:57:52 -0000	1.30
***************
*** 47,52 ****
  ## BINS: all the command-line executables associated with teem
  ## 
  BINS = airSanity affine cubic nrrdSanity overrgb idx2pos emap undos talkweb \
!   pos2idx unu pprobe vprobe qbert mrender miter gkms ungantry ilk tend spots
  
  ## _binD(bins): list of development locations for given bins
--- 47,54 ----
  ## BINS: all the command-line executables associated with teem
  ## 
+ #BINS = airSanity affine cubic nrrdSanity overrgb idx2pos emap undos talkweb \
+ #  pos2idx unu pprobe vprobe qbert mrender miter gkms ungantry ilk tend spots
  BINS = airSanity affine cubic nrrdSanity overrgb idx2pos emap undos talkweb \
!   pos2idx unu pprobe vprobe qbert mrender ungantry ilk tend spots
  
  ## _binD(bins): list of development locations for given bins
***************
*** 94,102 ****
  gkms.need       = $(call meneed,bane nrrd biff air)
  unu.need        = $(call meneed,unrrdu nrrd biff hest air)
- mrender.need    = $(call meneed,hoover limn gage nrrd biff hest air)
  miter.need      = $(call meneed,mite hoover limn nrrd ell biff air)
  ungantry.need   = $(call meneed,gage nrrd biff hest air)
  talkweb.need    = $(call meneed,nrrd biff hest air)
  tend.need       = $(call meneed,ten limn gage dye unrrdu nrrd ell biff air)
  vprobe.need     = $(call meneed,ten limn gage nrrd ell biff hest air)
  pprobe.need     = $(call meneed,ten limn gage nrrd ell biff hest air)
--- 96,104 ----
  gkms.need       = $(call meneed,bane nrrd biff air)
  unu.need        = $(call meneed,unrrdu nrrd biff hest air)
  miter.need      = $(call meneed,mite hoover limn nrrd ell biff air)
  ungantry.need   = $(call meneed,gage nrrd biff hest air)
  talkweb.need    = $(call meneed,nrrd biff hest air)
  tend.need       = $(call meneed,ten limn gage dye unrrdu nrrd ell biff air)
+ mrender.need    = $(call meneed,ten hoover limn gage nrrd biff hest air)
  vprobe.need     = $(call meneed,ten limn gage nrrd ell biff hest air)
  pprobe.need     = $(call meneed,ten limn gage nrrd ell biff hest air)

[Teem-commit] teem/src GNUmakefile,1.50,1.51

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

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

Modified Files:
	GNUmakefile 
Log Message:
temporarily nixing miter and gkms bins

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/teem/teem/src/GNUmakefile,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** GNUmakefile	16 Jan 2004 17:34:25 -0000	1.50
--- GNUmakefile	19 Feb 2004 03:57:52 -0000	1.51
***************
*** 96,102 ****
  ## {R}NUM/LIBS: used for craziness below
  ##
! LIBS = air hest biff nrrd ell unrrdu dye moss gage bane limn hoover alan echo ten mite
! NUMS =  0   1    2    3    4    5    6    7    8    9    A    B     C    D    E   F
! RNUMS = F   E    D    C    B    A    9    8    7    6    5    4     3    2    1   0
  NUM/LIBS = $(join $(NUMS),$(LIBS:%=/%))
  RNUM/LIBS = $(join $(RNUMS),$(LIBS:%=/%))
--- 96,105 ----
  ## {R}NUM/LIBS: used for craziness below
  ##
! #LIBS = air hest biff nrrd ell unrrdu dye moss gage bane limn hoover alan echo ten mite
! #NUMS =  0   1    2    3    4    5    6    7    8    9    A    B     C    D    E   F
! #RNUMS = F   E    D    C    B    A    9    8    7    6    5    4     3    2    1   0
! LIBS = air hest biff nrrd ell unrrdu dye moss gage bane limn hoover alan echo ten
! NUMS =  0   1    2    3    4    5    6    7    8    9    A    B     C    D    E  
! RNUMS = F   E    D    C    B    A    9    8    7    6    5    4     3    2    1  
  NUM/LIBS = $(join $(NUMS),$(LIBS:%=/%))
  RNUM/LIBS = $(join $(RNUMS),$(LIBS:%=/%))