[Teem-commit] teem/src/ten privateTen.h,NONE,1.1 GNUmakefile,1.33,1.34 aniso.c,1.23,1.24 bimod.c,1.4

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/teem/teem/src/ten
In directory sc8-pr-cvs1:/tmp/cvs-serv25421

Modified Files:
	GNUmakefile aniso.c bimod.c chan.c defaultsTen.c enumsTen.c 
	epireg.c fiber.c fiberMethods.c glyph.c miscTen.c mod.c 
	tenGage.c tendAnhist.c tendAnplot.c tendAnscale.c tendAnvol.c 
	tendBmat.c tendCalc.c tendEllipse.c tendEpireg.c tendEstim.c 
	tendEval.c tendEvaladd.c tendEvalclamp.c tendEvalpow.c 
	tendEvec.c tendEvecrgb.c tendEvq.c tendExpand.c tendFiber.c 
	tendFlotsam.c tendGlyph.c tendMake.c tendNorm.c tendPoint.c 
	tendSatin.c tendShrink.c tendSim.c tendSlice.c tendSten.c 
	tensor.c 
Added Files:
	privateTen.h 
Removed Files:
	tenPrivate.h 
Log Message:
FILE RENAME: tenPrivate.h --> privateTen.h

--- NEW FILE: privateTen.h ---
/*
  teem: Gordon Kindlmann's research software
  Copyright (C) 2003, 2002, 2001, 2000, 1999, 1998 University of Utah

  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
  version 2.1 of the License, or (at your option) any later version.

  This library is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.

  You should have received a copy of the GNU Lesser General Public
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
*/

#ifndef TEN_PRIVATE_HAS_BEEN_INCLUDED
#define TEN_PRIVATE_HAS_BEEN_INCLUDED

#ifdef __cplusplus
extern "C" {
#endif

#define TEND_CMD(name, info) \
unrrduCmd tend_##name##Cmd = { #name, info, tend_##name##Main }

/* USAGE, PARSE: both copied verbatim from unrrdu/privateUnrrdu.h */

#define USAGE(info) \
  if (!argc) { \
    hestInfo(stderr, me, (info), hparm); \
    hestUsage(stderr, hopt, me, hparm); \
    hestGlossary(stderr, hopt, hparm); \
    airMopError(mop); \
    return 2; \
  }

#define PARSE() \
  if ((pret=hestParse(hopt, argc, argv, &perr, hparm))) { \
    if (1 == pret) { \
      fprintf(stderr, "%s: %s\n", me, perr); free(perr); \
      hestUsage(stderr, hopt, me, hparm); \
      airMopError(mop); \
      return 2; \
    } else { \
      /* ... like tears ... in rain. Time ... to die. */ \
      exit(1); \
    } \
  }

#ifdef __cplusplus
}
#endif

#endif /* TEN_PRIVATE_HAS_BEEN_INCLUDED */

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/GNUmakefile,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** GNUmakefile	16 Oct 2003 20:33:54 -0000	1.33
--- GNUmakefile	8 Dec 2003 23:19:02 -0000	1.34
***************
*** 46,50 ****
  $(L).NEED = echo limn gage dye unrrdu ell nrrd biff air
  $(L).PUBLIC_HEADERS = ten.h tenMacros.h
! $(L).PRIVATE_HEADERS = tenPrivate.h
  $(L).OBJS = tensor.o chan.o aniso.o glyph.o enumsTen.o miscTen.o mod.o \
  	tenGage.o fiberMethods.o fiber.o epireg.o defaultsTen.o bimod.o \
--- 46,50 ----
  $(L).NEED = echo limn gage dye unrrdu ell nrrd biff air
  $(L).PUBLIC_HEADERS = ten.h tenMacros.h
! $(L).PRIVATE_HEADERS = privateTen.h
  $(L).OBJS = tensor.o chan.o aniso.o glyph.o enumsTen.o miscTen.o mod.o \
  	tenGage.o fiberMethods.o fiber.o epireg.o defaultsTen.o bimod.o \

Index: aniso.c
===================================================================
RCS file: /cvsroot/teem/teem/src/ten/aniso.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** aniso.c	13 Oct 2003 13:18:45 -0000	1.23
--- aniso.c	8 Dec 2003 23:19:02 -0000	1.24
***************
*** 18,24 ****
  */

- 
  #include "ten.h"
! #include "tenPrivate.h"

  float tenAnisoSigma = 0.000001;
--- 18,23 ----
  */