Menu
▾
▴
[Teem-commit] SF.net SVN: teem:[5827] teem/trunk/src/unrrdu
|
From: <kin...@us...> - 2012-10-25 20:55:22
|
Revision: 5827
http://teem.svn.sourceforge.net/teem/?rev=5827&view=rev
Author: kindlmann
Date: 2012-10-25 20:55:11 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
no trailing whitespace
Modified Paths:
--------------
teem/trunk/src/unrrdu/1op.c
teem/trunk/src/unrrdu/2op.c
teem/trunk/src/unrrdu/3op.c
teem/trunk/src/unrrdu/GNUmakefile
teem/trunk/src/unrrdu/about.c
teem/trunk/src/unrrdu/acrop.c
teem/trunk/src/unrrdu/affine.c
teem/trunk/src/unrrdu/axdelete.c
teem/trunk/src/unrrdu/axinfo.c
teem/trunk/src/unrrdu/axinsert.c
teem/trunk/src/unrrdu/axmerge.c
teem/trunk/src/unrrdu/axsplit.c
teem/trunk/src/unrrdu/block.c
teem/trunk/src/unrrdu/ccadj.c
teem/trunk/src/unrrdu/ccfind.c
teem/trunk/src/unrrdu/ccmerge.c
teem/trunk/src/unrrdu/ccsettle.c
teem/trunk/src/unrrdu/cksum.c
teem/trunk/src/unrrdu/cmedian.c
teem/trunk/src/unrrdu/convert.c
teem/trunk/src/unrrdu/crop.c
teem/trunk/src/unrrdu/data.c
teem/trunk/src/unrrdu/dering.c
teem/trunk/src/unrrdu/dhisto.c
teem/trunk/src/unrrdu/dice.c
teem/trunk/src/unrrdu/diff.c
teem/trunk/src/unrrdu/dist.c
teem/trunk/src/unrrdu/env.c
teem/trunk/src/unrrdu/fft.c
teem/trunk/src/unrrdu/flip.c
teem/trunk/src/unrrdu/flotsam.c
teem/trunk/src/unrrdu/gamma.c
teem/trunk/src/unrrdu/head.c
teem/trunk/src/unrrdu/heq.c
teem/trunk/src/unrrdu/histax.c
teem/trunk/src/unrrdu/histo.c
teem/trunk/src/unrrdu/i2w.c
teem/trunk/src/unrrdu/imap.c
teem/trunk/src/unrrdu/inset.c
teem/trunk/src/unrrdu/jhisto.c
teem/trunk/src/unrrdu/join.c
teem/trunk/src/unrrdu/lut.c
teem/trunk/src/unrrdu/lut2.c
teem/trunk/src/unrrdu/make.c
teem/trunk/src/unrrdu/minmax.c
teem/trunk/src/unrrdu/mlut.c
teem/trunk/src/unrrdu/mrmap.c
teem/trunk/src/unrrdu/pad.c
teem/trunk/src/unrrdu/permute.c
teem/trunk/src/unrrdu/privateUnrrdu.h
teem/trunk/src/unrrdu/project.c
teem/trunk/src/unrrdu/quantize.c
teem/trunk/src/unrrdu/resample.c
teem/trunk/src/unrrdu/reshape.c
teem/trunk/src/unrrdu/rmap.c
teem/trunk/src/unrrdu/save.c
teem/trunk/src/unrrdu/shuffle.c
teem/trunk/src/unrrdu/slice.c
teem/trunk/src/unrrdu/splice.c
teem/trunk/src/unrrdu/sselect.c
teem/trunk/src/unrrdu/subst.c
teem/trunk/src/unrrdu/swap.c
teem/trunk/src/unrrdu/tile.c
teem/trunk/src/unrrdu/unblock.c
teem/trunk/src/unrrdu/unorient.c
teem/trunk/src/unrrdu/unquantize.c
teem/trunk/src/unrrdu/unrrdu.h
teem/trunk/src/unrrdu/untile.c
teem/trunk/src/unrrdu/w2i.c
Modified: teem/trunk/src/unrrdu/1op.c
===================================================================
--- teem/trunk/src/unrrdu/1op.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/1op.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Unary operation on a nrrd"
-static const char *_unrrdu_1opInfoL =
+static const char *_unrrdu_1opInfoL =
(INFO
".\n "
"* Uses nrrdArithUnaryOp");
@@ -101,7 +101,7 @@
ntmp = nin;
}
/* see note in 2op.c about the hazards of trying to be clever
- ** about minimizing the seeding of the RNG
+ ** about minimizing the seeding of the RNG
** if (nrrdUnaryOpRand == op
** || nrrdUnaryOpNormalRand == op) {
*/
@@ -125,7 +125,7 @@
}
/* if we had to create ntmp with nrrdConvert, it will be mopped,
otherwise ntmp is an alias for nin, which will also be mopped */
-
+
SAVE(out, nout, NULL);
airMopOkay(mop);
Modified: teem/trunk/src/unrrdu/2op.c
===================================================================
--- teem/trunk/src/unrrdu/2op.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/2op.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -103,7 +103,7 @@
/*
fprintf(stderr, "%s: op = %d\n", me, op);
- fprintf(stderr, "%s: in1->left = %d, in2->left = %d\n", me,
+ fprintf(stderr, "%s: in1->left = %d, in2->left = %d\n", me,
(int)(in1->left), (int)(in2->left));
*/
if (nrrdTypeDefault != type) {
@@ -157,7 +157,7 @@
airMopError(mop);
return 1;
}
-
+
SAVE(out, nout, NULL);
airMopOkay(mop);
Modified: teem/trunk/src/unrrdu/3op.c
===================================================================
--- teem/trunk/src/unrrdu/3op.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/3op.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -106,7 +106,7 @@
/*
fprintf(stderr, "%s: op = %d\n", me, op);
- fprintf(stderr, "%s: in1->left = %d, in2->left = %d\n", me,
+ fprintf(stderr, "%s: in1->left = %d, in2->left = %d\n", me,
(int)(in1->left), (int)(in2->left));
*/
if (nrrdTypeDefault != type) {
@@ -134,7 +134,7 @@
(called by hestParseFree() called be airMopOkay()) to clear up */
}
- /* HEY: will need to add handling of RNG seed (as in 1op and 2op)
+ /* HEY: will need to add handling of RNG seed (as in 1op and 2op)
if there are any 3ops involving random numbers */
if (-1 == which
@@ -146,7 +146,7 @@
airMopError(mop);
return 1;
}
-
+
SAVE(out, nout, NULL);
airMopOkay(mop);
Modified: teem/trunk/src/unrrdu/GNUmakefile
===================================================================
--- teem/trunk/src/unrrdu/GNUmakefile 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/GNUmakefile 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
#
-# Teem: Tools to process and visualize scientific data and images
+# Teem: Tools to process and visualize scientific data and images .
# Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
# Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
# Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/about.c
===================================================================
--- teem/trunk/src/unrrdu/about.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/about.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/acrop.c
===================================================================
--- teem/trunk/src/unrrdu/acrop.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/acrop.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO " Automatically crop axes based on given measure"
-static const char *_unrrdu_acropInfoL =
+static const char *_unrrdu_acropInfoL =
(INFO ". For the axes that are to be cropped, the slices perpendicular "
"to that axis are projected down to a scalar with the specified measure. "
"The resulting 1D array is analyzed by determining what portions at the "
@@ -59,8 +59,8 @@
"those that make more sense here include:\n "
"\b\bo \"max\", \"mean\", \"median\", "
"\"variance\": (self-explanatory)\n "
- "\b\bo \"stdv\": standard deviation\n "
- "\b\bo \"cov\": coefficient of variation\n "
+ "\b\bo \"stdv\": standard deviation\n "
+ "\b\bo \"cov\": coefficient of variation\n "
"\b\bo \"product\", \"sum\": product or sum of all values\n "
"\b\bo \"L1\", \"L2\", \"NL2\", \"RMS\", \"Linf\": "
"different norms.", NULL, nrrdMeasure);
@@ -71,7 +71,7 @@
"how much to offset the numerically determined cropping; "
"positive offsets means expanding the interval of kept "
"indices (less cropping)");
- hestOptAdd(&opt, "b,bounds", "filename", airTypeString, 1, 1,
+ hestOptAdd(&opt, "b,bounds", "filename", airTypeString, 1, 1,
&boundsSave, "",
"if a filename is given here, the automatically determined "
"min and max bounds for cropping are saved to this file "
@@ -91,8 +91,8 @@
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdCropAuto(nout, nin, min, max,
- axes, axesLen,
+ if (nrrdCropAuto(nout, nin, min, max,
+ axes, axesLen,
measr, frac, offset)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error cropping nrrd:\n%s", me, err);
Modified: teem/trunk/src/unrrdu/affine.c
===================================================================
--- teem/trunk/src/unrrdu/affine.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/affine.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,6 +1,6 @@
/*
- Teem: Tools to process and visualize scientific data and images
- Copyright (C) 2012, 2011, 2010, 2009, University of Chicago
+ Teem: Tools to process and visualize scientific data and images .
+ Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -125,7 +125,7 @@
minOut->val, maxOut->val, clamp);
} else {
E = nrrdArithIterAffine(nout, minIn, in, maxIn, minOut, maxOut, clamp);
- }
+ }
if (E) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error doing ternary operation:\n%s", me, err);
Modified: teem/trunk/src/unrrdu/axdelete.c
===================================================================
--- teem/trunk/src/unrrdu/axdelete.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/axdelete.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -45,7 +45,7 @@
unsigned axis;
airArray *mop;
- hestOptAdd(&opt, "a,axis", "axis", airTypeInt, 1, 1, &_axis, NULL,
+ hestOptAdd(&opt, "a,axis", "axis", airTypeInt, 1, 1, &_axis, NULL,
"dimension (axis index) of the axis to remove");
OPT_ADD_NIN(nin, "input nrrd");
OPT_ADD_NOUT(out, "output nrrd");
Modified: teem/trunk/src/unrrdu/axinfo.c
===================================================================
--- teem/trunk/src/unrrdu/axinfo.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/axinfo.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -61,7 +61,7 @@
to "" and floats/doubles to NaN are ways of compensating for
this. However, there is no analogous trick for airEnums.
hestOptAdd(&opt, "c,center", "center", airTypeEnum, 1, 1, ¢, "unknown",
- "centering of axis: \"cell\" or \"node\"",
+ "centering of axis: \"cell\" or \"node\"",
NULL, nrrdCenter);
*/
/* but this hack will do for now */
@@ -84,7 +84,7 @@
for (axi=0; axi<axesLen; axi++) {
if (!( axes[axi] < nin->dim )) {
- fprintf(stderr, "%s: axis %u not in valid range [0,%u]\n",
+ fprintf(stderr, "%s: axis %u not in valid range [0,%u]\n",
me, axes[axi], nin->dim-1);
airMopError(mop);
return 1;
@@ -98,7 +98,7 @@
airMopError(mop);
return 1;
}
-
+
for (axi=0; axi<axesLen; axi++) {
unsigned int axis;
axis = axes[axi];
Modified: teem/trunk/src/unrrdu/axinsert.c
===================================================================
--- teem/trunk/src/unrrdu/axinsert.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/axinsert.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/axmerge.c
===================================================================
--- teem/trunk/src/unrrdu/axmerge.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/axmerge.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -61,7 +61,7 @@
airMopAdd(mop, nout[0]=nrrdNew(), (airMopper)nrrdNuke, airMopAlways);
airMopAdd(mop, nout[1]=nrrdNew(), (airMopper)nrrdNuke, airMopAlways);
-
+
if (axesLen > 1) {
/* sort merge axes into ascending order */
qsort(axes, axesLen, sizeof(*axes), nrrdValCompare[nrrdTypeInt]);
@@ -80,7 +80,7 @@
}
ni = 1-ni;
}
-
+
SAVE(out, nout[1-ni], NULL);
airMopOkay(mop);
Modified: teem/trunk/src/unrrdu/axsplit.c
===================================================================
--- teem/trunk/src/unrrdu/axsplit.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/axsplit.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/block.c
===================================================================
--- teem/trunk/src/unrrdu/block.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/block.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Condense axis-0 scanlines into \"blocks\""
-static const char *_unrrdu_blockInfoL =
+static const char *_unrrdu_blockInfoL =
(INFO
". Output nrrd will be of type \"block\": the type "
"for an opaque chunk of "
@@ -46,7 +46,7 @@
airArray *mop;
int pret;
- /* if we gave a default for this, then there it would fine to have
+ /* if we gave a default for this, then there it would fine to have
no command-line arguments whatsoever, and then the user would not
know how to get the basic usage information */
hestOptAdd(&opt, "i", "nin", airTypeOther, 1, 1, &nin, NULL, "input nrrd",
Modified: teem/trunk/src/unrrdu/ccadj.c
===================================================================
--- teem/trunk/src/unrrdu/ccadj.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/ccadj.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/ccfind.c
===================================================================
--- teem/trunk/src/unrrdu/ccfind.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/ccfind.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/ccmerge.c
===================================================================
--- teem/trunk/src/unrrdu/ccmerge.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/ccmerge.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/ccsettle.c
===================================================================
--- teem/trunk/src/unrrdu/ccsettle.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/ccsettle.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/cksum.c
===================================================================
--- teem/trunk/src/unrrdu/cksum.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/cksum.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -32,7 +32,7 @@
"* Uses nrrdCRC32");
int
-unrrdu_cksumDoit(const char *me, char *inS, int endian,
+unrrdu_cksumDoit(const char *me, char *inS, int endian,
int printendian, FILE *fout) {
Nrrd *nrrd;
airArray *mop;
Modified: teem/trunk/src/unrrdu/cmedian.c
===================================================================
--- teem/trunk/src/unrrdu/cmedian.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/cmedian.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -84,7 +84,7 @@
USAGE(_unrrdu_cmedianInfoL);
PARSE();
airMopAdd(mop, opt, (airMopper)hestParseFree, airMopAlways);
-
+
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
Modified: teem/trunk/src/unrrdu/convert.c
===================================================================
--- teem/trunk/src/unrrdu/convert.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/convert.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Convert to another type (as if by cast, w/ optional clamp)"
-static const char *_unrrdu_convertInfoL =
+static const char *_unrrdu_convertInfoL =
(INFO ". By default this does not transform, scale, or intelligently "
"quantize values; it just copies them from one type to another, which "
"replicates exactly what you'd get in C when you assign from a variable "
Modified: teem/trunk/src/unrrdu/crop.c
===================================================================
--- teem/trunk/src/unrrdu/crop.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/crop.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Crop along each axis to make a smaller nrrd"
-static const char *_unrrdu_cropInfoL =
+static const char *_unrrdu_cropInfoL =
(INFO ".\n "
"* Uses nrrdCrop");
@@ -54,7 +54,7 @@
"there's also:\n "
"\b\bo m+<int> give index relative to minimum.",
maxLen);
- hestOptAdd(&opt, "b,bounds", "filename", airTypeOther, 1, 1,
+ hestOptAdd(&opt, "b,bounds", "filename", airTypeOther, 1, 1,
&_nbounds, "",
"a filename given here overrides the -min and -max "
"options (they don't need to be used) and provides the "
@@ -115,7 +115,7 @@
strcpy(stmp1, "");
}
fprintf(stderr, "%s: expected 2-D %u-by-2 array of cropping bounds, "
- "not %u-D %s%s%s%s\n", me, nin->dim, _nbounds->dim,
+ "not %u-D %s%s%s%s\n", me, nin->dim, _nbounds->dim,
airSprintSize_t(stmp2, _nbounds->axis[0].size),
_nbounds->dim >= 2 ? "-by-" : "-long",
_nbounds->dim >= 2 ? stmp1 : "",
Modified: teem/trunk/src/unrrdu/data.c
===================================================================
--- teem/trunk/src/unrrdu/data.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/data.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Print data segment of a nrrd file"
-static const char *_unrrdu_dataInfoL =
+static const char *_unrrdu_dataInfoL =
(INFO ". The value of this is to pass the data segment in isolation to a "
"stand-alone decoder, in case this Teem build lacks an optional "
"data encoding required for a given nrrd file. Caveats: "
@@ -85,7 +85,7 @@
}
car = fgetc(nio->dataFile);
#ifdef _MSC_VER
- /* needed because otherwise printing a carraige return will
+ /* needed because otherwise printing a carraige return will
automatically also produce a newline */
_setmode(_fileno(stdout), _O_BINARY);
#endif
@@ -94,7 +94,7 @@
car = fgetc(nio->dataFile);
}
airFclose(nio->dataFile);
-
+
airMopOkay(mop);
return 0;
}
Modified: teem/trunk/src/unrrdu/dering.c
===================================================================
--- teem/trunk/src/unrrdu/dering.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/dering.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -46,7 +46,7 @@
NrrdKernelSpec *rkspec, *tkspec;
/* HEY is this needed? (to display -rk and -tk kernels) */
- hparm->elideSingleOtherDefault = AIR_FALSE;
+ hparm->elideSingleOtherDefault = AIR_FALSE;
hestOptAdd(&opt, "c,center", "x y", airTypeDouble, 2, 2, center, NULL,
"center of rings, in index space of fastest two axes");
@@ -61,7 +61,7 @@
"20", "# of theta samples");
hestOptAdd(&opt, "rs,radscale", "scale", airTypeDouble, 1, 1, &radScale,
"1.0", "scaling on radius in polar transform");
- hestOptAdd(&opt, "rk,radiuskernel", "kern", airTypeOther, 1, 1, &rkspec,
+ hestOptAdd(&opt, "rk,radiuskernel", "kern", airTypeOther, 1, 1, &rkspec,
"gauss:3,4",
"kernel for high-pass filtering along radial direction",
NULL, NULL, nrrdHestKernelSpec);
@@ -94,7 +94,7 @@
USAGE(_unrrdu_deringInfoL);
PARSE();
airMopAdd(mop, opt, (airMopper)hestParseFree, airMopAlways);
-
+
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
@@ -140,7 +140,7 @@
nitback = nrrdIterNew();
airMopAdd(mop, nitback, (airMopper)nrrdIterNix, airMopAlways);
nrrdIterSetValue(nitback, backval);
-
+
ntmp = nrrdNew();
airMopAdd(mop, ntmp, (airMopper)nrrdNuke, airMopAlways);
Modified: teem/trunk/src/unrrdu/dhisto.c
===================================================================
--- teem/trunk/src/unrrdu/dhisto.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/dhisto.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Create image of 1-D value histogram"
-static const char *_unrrdu_dhistoInfoL =
+static const char *_unrrdu_dhistoInfoL =
(INFO
". With \"-nolog\", this becomes a quick & dirty way of plotting a function.\n "
"* Uses nrrdHistoDraw");
@@ -69,8 +69,8 @@
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdHistoDraw(nout, nin, size,
- nolog ? AIR_FALSE : (notick ? 2 : AIR_TRUE),
+ if (nrrdHistoDraw(nout, nin, size,
+ nolog ? AIR_FALSE : (notick ? 2 : AIR_TRUE),
max)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error drawing histogram nrrd:\n%s", me, err);
Modified: teem/trunk/src/unrrdu/dice.c
===================================================================
--- teem/trunk/src/unrrdu/dice.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/dice.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Save all slices along one axis into separate files"
-static const char *_unrrdu_diceInfoL =
+static const char *_unrrdu_diceInfoL =
(INFO
". Calls \"unu slice\" for each position "
"along the indicated axis, and saves out a different "
@@ -56,7 +56,7 @@
"001.ppm, etc. By default (not using this option), slices "
"are saved in NRRD format (or PNM or PNG where possible) "
"with shortest possible filenames.");
- /* the fact that we're using unsigned int instead of size_t is
+ /* the fact that we're using unsigned int instead of size_t is
its own kind of sanity check */
hestOptAdd(&opt, "l,limit", "max#", airTypeUInt, 1, 1, &sanity, "9999",
"a sanity check on how many slice files should be saved "
@@ -89,11 +89,11 @@
return 1;
}
size = AIR_UINT(nin->axis[axis].size);
-
+
/* HEY: this should use nrrdSaveMulti(), and if there's additional
smarts here, they should be moved into nrrdSaveMulti() */
if (airStrlen(ftmpl)) {
- if (!( _nrrdContainsPercentThisAndMore(ftmpl, 'd')
+ if (!( _nrrdContainsPercentThisAndMore(ftmpl, 'd')
|| _nrrdContainsPercentThisAndMore(ftmpl, 'u') )) {
fprintf(stderr, "%s: given filename format \"%s\" doesn't seem to "
"have the converstion specification to print an integer\n",
@@ -115,7 +115,7 @@
}
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
-
+
for (pos=0; pos<size; pos++) {
if (nrrdSlice(nout, nin, axis, pos)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
Modified: teem/trunk/src/unrrdu/diff.c
===================================================================
--- teem/trunk/src/unrrdu/diff.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/diff.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -80,7 +80,7 @@
onlyData ? "data values" : "nrrds", epsilon);
}
}
-
+
airMopOkay(mop);
return 0;
}
Modified: teem/trunk/src/unrrdu/dist.c
===================================================================
--- teem/trunk/src/unrrdu/dist.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/dist.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Euclidean distance transform"
-static const char *_unrrdu_distInfoL =
+static const char *_unrrdu_distInfoL =
(INFO
". Based on \"Distance Transforms of Sampled Functions\" by "
"Pedro F. Felzenszwalb and Daniel P. Huttenlocher, "
Modified: teem/trunk/src/unrrdu/env.c
===================================================================
--- teem/trunk/src/unrrdu/env.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/env.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "List relevant environment variables and their values"
-static const char *_unrrdu_envInfoL =
+static const char *_unrrdu_envInfoL =
(INFO
". These environment variables provide a way of "
"setting global variables that can affect"
@@ -192,7 +192,7 @@
hestInfo(out, me, _unrrdu_envInfoL, hparm);
fprintf(out, "\n");
- _hestPrintStr(out, 0, 0, hparm->columns,
+ _hestPrintStr(out, 0, 0, hparm->columns,
("Each variable in the listing below starts with the name of "
"the environment variable (\"NRRD_...\"), what type of value "
"it represents (e.g. \"int\", \"bool\"), what the "
@@ -202,7 +202,7 @@
AIR_FALSE);
fprintf(out, "\n");
- _hestPrintStr(out, 0, 0, hparm->columns,
+ _hestPrintStr(out, 0, 0, hparm->columns,
("Bool variables may be set to true simply by setting the "
"environment variable; setting the value to \"true\" or "
"\"false\" sets the bool accordingly. Enum variables may "
@@ -214,7 +214,7 @@
fprintf(out, "\n");
/* UNRRDU_QUIET_QUIT functionality implemented in privateUnrrdu.h */
- _hestPrintStr(out, 0, 0, hparm->columns,
+ _hestPrintStr(out, 0, 0, hparm->columns,
("In addition to the the \"NRRD_\" environment variables, "
"there is this one, " UNRRDU_QUIET_QUIT_ENV ", which "
"determines whether unu exits "
@@ -234,7 +234,7 @@
}
fprintf(out, "\n");
- _unrrdu_envBool(out,
+ _unrrdu_envBool(out,
nrrdEnvVarStateKeyValuePairsPropagate,
nrrdStateKeyValuePairsPropagate,
"nrrdStateKeyValuePairsPropagate",
@@ -351,7 +351,7 @@
nrrdEnvVarDefaultKernelParm0);
nrrdGetenvDouble(/**/ &nrrdDefaultSpacing,
nrrdEnvVarDefaultSpacing);
-#endif
+#endif
/* NOTE: this is an exceptional unu command that doesn't rely on
privateUnrrdu.h USAGE() macro; so we determine our own return value */
Modified: teem/trunk/src/unrrdu/fft.c
===================================================================
--- teem/trunk/src/unrrdu/fft.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/fft.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,13 +25,13 @@
#include "privateUnrrdu.h"
#define INFO "Fast Fourier Transform of selected axes"
-static const char *_unrrdu_fftInfoL_yes =
+static const char *_unrrdu_fftInfoL_yes =
(INFO
". Initial attempt at wrapping the FFTW3 library; options are "
"likely to change in Teem 2.0.\n "
"* Uses nrrdFFT");
-static const char *_unrrdu_fftInfoL_no =
+static const char *_unrrdu_fftInfoL_no =
(INFO
". This Teem has NOT been compiled with FFTW3 <http://www.fftw.org/>. "
"If it had been, "
@@ -186,7 +186,7 @@
for (axi=0; axi<axesLen; axi++) {
axes[axi]++;
}
- /* ntmp is really done with, we can free up the space now; this
+ /* ntmp is really done with, we can free up the space now; this
is one of the rare times we want airMopSub */
airMopSub(mop, ntmp, (airMopper)nrrdNuke);
nrrdNuke(ntmp);
Modified: teem/trunk/src/unrrdu/flip.c
===================================================================
--- teem/trunk/src/unrrdu/flip.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/flip.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/flotsam.c
===================================================================
--- teem/trunk/src/unrrdu/flotsam.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/flotsam.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -65,8 +65,8 @@
sprintf(buff, "--- unu: Utah Nrrd Utilities command-line interface ---");
len = AIR_UINT(strlen(buff));
- sprintf(fmt, "%%%us\n", (hparm->columns > len
- ? hparm->columns-len
+ sprintf(fmt, "%%%us\n", (hparm->columns > len
+ ? hparm->columns-len
: 0)/2 + len - 1);
fprintf(stdout, fmt, buff);
for (cmdi=0; unrrduCmdList[cmdi]; cmdi++) {
@@ -116,7 +116,7 @@
**
** It can also be m+<int> to signify some position relative to some
** "minimum", assuming that a minimum position is being specified
-** at the same time as this one. Obviously, there has to be some
+** at the same time as this one. Obviously, there has to be some
** error handling to make sure that no one is trying to define a
** minimum position with respect to itself. And, the ability to
** specify a position as "m+<int>" shouldn't be advertised in situations
@@ -247,7 +247,7 @@
/*
******** unrrduHestBitsCB
-**
+**
** for parsing an int that can be 8, 16, or 32
*/
int
@@ -293,7 +293,7 @@
char me[]="unrrduParseScale";
float *scale;
int num;
-
+
if (!(ptr && str)) {
sprintf(err, "%s: got NULL pointer", me);
return 1;
@@ -345,7 +345,7 @@
void *
unrrduMaybeFclose(void *_file) {
FILE *file;
-
+
file = (FILE *)_file;
if (stdin != file) {
file = airFclose(file);
@@ -384,7 +384,7 @@
/*
******** unrrduHestEncodingCB
-**
+**
** for parsing output encoding, including compression flags
** enc[0]: which encoding, from nrrdEncodingType* enum
** enc[1]: for compressions: zlib "level" and bzip2 "blocksize"
Modified: teem/trunk/src/unrrdu/gamma.c
===================================================================
--- teem/trunk/src/unrrdu/gamma.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/gamma.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/head.c
===================================================================
--- teem/trunk/src/unrrdu/head.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/head.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Print header of one or more nrrd files"
-static const char *_unrrdu_headInfoL =
+static const char *_unrrdu_headInfoL =
(INFO ". The value of this is simply to print the contents of nrrd "
"headers. This avoids the use of \"head -N\", where N has to be "
"determined manually, which always risks printing raw binary data "
@@ -41,7 +41,7 @@
mop = airMopNew();
if (!( fin = airFopen(inS, stdin, "rb") )) {
- biffAddf(me, "%s: couldn't fopen(\"%s\",\"rb\"): %s\n",
+ biffAddf(me, "%s: couldn't fopen(\"%s\",\"rb\"): %s\n",
me, inS, strerror(errno));
airMopError(mop); return 1;
}
@@ -56,7 +56,7 @@
airMopError(mop); return 1;
}
if (!( nrrdFormatNRRD->contentStartsLike(nio) )) {
- biffAddf(me, "%s: first line (\"%s\") isn't a nrrd magic\n",
+ biffAddf(me, "%s: first line (\"%s\") isn't a nrrd magic\n",
me, nio->line);
airMopError(mop); return 1;
}
@@ -64,7 +64,7 @@
fprintf(fout, "%s\n", nio->line);
_nrrdOneLine(&len, nio, fin);
};
-
+
/* experience has shown that on at least windows and darwin, the writing
process's fwrite() to stdout will fail if we exit without consuming
everything from stdin */
Modified: teem/trunk/src/unrrdu/heq.c
===================================================================
--- teem/trunk/src/unrrdu/heq.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/heq.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -81,7 +81,7 @@
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
-
+
if (nrrdHistoEq(nout, nin, airStrlen(mapS) ? &nmap : NULL,
bins, smart, amount)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
Modified: teem/trunk/src/unrrdu/histax.c
===================================================================
--- teem/trunk/src/unrrdu/histax.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/histax.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Replace each scanline along an axis with its histogram"
-static const char *_unrrdu_histaxInfoL =
+static const char *_unrrdu_histaxInfoL =
(INFO
".\n "
"* Uses nrrdHistoAxis");
@@ -52,7 +52,7 @@
hestOptAdd(&opt, "min,minimum", "value", airTypeString, 1, 1,
&_minStr, "nan",
"The value to map to zero, given explicitly as a regular number, "
- "*or*, if the number is given with a \"" MINMAX_PERC_SUFF
+ "*or*, if the number is given with a \"" MINMAX_PERC_SUFF
"\" suffix, this "
"minimum is specified in terms of the percentage of samples in "
"input that are lower. "
@@ -110,7 +110,7 @@
mmStr[strlen(mmStr)-strlen(MINMAX_PERC_SUFF)] = '\0';
}
if (1 != airSingleSscanf(mmStr, "%lf", mm)) {
- fprintf(stderr, "%s: couldn't parse \"%s\" as %s\n", me,
+ fprintf(stderr, "%s: couldn't parse \"%s\" as %s\n", me,
!mmIdx ? _minStr : _maxStr,
!mmIdx ? "minimum" : "maximum");
airMopError(mop);
@@ -193,8 +193,8 @@
airMopError(mop);
return 1;
}
-
+
SAVE(out, nout, NULL);
airMopOkay(mop);
Modified: teem/trunk/src/unrrdu/histo.c
===================================================================
--- teem/trunk/src/unrrdu/histo.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/histo.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Create 1-D histogram of values in a nrrd"
-static const char *_unrrdu_histoInfoL =
+static const char *_unrrdu_histoInfoL =
(INFO
". Can explicitly set bounds of histogram domain or can learn these "
"from the data.\n "
@@ -57,7 +57,7 @@
&_minStr, "nan",
"Value at low end of histogram, given explicitly as a "
"regular number, "
- "*or*, if the number is given with a \"" MINMAX_PERC_SUFF
+ "*or*, if the number is given with a \"" MINMAX_PERC_SUFF
"\" suffix, this "
"minimum is specified in terms of the percentage of samples in "
"input that are lower. "
@@ -110,7 +110,7 @@
mmStr[strlen(mmStr)-strlen(MINMAX_PERC_SUFF)] = '\0';
}
if (1 != airSingleSscanf(mmStr, "%lf", mm)) {
- fprintf(stderr, "%s: couldn't parse \"%s\" as %s\n", me,
+ fprintf(stderr, "%s: couldn't parse \"%s\" as %s\n", me,
!mmIdx ? _minStr : _maxStr,
!mmIdx ? "minimum" : "maximum");
airMopError(mop);
Modified: teem/trunk/src/unrrdu/i2w.c
===================================================================
--- teem/trunk/src/unrrdu/i2w.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/i2w.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "converts from 1-D index to world position"
-static const char *_unrrdu_i2wInfoL =
+static const char *_unrrdu_i2wInfoL =
(INFO ", given the centering of the data (cell vs. node), "
"the range of positions, and the number of intervals into "
"which position has been quantized. "
@@ -67,7 +67,7 @@
pos = NRRD_POS(center, minPos, maxPos, size, indx);
printf("%g\n", pos);
-
+
airMopOkay(mop);
return 0;
}
Modified: teem/trunk/src/unrrdu/imap.c
===================================================================
--- teem/trunk/src/unrrdu/imap.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/imap.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/inset.c
===================================================================
--- teem/trunk/src/unrrdu/inset.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/inset.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -25,7 +25,7 @@
#include "privateUnrrdu.h"
#define INFO "Replace a sub-region with a different nrrd"
-static const char *_unrrdu_insetInfoL =
+static const char *_unrrdu_insetInfoL =
(INFO ". This is functionally the opposite of \"crop\".\n "
"* Uses nrrdInset");
Modified: teem/trunk/src/unrrdu/jhisto.c
===================================================================
--- teem/trunk/src/unrrdu/jhisto.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/jhisto.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -76,7 +76,7 @@
"list of nrrds (one for each axis of joint histogram), "
"or, single nrrd that will be sliced along specified axis.",
&ninLen, NULL, nrrdHestNrrd);
- hestOptAdd(&opt, "a,axis", "axis", airTypeUInt, 1, 1, &diceax, "0",
+ hestOptAdd(&opt, "a,axis", "axis", airTypeUInt, 1, 1, &diceax, "0",
"axis to slice along when working with single nrrd. ");
OPT_ADD_NOUT(out, "output nrrd");
@@ -91,7 +91,7 @@
/* Slice a nrrd on the fly */
size_t asize;
if (!( diceax <= nin[0]->dim-1 )) {
- fprintf(stderr, "%s: slice axis %u not valid for single %u-D nrrd",
+ fprintf(stderr, "%s: slice axis %u not valid for single %u-D nrrd",
me, diceax, nin[0]->dim);
airMopError(mop);
return 1;
@@ -100,7 +100,7 @@
if (asize != binLen) {
fprintf(stderr,
"%s: size (%u) of slice axis %u != # bins given (%u)\n", me,
- AIR_CAST(unsigned int, asize), diceax,
+ AIR_CAST(unsigned int, asize), diceax,
AIR_CAST(unsigned int, binLen));
airMopError(mop);
return 1;
Modified: teem/trunk/src/unrrdu/join.c
===================================================================
--- teem/trunk/src/unrrdu/join.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/join.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
Modified: teem/trunk/src/unrrdu/lut.c
===================================================================
--- teem/trunk/src/unrrdu/lut.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/lut.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -88,7 +88,7 @@
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
/* see comment rmap.c */
- if (!( AIR_EXISTS(nlut->axis[nlut->dim - 1].min) &&
+ if (!( AIR_EXISTS(nlut->axis[nlut->dim - 1].min) &&
AIR_EXISTS(nlut->axis[nlut->dim - 1].max) )) {
rescale = AIR_TRUE;
}
Modified: teem/trunk/src/unrrdu/lut2.c
===================================================================
--- teem/trunk/src/unrrdu/lut2.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/lut2.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -94,14 +94,14 @@
if (!( nin->dim > 1 && 2 == nin->axis[0].size )) {
char stmp[AIR_STRLEN_SMALL];
fprintf(stderr, "%s: input nrrd dim must be > 1, and axis[0].size "
- "must be 2 (not %s)\n", me,
+ "must be 2 (not %s)\n", me,
airSprintSize_t(stmp, nin->axis[0].size));
airMopError(mop);
return 1;
}
mapAxis = nlut->dim - 2;
if (!(0 == mapAxis || 1 == mapAxis)) {
- fprintf(stderr, "%s: dimension of lut should be 2 or 3, not %d",
+ fprintf(stderr, "%s: dimension of lut should be 2 or 3, not %d",
me, nlut->dim);
airMopError(mop);
return 1;
@@ -109,7 +109,7 @@
/* see comment in rmap.c */
for (rai=0; rai<=1; rai++) {
- if (!( AIR_EXISTS(nlut->axis[mapAxis + rai].min) &&
+ if (!( AIR_EXISTS(nlut->axis[mapAxis + rai].min) &&
AIR_EXISTS(nlut->axis[mapAxis + rai].max) )) {
rescale[rai] = AIR_TRUE;
}
Modified: teem/trunk/src/unrrdu/make.c
===================================================================
--- teem/trunk/src/unrrdu/make.c 2012-10-25 20:48:29 UTC (rev 5826)
+++ teem/trunk/src/unrrdu/make.c 2012-10-25 20:55:11 UTC (rev 5827)
@@ -1,5 +1,5 @@
/*
- Teem: Tools to process and visualize scientific data and images
+ Teem: Tools to process and visualize scientific data and images .
Copyright (C) 2012, 2011, 2010, 2009 University of Chicago
Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
Copyright (C) 2004, 2003, 2002, 2001, 2000, 1999, 1998 University of Utah
@@ -69,7 +69,7 @@
unrrdu_makeMain(int argc, const char **argv, const char *me,
hestParm *hparm) {
hestOpt *opt = NULL;
- char *out, *outData, *err,
+ char *out, *outData, *err,
**dataFileNames, **kvp, *content, encInfo[AIR_STRLEN_LARGE];
Nrrd *nrrd;
size_t *size, bufLen;
@@ -93,7 +93,7 @@
hparm->greedySingleString = AIR_TRUE;
mop = airMopNew();
-
+
hestOptAdd(&opt, "h", NULL, airTypeBool, 0, 0, &headerOnly, NULL,
"Generate header ONLY: don't write out the whole nrrd, "
"don't even bother reading the input data, just output the "
@@ -157,11 +157,11 @@
"values within line are delimited by space, tab, or comma"
"\n \b\bo \"hex\": two hex digits per byte");
if (nrrdEncodingGzip->available()) {
- strcat(encInfo,
+ strcat(encInfo,
"\n \b\bo \"gzip\", \"gz\": gzip compressed raw data");
}
if (nrrdEncodingBzip2->available()) {
- strcat(encInfo,
+ strcat(encInfo,
"\n \b\bo \"bzip2\", \"bz2\": bzip2 compressed raw data");
}
hestOptAdd(&opt, "e,encoding", "enc", airTypeEnum, 1, 1,
@@ -304,7 +304,7 @@
/* ----------------- END ERROR CHECKING ---------------- */
/* ----------------- BEGIN SETTING INFO ---------------- */
-
+
nio = nrrdIoStateNew();
airMopAdd(mop, nio, (airMopper)nrrdIoStateNix, airMopAlways);
nrrd = nrrdNew();
@@ -339,7 +339,7 @@
}
nio->line = parseBuf;
nio->pos = 0;
- if (nrrdFieldInfoParse[nrrdField_data_file](NULL, nrrd,
+ if (nrrdFieldInfoParse[nrrdField_data_file](NULL, nrrd,
nio, AIR_TRUE)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble with formatted filename list \"%s\":\n%s",
@@ -394,12 +394,12 @@
for (ii=0; ii<kvpLen; ii++) {
/* a hack: have to use NrrdIoState->line as the channel to communicate
the key/value pair, since we have to emulate it having been
- read from a NRRD header. But because nio doesn't own the
- memory, we must be careful to unset the pointer prior to
+ read from a NRRD header. But because nio doesn't own the
+ memory, we must be careful to unset the pointer prior to
NrrdIoStateNix being called by the mop. */
nio->line = kvp[ii];
nio->pos = 0;
- if (nrrdFieldInfoParse[nrrdField_keyvalue](NULL, nrrd,
+ if (nrrdFieldInfoParse[nrrdField_keyvalue](NULL, nrrd,
nio, AIR_TRUE)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble with key/value %d \"%s\":\n%s",
@@ -452,7 +452,7 @@
}
nio->line = parseBuf;
nio->pos = 0;
- if (nrrdFieldInfoParse[nrrdField_centers](NULL, nrrd,
+ if (nrrdFieldInfoParse[nrrdField_centers](NULL, nrrd,
nio, AIR_TRUE)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble with centerings \"%s\":\n%s",
@@ -496,7 +496,7 @@
/* same hack about using NrrdIoState->line as basis for parsing */
nio->line = origStr;
nio->pos = 0;
- if (nrrdFieldInfoParse[nrrdField_space_origin](NULL, nrrd,
+ if (nrrdFieldInfoParse[nrrdField_space_origin](NULL, nrrd,
nio, AIR_TRUE)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble with origin \"%s\":\n%s",
@@ -516,7 +516,7 @@
/* same hack about using NrrdIoState->line as basis for parsing */
nio->line = dirStr;
nio->pos = 0;
- if (nrrdFieldInfoParse[nrrdField_space_directions](NULL, nrrd,
+ if (nrrdFieldInfoParse[nrrdField_space_directions](NULL, nrrd,
nio, AIR_TRUE)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble with space directions \"%s\":\n%s",
@@ -536,7 +536,7 @@
/* same hack about using NrrdIoState->line as basis for parsing */
nio->line = mframeStr;
nio->pos = 0;
- if (nrrdFieldInfoParse[nrrdField_measurement_frame](NULL, nrrd,
+ if (nrrdFieldInfoParse[nrrdField_measurement_frame](NULL, nrrd,
nio, AIR_TRUE)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble with measurement frame \"%s\":\n%s",
@@ -581,7 +581,7 @@
}
nio->line = parseBuf;
nio->pos = 0;
- if (nrrdFieldInfoParse[nrrdField_space_units](NULL, nrrd,
+ if (nrrdFieldInfoParse[nrrdField_space_units](NULL, nrrd,
nio, AIR_TRUE)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble with space units \"%s\":\n%s",
@@ -595,7 +595,7 @@
fprintf(stderr, "%s: problems with nrrd as set up:\n%s", me, err);
airMopError(mop); return 1;
}
-
+
/* -----...
[truncated message content] |