Menu
▾
▴
[Teem-commit] SF.net SVN: teem:[7117] teem/trunk/src
|
From: <kin...@us...> - 2023-07-16 02:29:29
|
Revision: 7117
http://sourceforge.net/p/teem/code/7117
Author: kindlmann
Date: 2023-07-16 02:29:25 +0000 (Sun, 16 Jul 2023)
Log Message:
-----------
use of new AIR_SIZE_T(_) == AIR_CAST(size_t, _), and some over-due clang-format-ing
Modified Paths:
--------------
teem/trunk/src/alan/coreAlan.c
teem/trunk/src/bane/gkmsFlotsam.c
teem/trunk/src/bane/gkmsPvg.c
teem/trunk/src/bane/gkmsTxf.c
teem/trunk/src/bane/hvol.c
teem/trunk/src/bane/inc.c
teem/trunk/src/bane/trnsf.c
teem/trunk/src/bin/emap.c
teem/trunk/src/bin/gprobe.c
teem/trunk/src/bin/mrender.c
teem/trunk/src/bin/pprobe.c
teem/trunk/src/bin/puller-with-Deft.c
teem/trunk/src/bin/qbert.c
teem/trunk/src/bin/vprobe.c
teem/trunk/src/dye/test/mchist.c
teem/trunk/src/echo/renderEcho.c
teem/trunk/src/gage/optimsig.c
teem/trunk/src/gage/st.c
teem/trunk/src/gage/test/genoptsig.c
teem/trunk/src/gage/test/tplot.c
teem/trunk/src/limn/cam.c
teem/trunk/src/limn/envmap.c
teem/trunk/src/limn/polydata.c
teem/trunk/src/limn/polyfilter.c
teem/trunk/src/limn/polymod.c
teem/trunk/src/limn/qn.c
teem/trunk/src/limn/splineMethods.c
teem/trunk/src/make/darwin.mk
teem/trunk/src/meet/test/strace.c
teem/trunk/src/mite/ray.c
teem/trunk/src/mite/renderMite.c
teem/trunk/src/moss/methodsMoss.c
teem/trunk/src/pull/ccPull.c
teem/trunk/src/pull/contextPull.c
teem/trunk/src/pull/corePull.c
teem/trunk/src/pull/pointPull.c
teem/trunk/src/pull/test/circ.c
teem/trunk/src/pull/trace.c
teem/trunk/src/push/action.c
teem/trunk/src/seek/updateSeek.c
teem/trunk/src/ten/aniso.c
teem/trunk/src/ten/bimod.c
teem/trunk/src/ten/chan.c
teem/trunk/src/ten/epireg.c
teem/trunk/src/ten/estimate.c
teem/trunk/src/ten/fiber.c
teem/trunk/src/ten/grads.c
teem/trunk/src/ten/path.c
teem/trunk/src/ten/tendEval.c
teem/trunk/src/ten/tendEvec.c
teem/trunk/src/ten/tendHelix.c
teem/trunk/src/ten/tendSatin.c
teem/trunk/src/ten/tensor.c
teem/trunk/src/ten/test/csim.c
teem/trunk/src/ten/test/odf-hist.c
teem/trunk/src/ten/test/rotedge.c
teem/trunk/src/ten/test/tg.c
teem/trunk/src/ten/test/tt.c
teem/trunk/src/unrrdu/crop.c
teem/trunk/src/unrrdu/ninspect.c
teem/trunk/src/unrrdu/resample.c
teem/trunk/src/unrrdu/vidicon.c
Modified: teem/trunk/src/alan/coreAlan.c
===================================================================
--- teem/trunk/src/alan/coreAlan.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/alan/coreAlan.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -73,23 +73,19 @@
actx->_nlev[1] = nrrdNew();
actx->nparm = nrrdNew();
if (2 == actx->dim) {
- ret = (nrrdMaybeAlloc_va(actx->_nlev[0], alan_nt, 3, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, actx->size[0]),
- AIR_CAST(size_t, actx->size[1]))
+ ret = (nrrdMaybeAlloc_va(actx->_nlev[0], alan_nt, 3, AIR_SIZE_T(2),
+ AIR_SIZE_T(actx->size[0]), AIR_SIZE_T(actx->size[1]))
|| nrrdCopy(actx->_nlev[1], actx->_nlev[0])
- || nrrdMaybeAlloc_va(actx->nparm, alan_nt, 3, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, actx->size[0]),
- AIR_CAST(size_t, actx->size[1])));
+ || nrrdMaybeAlloc_va(actx->nparm, alan_nt, 3, AIR_SIZE_T(3),
+ AIR_SIZE_T(actx->size[0]), AIR_SIZE_T(actx->size[1])));
} else {
- ret = (nrrdMaybeAlloc_va(actx->_nlev[0], alan_nt, 4, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, actx->size[0]),
- AIR_CAST(size_t, actx->size[1]),
- AIR_CAST(size_t, actx->size[2]))
+ ret = (nrrdMaybeAlloc_va(actx->_nlev[0], alan_nt, 4, AIR_SIZE_T(2),
+ AIR_SIZE_T(actx->size[0]), AIR_SIZE_T(actx->size[1]),
+ AIR_SIZE_T(actx->size[2]))
|| nrrdCopy(actx->_nlev[1], actx->_nlev[0])
- || nrrdMaybeAlloc_va(actx->nparm, alan_nt, 4, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, actx->size[0]),
- AIR_CAST(size_t, actx->size[1]),
- AIR_CAST(size_t, actx->size[2])));
+ || nrrdMaybeAlloc_va(actx->nparm, alan_nt, 4, AIR_SIZE_T(3),
+ AIR_SIZE_T(actx->size[0]), AIR_SIZE_T(actx->size[1]),
+ AIR_SIZE_T(actx->size[2])));
}
if (ret) {
biffMovef(ALAN, NRRD, "%s: trouble allocating buffers", me);
Modified: teem/trunk/src/bane/gkmsFlotsam.c
===================================================================
--- teem/trunk/src/bane/gkmsFlotsam.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/gkmsFlotsam.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -106,8 +106,7 @@
airMopAdd(mop, *nrrdP = nrrdNew(), (airMopper)nrrdNuke, airMopOnError);
if (4 == sscanf(str, "%g,%g,%g,%g", &shape, &width, ¢, &alpha)) {
/* its a valid BEF specification, we make the nrrd ourselves */
- if (nrrdMaybeAlloc_va(*nrrdP, nrrdTypeFloat, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, 6))) {
+ if (nrrdMaybeAlloc_va(*nrrdP, nrrdTypeFloat, 2, AIR_SIZE_T(2), AIR_SIZE_T(6))) {
airMopAdd(mop, nerr = biffGetDone(NRRD), airFree, airMopOnError);
airStrcpy(err, AIR_STRLEN_HUGE + 1, nerr);
airMopError(mop);
Modified: teem/trunk/src/bane/gkmsPvg.c
===================================================================
--- teem/trunk/src/bane/gkmsPvg.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/gkmsPvg.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -61,8 +61,8 @@
Nrrd *ret;
float *data;
- if (nrrdMaybeAlloc_va(ret = nrrdNew(), nrrdTypeFloat, 2, AIR_CAST(size_t, 4),
- AIR_CAST(size_t, 23))) {
+ if (nrrdMaybeAlloc_va(ret = nrrdNew(), nrrdTypeFloat, 2, AIR_SIZE_T(4),
+ AIR_SIZE_T(23))) {
biffAddf(BANE, "%s: can't create output", me);
return NULL;
}
Modified: teem/trunk/src/bane/gkmsTxf.c
===================================================================
--- teem/trunk/src/bane/gkmsTxf.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/gkmsTxf.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -77,8 +77,8 @@
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
E = 0;
if (!E)
- E |= nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3, AIR_CAST(size_t, 1),
- AIR_CAST(size_t, res[0]), AIR_CAST(size_t, res[1]));
+ E |= nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3, AIR_SIZE_T(1), AIR_SIZE_T(res[0]),
+ AIR_SIZE_T(res[1]));
if (!E) E |= !(nout->axis[0].label = airStrdup("A"));
if (!E) E |= !(nout->axis[1].label = airStrdup("gage(scalar:v)"));
if (!E)
Modified: teem/trunk/src/bane/hvol.c
===================================================================
--- teem/trunk/src/bane/hvol.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/hvol.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -133,9 +133,8 @@
incPass[0], incPass[1], incPass[2]);
*/
if (hvp->makeMeasrVol && !hvp->measrVol) {
- if (nrrdMaybeAlloc_va(hvp->measrVol = nrrdNew(), nrrdTypeFloat, 4,
- AIR_CAST(size_t, 3), AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy), AIR_CAST(size_t, sz))) {
+ if (nrrdMaybeAlloc_va(hvp->measrVol = nrrdNew(), nrrdTypeFloat, 4, AIR_SIZE_T(3),
+ AIR_SIZE_T(sx), AIR_SIZE_T(sy), AIR_SIZE_T(sz))) {
biffMovef(BANE, NRRD, "%s: couldn't allocate 3x%dx%dx%d VGH volume", me, sx, sy,
sz);
return 1;
@@ -177,9 +176,8 @@
}
if (inc[0]->process[1] || inc[1]->process[1] || inc[2]->process[1]) {
if (hvp->makeMeasrVol && !hvp->measrVol) {
- if (nrrdMaybeAlloc_va(hvp->measrVol = nrrdNew(), nrrdTypeFloat, 4,
- AIR_CAST(size_t, 3), AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy), AIR_CAST(size_t, sz))) {
+ if (nrrdMaybeAlloc_va(hvp->measrVol = nrrdNew(), nrrdTypeFloat, 4, AIR_SIZE_T(3),
+ AIR_SIZE_T(sx), AIR_SIZE_T(sy), AIR_SIZE_T(sz))) {
biffMovef(BANE, NRRD, "%s: couldn't allocate 3x%dx%dx%d VGH volume", me, sx, sy,
sz);
return 1;
@@ -347,8 +345,8 @@
shx = hvp->axis[0].res;
shy = hvp->axis[1].res;
shz = hvp->axis[2].res;
- if (nrrdMaybeAlloc_va(rawhvol = nrrdNew(), nrrdTypeInt, 3, AIR_CAST(size_t, shx),
- AIR_CAST(size_t, shy), AIR_CAST(size_t, shz))) {
+ if (nrrdMaybeAlloc_va(rawhvol = nrrdNew(), nrrdTypeInt, 3, AIR_SIZE_T(shx),
+ AIR_SIZE_T(shy), AIR_SIZE_T(shz))) {
biffMovef(BANE, NRRD, "%s: couldn't allocate raw histovol (%dx%dx%d)", me, shx, shy,
shz);
airMopError(mop);
@@ -407,8 +405,8 @@
fprintf(stderr, "%s: creating 8-bit histogram volume ... ", me);
fflush(stderr);
}
- if (nrrdMaybeAlloc_va(hvol, nrrdTypeUChar, 3, AIR_CAST(size_t, shx),
- AIR_CAST(size_t, shy), AIR_CAST(size_t, shz))) {
+ if (nrrdMaybeAlloc_va(hvol, nrrdTypeUChar, 3, AIR_SIZE_T(shx), AIR_SIZE_T(shy),
+ AIR_SIZE_T(shz))) {
biffMovef(BANE, NRRD, "%s: couldn't alloc finished histovol", me);
airMopError(mop);
return 1;
@@ -500,9 +498,9 @@
msr = baneMeasr[measr];
if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3,
- AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy),
- AIR_CAST(size_t, sz))) {
+ AIR_SIZE_T(sx),
+ AIR_SIZE_T(sy),
+ AIR_SIZE_T(sz))) {
biffMovef(BANE, NRRD, "%s: couldn't alloc output nrrd", me);
return 1;
}
Modified: teem/trunk/src/bane/inc.c
===================================================================
--- teem/trunk/src/bane/inc.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/inc.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -314,7 +314,7 @@
return NULL;
}
inc->parm[0] = parm[0]; /* size of histogram */
- if (nrrdMaybeAlloc_va(inc->nhist, nrrdTypeInt, 1, AIR_CAST(size_t, parm[0]))) {
+ if (nrrdMaybeAlloc_va(inc->nhist, nrrdTypeInt, 1, AIR_SIZE_T(parm[0]))) {
biffMovef(BANE, NRRD, "%s: couldn't allocate histogram", me);
baneIncNix(inc);
return NULL;
Modified: teem/trunk/src/bane/trnsf.c
===================================================================
--- teem/trunk/src/bane/trnsf.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bane/trnsf.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -52,8 +52,7 @@
}
if (1 == dim) {
len = AIR_INT(hvol->axis[2].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(info, nrrdTypeFloat, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, len))) {
+ if (nrrdMaybeAlloc_va(info, nrrdTypeFloat, 2, AIR_SIZE_T(2), AIR_SIZE_T(len))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -97,8 +96,8 @@
/* hvol axes: 0: grad, 1: 2nd deriv: 2: data value */
sv = AIR_INT(hvol->axis[2].size); /* HEY should be unsigned */
sg = AIR_INT(hvol->axis[0].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(info, nrrdTypeFloat, 3, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, sv), AIR_CAST(size_t, sg))) {
+ if (nrrdMaybeAlloc_va(info, nrrdTypeFloat, 3, AIR_SIZE_T(2), AIR_SIZE_T(sv),
+ AIR_SIZE_T(sg))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -167,8 +166,7 @@
return 1;
}
- if (nrrdMaybeAlloc_va(info1D, nrrdTypeFloat, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, len))) {
+ if (nrrdMaybeAlloc_va(info1D, nrrdTypeFloat, 2, AIR_SIZE_T(2), AIR_SIZE_T(len))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -268,7 +266,7 @@
d = info->dim - 1;
if (1 == d) {
len = AIR_INT(info->axis[1].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(pos, nrrdTypeFloat, 1, AIR_CAST(size_t, len))) {
+ if (nrrdMaybeAlloc_va(pos, nrrdTypeFloat, 1, AIR_SIZE_T(len))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -291,8 +289,7 @@
/* 2 == d */
sv = AIR_INT(info->axis[1].size); /* HEY should be unsigned */
sg = AIR_INT(info->axis[2].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(pos, nrrdTypeFloat, 2, AIR_CAST(size_t, sv),
- AIR_CAST(size_t, sg))) {
+ if (nrrdMaybeAlloc_va(pos, nrrdTypeFloat, 2, AIR_SIZE_T(sv), AIR_SIZE_T(sg))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -423,7 +420,7 @@
dim = pos->dim;
if (1 == dim) {
len = AIR_INT(pos->axis[0].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(opac, nrrdTypeFloat, 1, AIR_CAST(size_t, len))) {
+ if (nrrdMaybeAlloc_va(opac, nrrdTypeFloat, 1, AIR_SIZE_T(len))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
@@ -437,8 +434,7 @@
} else {
sv = AIR_INT(pos->axis[0].size); /* HEY should be unsigned */
sg = AIR_INT(pos->axis[1].size); /* HEY should be unsigned */
- if (nrrdMaybeAlloc_va(opac, nrrdTypeFloat, 2, AIR_CAST(size_t, sv),
- AIR_CAST(size_t, sg))) {
+ if (nrrdMaybeAlloc_va(opac, nrrdTypeFloat, 2, AIR_SIZE_T(sv), AIR_SIZE_T(sg))) {
biffMovef(BANE, NRRD, BIFF_NRRDALLOC, me);
return 1;
}
Modified: teem/trunk/src/bin/emap.c
===================================================================
--- teem/trunk/src/bin/emap.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/emap.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -188,8 +188,8 @@
if (airStrlen(debugS)) {
ELL_34M_EXTRACT(V2W, cam->V2W);
ndebug = nrrdNew();
- nrrdMaybeAlloc_va(ndebug, nrrdTypeFloat, 3, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, 1024), AIR_CAST(size_t, 512));
+ nrrdMaybeAlloc_va(ndebug, nrrdTypeFloat, 3, AIR_SIZE_T(3), AIR_SIZE_T(1024),
+ AIR_SIZE_T(512));
airMopAdd(mop, ndebug, (airMopper)nrrdNuke, airMopAlways);
debug = (float *)ndebug->data;
for (vi = 0; vi <= 511; vi++) {
Modified: teem/trunk/src/bin/gprobe.c
===================================================================
--- teem/trunk/src/bin/gprobe.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/gprobe.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -666,8 +666,7 @@
nout = nrrdNew();
airMopAdd(mop, nout, AIR_CAST(airMopper, nrrdNuke), airMopAlways);
if (nrrdConvert(npos, _npos, nrrdTypeDouble)
- || nrrdMaybeAlloc_va(nout, otype, 2, AIR_CAST(size_t, ansLen),
- AIR_CAST(size_t, NN))) {
+ || nrrdMaybeAlloc_va(nout, otype, 2, AIR_SIZE_T(ansLen), AIR_SIZE_T(NN))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble with npos or nout:\n%s\n", me, err);
airMopError(mop);
@@ -733,9 +732,9 @@
dsix = AIR_CAST(double, six);
dsiy = AIR_CAST(double, siy);
dsiz = AIR_CAST(double, siz);
- sox = AIR_CAST(size_t, scale[0] * dsix);
- soy = AIR_CAST(size_t, scale[1] * dsiy);
- soz = AIR_CAST(size_t, scale[2] * dsiz);
+ sox = AIR_SIZE_T(scale[0] * dsix);
+ soy = AIR_SIZE_T(scale[1] * dsiy);
+ soz = AIR_SIZE_T(scale[2] * dsiz);
dsox = AIR_CAST(double, sox);
dsoy = AIR_CAST(double, soy);
dsoz = AIR_CAST(double, soz);
Modified: teem/trunk/src/bin/mrender.c
===================================================================
--- teem/trunk/src/bin/mrender.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/mrender.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -197,8 +197,8 @@
fprintf(stderr, "%s: kernel support = %d^3 samples\n", me, 2 * uu->gctx0->radius);
if (nrrdMaybeAlloc_va((*rrP)->nout = nrrdNew(), nrrdTypeDouble, 2,
- AIR_CAST(size_t, uu->hctx->imgSize[0]),
- AIR_CAST(size_t, uu->hctx->imgSize[1]))) {
+ AIR_SIZE_T(uu->hctx->imgSize[0]),
+ AIR_SIZE_T(uu->hctx->imgSize[1]))) {
biffMovef(MREND, NRRD, "%s: nrrd trouble", me);
return 1;
}
Modified: teem/trunk/src/bin/pprobe.c
===================================================================
--- teem/trunk/src/bin/pprobe.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/pprobe.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -290,10 +290,10 @@
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
if (1 == ansLen) {
- E = nrrdAlloc_va(nout, nrrdTypeDouble, 1, AIR_CAST(size_t, lpld->xyzwNum));
+ E = nrrdAlloc_va(nout, nrrdTypeDouble, 1, AIR_SIZE_T(lpld->xyzwNum));
} else {
- E = nrrdAlloc_va(nout, nrrdTypeDouble, 2, AIR_CAST(size_t, ansLen),
- AIR_CAST(size_t, lpld->xyzwNum));
+ E = nrrdAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(ansLen),
+ AIR_SIZE_T(lpld->xyzwNum));
}
if (E) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
@@ -328,10 +328,10 @@
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
if (1 == ansLen) {
- E = nrrdAlloc_va(nout, nrrdTypeDouble, 1, AIR_CAST(size_t, lineStepNum));
+ E = nrrdAlloc_va(nout, nrrdTypeDouble, 1, AIR_SIZE_T(lineStepNum));
} else {
- E = nrrdAlloc_va(nout, nrrdTypeDouble, 2, AIR_CAST(size_t, ansLen),
- AIR_CAST(size_t, lineStepNum));
+ E = nrrdAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(ansLen),
+ AIR_SIZE_T(lineStepNum));
}
if (E) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
Modified: teem/trunk/src/bin/puller-with-Deft.c
===================================================================
--- teem/trunk/src/bin/puller-with-Deft.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/puller-with-Deft.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -267,7 +267,7 @@
AIR_UINT(bag->nPosOut->axis[1].size), first);
*/
if (first) {
- if (nrrdMaybeAlloc_va(bag->nrgb, nrrdTypeFloat, 2, AIR_CAST(size_t, 3),
+ if (nrrdMaybeAlloc_va(bag->nrgb, nrrdTypeFloat, 2, AIR_SIZE_T(3),
bag->nPosOut->axis[1].size)) {
err = biffGetDone(NRRD);
fprintf(stderr, "%s: error creating RGB:\n%s\n", me, err);
@@ -443,8 +443,8 @@
bag->ccSelect->range(0, bag->pctx->CCNum - 1);
if (bag->nccrgb->axis[1].size != bag->pctx->CCNum) {
airSrandMT(AIR_UINT(airTime()));
- if (nrrdMaybeAlloc_va(bag->nccrgb, nrrdTypeFloat, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, bag->pctx->CCNum))) {
+ if (nrrdMaybeAlloc_va(bag->nccrgb, nrrdTypeFloat, 2, AIR_SIZE_T(3),
+ AIR_SIZE_T(bag->pctx->CCNum))) {
char *err = biffGetDone(NRRD);
fprintf(stderr, "%s: problem alloc'ing cc rgb:\n%s", me, err);
free(err);
@@ -627,12 +627,11 @@
count += !!ten[0];
ten += 7;
}
- nrrdMaybeAlloc_va(nPosSel, nrrdTypeDouble, 2, AIR_CAST(size_t, 4),
- AIR_CAST(size_t, count));
+ nrrdMaybeAlloc_va(nPosSel, nrrdTypeDouble, 2, AIR_SIZE_T(4), AIR_SIZE_T(count));
posAll = AIR_CAST(double *, bag->nPosOut->data);
posSel = AIR_CAST(double *, nPosSel->data);
if (bag->nstrn) {
- nrrdMaybeAlloc_va(nStrnSel, nrrdTypeDouble, 1, AIR_CAST(size_t, count));
+ nrrdMaybeAlloc_va(nStrnSel, nrrdTypeDouble, 1, AIR_SIZE_T(count));
strnAll = AIR_CAST(double *, bag->nstrn->data);
strnSel = AIR_CAST(double *, nStrnSel->data);
} else {
Modified: teem/trunk/src/bin/qbert.c
===================================================================
--- teem/trunk/src/bin/qbert.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/qbert.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -245,9 +245,8 @@
val = gageAnswerPointer(ctx, pvl, gageSclValue);
gmag = gageAnswerPointer(ctx, pvl, gageSclGradMag);
scnd = gageAnswerPointer(ctx, pvl, gageScl2ndDD);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 4, AIR_CAST(size_t, 2 + doH),
- AIR_CAST(size_t, sz[0]), AIR_CAST(size_t, sz[1]),
- AIR_CAST(size_t, sz[2]))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 4, AIR_SIZE_T(2 + doH), AIR_SIZE_T(sz[0]),
+ AIR_SIZE_T(sz[1]), AIR_SIZE_T(sz[2]))) {
biffMovef(QBERT, NRRD, "%s: couldn't allocate floating point VG%s volume", me,
doH ? "H" : "");
airMopError(mop);
@@ -337,10 +336,10 @@
}
fprintf(stderr, "%s: using %d-bin histograms\n", me, bins);
E = 0;
- if (!E) E |= nrrdMaybeAlloc_va(nvhist, nrrdTypeInt, 1, AIR_CAST(size_t, bins));
- if (!E) E |= nrrdMaybeAlloc_va(nghist, nrrdTypeInt, 1, AIR_CAST(size_t, bins));
+ if (!E) E |= nrrdMaybeAlloc_va(nvhist, nrrdTypeInt, 1, AIR_SIZE_T(bins));
+ if (!E) E |= nrrdMaybeAlloc_va(nghist, nrrdTypeInt, 1, AIR_SIZE_T(bins));
if (doH) {
- if (!E) E |= nrrdMaybeAlloc_va(nhhist, nrrdTypeInt, 1, AIR_CAST(size_t, bins));
+ if (!E) E |= nrrdMaybeAlloc_va(nhhist, nrrdTypeInt, 1, AIR_SIZE_T(bins));
}
if (E) {
biffMovef(QBERT, NRRD, "%s: couldn't allocate %d %d-bin histograms", me, nval, bins);
@@ -455,9 +454,8 @@
fprintf(stderr, "%s: putting 2ndDD in range 1 to 169 (0.0 -> 85)\n", me);
}
- if (nrrdMaybeAlloc_va(nvgh, nrrdTypeUChar, 4, AIR_CAST(size_t, nval),
- AIR_CAST(size_t, sz[0]), AIR_CAST(size_t, sz[1]),
- AIR_CAST(size_t, sz[2]))) {
+ if (nrrdMaybeAlloc_va(nvgh, nrrdTypeUChar, 4, AIR_SIZE_T(nval), AIR_SIZE_T(sz[0]),
+ AIR_SIZE_T(sz[1]), AIR_SIZE_T(sz[2]))) {
biffMovef(QBERT, NRRD, "%s: couldn't allocate 8-bit VG%s volume", me,
doH ? "H" : "");
return 1;
Modified: teem/trunk/src/bin/vprobe.c
===================================================================
--- teem/trunk/src/bin/vprobe.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/bin/vprobe.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -336,9 +336,9 @@
dsix = AIR_CAST(double, six);
dsiy = AIR_CAST(double, siy);
dsiz = AIR_CAST(double, siz);
- sox = AIR_CAST(size_t, scale[0] * dsix);
- soy = AIR_CAST(size_t, scale[1] * dsiy);
- soz = AIR_CAST(size_t, scale[2] * dsiz);
+ sox = AIR_SIZE_T(scale[0] * dsix);
+ soy = AIR_SIZE_T(scale[1] * dsiy);
+ soz = AIR_SIZE_T(scale[2] * dsiz);
dsox = AIR_CAST(double, sox);
dsoy = AIR_CAST(double, soy);
dsoz = AIR_CAST(double, soz);
Modified: teem/trunk/src/dye/test/mchist.c
===================================================================
--- teem/trunk/src/dye/test/mchist.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/dye/test/mchist.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -19,7 +19,6 @@
Fifth Floor, Boston, MA 02110-1301 USA
*/
-
#include "../dye.h"
/*
@@ -27,9 +26,9 @@
** hist[1]: hue vs val
*/
void
-imageProc(Nrrd *nhproj[3], Nrrd *nhist[2], unsigned int sH,
- float *rgb, unsigned int size0, unsigned int sXY,
- unsigned int overSampleNum, float overSampleScale) {
+imageProc(Nrrd *nhproj[3], Nrrd *nhist[2], unsigned int sH, float *rgb,
+ unsigned int size0, unsigned int sXY, unsigned int overSampleNum,
+ float overSampleScale) {
unsigned int xyi, hi, si, vi, oi;
float rr, gg, bb, hh, ss, vv, *hist[2];
double rndA, rndB;
@@ -38,7 +37,7 @@
nrrdZeroSet(nhist[1]);
hist[0] = AIR_CAST(float *, nhist[0]->data);
hist[1] = AIR_CAST(float *, nhist[1]->data);
- for (xyi=0; xyi<sXY; xyi++) {
+ for (xyi = 0; xyi < sXY; xyi++) {
rr = AIR_CLAMP(0, rgb[0], 255);
gg = AIR_CLAMP(0, rgb[1], 255);
bb = AIR_CLAMP(0, rgb[2], 255);
@@ -49,10 +48,10 @@
si = airIndexClamp(0, ss, 1, sH);
vi = airIndexClamp(0, vv, 1, sH);
-#define UPDATE_HIST(rnd) \
- hi = airIndexClamp(0, hh + overSampleScale*(1-ss)*(rnd), 1, sH); \
- hist[0][hi + sH*si] += 1.0f/overSampleNum; \
- hist[1][hi + sH*vi] += 1.0f/overSampleNum
+#define UPDATE_HIST(rnd) \
+ hi = airIndexClamp(0, hh + overSampleScale * (1 - ss) * (rnd), 1, sH); \
+ hist[0][hi + sH * si] += 1.0f / overSampleNum; \
+ hist[1][hi + sH * vi] += 1.0f / overSampleNum
if (overSampleNum % 2 == 1) {
airNormalRand(&rndA, NULL);
@@ -59,7 +58,7 @@
UPDATE_HIST(rndA);
overSampleNum -= 1;
}
- for (oi=0; oi<overSampleNum; oi+=2) {
+ for (oi = 0; oi < overSampleNum; oi += 2) {
airNormalRand(&rndA, &rndB);
UPDATE_HIST(rndA);
UPDATE_HIST(rndB);
@@ -83,8 +82,7 @@
char **ninStr, *err, *outS, doneStr[13];
Nrrd *nin0, *nin, *nrgb, *nout, *nhist[2], *npreout, *nhproj[3];
float *rgb;
- float *out, *preout, *hist[2], maxSum,
- upSample, overSampleScale;
+ float *out, *preout, *hist[2], maxSum, upSample, overSampleScale;
unsigned int size0, sX, sY, sH, ninLen, ti, overSampleNum;
NrrdResampleContext *rsmc;
NrrdKernelSpec *ksp;
@@ -97,25 +95,23 @@
hparm->respFileEnable = AIR_TRUE;
hestOptAdd(&hopt, "i", "images", airTypeString, 1, -1, &ninStr, NULL,
"input image sequence", &ninLen, NULL, NULL);
- hestOptAdd(&hopt, "sh", "histo size", airTypeUInt, 1, 1, &sH, "500",
- "histogram size");
- hestOptAdd(&hopt, "k", "kern", airTypeOther, 1, 1, &ksp,
- "tent", "kernel for upsampling images",
- NULL, NULL, nrrdHestKernelSpec);
- hestOptAdd(&hopt, "us", "upsampling", airTypeFloat, 1, 1, &upSample,
- "1", "amount of upsampling of image");
- hestOptAdd(&hopt, "osn", "# oversmp", airTypeUInt, 1, 1, &overSampleNum,
- "1", "number of sample per (upsampled) pixel");
- hestOptAdd(&hopt, "osc", "scaling", airTypeFloat, 1, 1, &overSampleScale,
- "1", "scaling with oversampling");
- hestOptAdd(&hopt, "ms", "max sum", airTypeFloat, 1, 1, &maxSum,
- "10", "per-hue histogram summation is non-linearly and "
+ hestOptAdd(&hopt, "sh", "histo size", airTypeUInt, 1, 1, &sH, "500", "histogram size");
+ hestOptAdd(&hopt, "k", "kern", airTypeOther, 1, 1, &ksp, "tent",
+ "kernel for upsampling images", NULL, NULL, nrrdHestKernelSpec);
+ hestOptAdd(&hopt, "us", "upsampling", airTypeFloat, 1, 1, &upSample, "1",
+ "amount of upsampling of image");
+ hestOptAdd(&hopt, "osn", "# oversmp", airTypeUInt, 1, 1, &overSampleNum, "1",
+ "number of sample per (upsampled) pixel");
+ hestOptAdd(&hopt, "osc", "scaling", airTypeFloat, 1, 1, &overSampleScale, "1",
+ "scaling with oversampling");
+ hestOptAdd(&hopt, "ms", "max sum", airTypeFloat, 1, 1, &maxSum, "10",
+ "per-hue histogram summation is non-linearly and "
"asymptotically clamped to this maximum");
- hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, "-",
- "output filename", NULL);
+ hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, "-", "output filename",
+ NULL);
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, mchistInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, mchistInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
@@ -127,18 +123,17 @@
nin0 = nrrdNew();
airMopAdd(mop, nin0, (airMopper)nrrdNuke, airMopAlways);
if (nrrdLoad(nin0, ninStr[0], NULL)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't load first image:\n%s", me, err);
airMopError(mop);
return 1;
}
- if (!( (3 == nin0->axis[0].size || 4 == nin0->axis[0].size)
- && 3 == nin0->dim
- && nrrdTypeUChar == nin0->type )) {
- fprintf(stderr, "%s: 1st image not 3D (3-or-4)-by-X-by-Y %s array "
- "(got %u-D %s array)\n", me,
- airEnumStr(nrrdType, nrrdTypeUChar),
- nin0->dim,
+ if (!((3 == nin0->axis[0].size || 4 == nin0->axis[0].size) && 3 == nin0->dim
+ && nrrdTypeUChar == nin0->type)) {
+ fprintf(stderr,
+ "%s: 1st image not 3D (3-or-4)-by-X-by-Y %s array "
+ "(got %u-D %s array)\n",
+ me, airEnumStr(nrrdType, nrrdTypeUChar), nin0->dim,
airEnumStr(nrrdType, nin0->type));
airMopError(mop);
return 1;
@@ -146,8 +141,8 @@
rsmc = nrrdResampleContextNew();
airMopAdd(mop, rsmc, (airMopper)nrrdResampleContextNix, airMopAlways);
size0 = AIR_UINT(nin0->axis[0].size);
- sX = AIR_UINT(upSample*nin0->axis[1].size);
- sY = AIR_UINT(upSample*nin0->axis[2].size);
+ sX = AIR_UINT(upSample * nin0->axis[1].size);
+ sY = AIR_UINT(upSample * nin0->axis[2].size);
nrgb = nrrdNew();
airMopAdd(mop, nrgb, (airMopper)nrrdNuke, airMopAlways);
if (nrrdResampleDefaultCenterSet(rsmc, nrrdCenterCell)
@@ -154,14 +149,11 @@
|| nrrdResampleInputSet(rsmc, nin0)
|| nrrdResampleKernelSet(rsmc, 1, ksp->kernel, ksp->parm)
|| nrrdResampleKernelSet(rsmc, 2, ksp->kernel, ksp->parm)
- || nrrdResampleSamplesSet(rsmc, 1, sX)
- || nrrdResampleSamplesSet(rsmc, 2, sY)
- || nrrdResampleRangeFullSet(rsmc, 1)
- || nrrdResampleRangeFullSet(rsmc, 2)
+ || nrrdResampleSamplesSet(rsmc, 1, sX) || nrrdResampleSamplesSet(rsmc, 2, sY)
+ || nrrdResampleRangeFullSet(rsmc, 1) || nrrdResampleRangeFullSet(rsmc, 2)
|| nrrdResampleTypeOutSet(rsmc, nrrdTypeFloat)
- || nrrdResampleRenormalizeSet(rsmc, AIR_TRUE)
- || nrrdResampleExecute(rsmc, nrgb)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ || nrrdResampleRenormalizeSet(rsmc, AIR_TRUE) || nrrdResampleExecute(rsmc, nrgb)) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error resampling slice:\n%s", me, err);
airMopError(mop);
return 1;
@@ -171,13 +163,9 @@
airMopAdd(mop, nhist[0], (airMopper)nrrdNuke, airMopAlways);
nhist[1] = nrrdNew();
airMopAdd(mop, nhist[1], (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(nhist[0], nrrdTypeFloat, 2,
- AIR_CAST(size_t, sH),
- AIR_CAST(size_t, sH))
- || nrrdMaybeAlloc_va(nhist[1], nrrdTypeFloat, 2,
- AIR_CAST(size_t, sH),
- AIR_CAST(size_t, sH))) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdMaybeAlloc_va(nhist[0], nrrdTypeFloat, 2, AIR_SIZE_T(sH), AIR_SIZE_T(sH))
+ || nrrdMaybeAlloc_va(nhist[1], nrrdTypeFloat, 2, AIR_SIZE_T(sH), AIR_SIZE_T(sH))) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error allocating histos:\n%s", me, err);
airMopError(mop);
return 1;
@@ -200,60 +188,55 @@
airMopAdd(mop, nin, (airMopper)nrrdNuke, airMopAlways);
npreout = nrrdNew();
airMopAdd(mop, npreout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(npreout, nrrdTypeFloat, 3,
- AIR_CAST(size_t, 3),
- AIR_CAST(size_t, sH),
- AIR_CAST(size_t, ninLen))) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdMaybeAlloc_va(npreout, nrrdTypeFloat, 3, AIR_SIZE_T(3), AIR_SIZE_T(sH),
+ AIR_SIZE_T(ninLen))) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error allocating pre-output:\n%s", me, err);
airMopError(mop);
return 1;
}
preout = AIR_CAST(float *, npreout->data);
- for (ti=0; ti<ninLen; ti++) {
- printf("%s", airDoneStr(0, ti, ninLen, doneStr)); fflush(stdout);
+ for (ti = 0; ti < ninLen; ti++) {
+ printf("%s", airDoneStr(0, ti, ninLen, doneStr));
+ fflush(stdout);
if (nrrdLoad(nin, ninStr[ti], NULL)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't load image[%u]:\n%s", me, ti, err);
airMopError(mop);
return 1;
}
if (!nrrdSameSize(nin0, nin, AIR_TRUE)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: nin[%u] not like nin[0]:\n%s", me, ti, err);
airMopError(mop);
return 1;
}
- if (nrrdResampleInputSet(rsmc, nin)
- || nrrdResampleExecute(rsmc, nrgb)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdResampleInputSet(rsmc, nin) || nrrdResampleExecute(rsmc, nrgb)) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble resampling nin[%u]:\n%s", me, ti, err);
airMopError(mop);
return 1;
}
- if (nrrdWrap_va(nhproj[0], preout + 0*sH, nrrdTypeFloat, 1, AIR_CAST(size_t, sH)) ||
- nrrdWrap_va(nhproj[1], preout + 1*sH, nrrdTypeFloat, 1, AIR_CAST(size_t, sH)) ||
- nrrdWrap_va(nhproj[2], preout + 2*sH, nrrdTypeFloat, 1, AIR_CAST(size_t, sH))) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdWrap_va(nhproj[0], preout + 0 * sH, nrrdTypeFloat, 1, AIR_SIZE_T(sH))
+ || nrrdWrap_va(nhproj[1], preout + 1 * sH, nrrdTypeFloat, 1, AIR_SIZE_T(sH))
+ || nrrdWrap_va(nhproj[2], preout + 2 * sH, nrrdTypeFloat, 1, AIR_SIZE_T(sH))) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble wrapping output[%u]:\n%s", me, ti, err);
airMopError(mop);
return 1;
}
rgb = AIR_CAST(float *, nrgb->data);
- imageProc(nhproj, nhist, sH,
- rgb, size0, sX*sY,
- overSampleNum, overSampleScale);
- preout += 3*sH;
+ imageProc(nhproj, nhist, sH, rgb, size0, sX * sY, overSampleNum, overSampleScale);
+ preout += 3 * sH;
}
- printf("%s\n", airDoneStr(0, ti, ninLen, doneStr)); fflush(stdout);
+ printf("%s\n", airDoneStr(0, ti, ninLen, doneStr));
+ fflush(stdout);
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3,
- AIR_CAST(size_t, 3),
- AIR_CAST(size_t, sH),
- AIR_CAST(size_t, ninLen))) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeFloat, 3, AIR_SIZE_T(3), AIR_SIZE_T(sH),
+ AIR_SIZE_T(ninLen))) {
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error allocating output:\n%s", me, err);
airMopError(mop);
return 1;
@@ -260,27 +243,27 @@
}
out = AIR_CAST(float *, nout->data);
preout = AIR_CAST(float *, npreout->data);
- for (ti=0; ti<ninLen; ti++) {
+ for (ti = 0; ti < ninLen; ti++) {
unsigned int hi;
float hh, vv, ss, scl;
- for (hi=0; hi<sH; hi++) {
+ for (hi = 0; hi < sH; hi++) {
hh = (float)AIR_AFFINE(0, hi, sH, 0, 1);
- if (!preout[hi + 2*sH]) {
- ELL_3V_SET(out + 3*hi, 0, 0, 0);
+ if (!preout[hi + 2 * sH]) {
+ ELL_3V_SET(out + 3 * hi, 0, 0, 0);
} else {
- ss = preout[hi + 2*sH];
- scl = ss/(maxSum + ss);
- vv = scl*preout[hi + 1*sH];
- dyeHSVtoRGB(out + 0 + 3*hi, out + 1 + 3*hi, out + 2 + 3*hi,
- hh, preout[hi + 0*sH], vv);
+ ss = preout[hi + 2 * sH];
+ scl = ss / (maxSum + ss);
+ vv = scl * preout[hi + 1 * sH];
+ dyeHSVtoRGB(out + 0 + 3 * hi, out + 1 + 3 * hi, out + 2 + 3 * hi, hh,
+ preout[hi + 0 * sH], vv);
}
}
- out += 3*sH;
- preout += 3*sH;
+ out += 3 * sH;
+ preout += 3 * sH;
}
if (nrrdSave(outS, nout, NULL)) {
- airMopAdd(mop, err=biffGetDone(NRRD), airFree, airMopAlways);
+ airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: error saving output:\n%s", me, err);
airMopError(mop);
return 1;
Modified: teem/trunk/src/echo/renderEcho.c
===================================================================
--- teem/trunk/src/echo/renderEcho.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/echo/renderEcho.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -36,17 +36,15 @@
/* this will probably be over-written */
tstate->verbose = gstate->verbose;
tstate->threadIdx = threadIdx;
- if (nrrdMaybeAlloc_va(tstate->nperm, nrrdTypeInt, 2,
- AIR_CAST(size_t, ECHO_JITTABLE_NUM),
- AIR_CAST(size_t, parm->numSamples))) {
+ if (nrrdMaybeAlloc_va(tstate->nperm, nrrdTypeInt, 2, AIR_SIZE_T(ECHO_JITTABLE_NUM),
+ AIR_SIZE_T(parm->numSamples))) {
biffMovef(ECHO, NRRD, "%s: couldn't allocate jitter permutation array", me);
return 1;
}
nrrdAxisInfoSet_va(tstate->nperm, nrrdAxisInfoLabel, "jittable", "sample");
- if (nrrdMaybeAlloc_va(tstate->njitt, echoPos_nt, 3, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, ECHO_JITTABLE_NUM),
- AIR_CAST(size_t, parm->numSamples))) {
+ if (nrrdMaybeAlloc_va(tstate->njitt, echoPos_nt, 3, AIR_SIZE_T(2),
+ AIR_SIZE_T(ECHO_JITTABLE_NUM), AIR_SIZE_T(parm->numSamples))) {
biffMovef(ECHO, NRRD, "%s: couldn't allocate jitter array", me);
return 1;
}
@@ -424,9 +422,8 @@
gstate->scene = scene;
gstate->parm = parm;
mop = airMopNew();
- if (nrrdMaybeAlloc_va(nraw, echoCol_nt, 3, AIR_CAST(size_t, ECHO_IMG_CHANNELS),
- AIR_CAST(size_t, parm->imgResU),
- AIR_CAST(size_t, parm->imgResV))) {
+ if (nrrdMaybeAlloc_va(nraw, echoCol_nt, 3, AIR_SIZE_T(ECHO_IMG_CHANNELS),
+ AIR_SIZE_T(parm->imgResU), AIR_SIZE_T(parm->imgResV))) {
biffMovef(ECHO, NRRD, "%s: couldn't allocate output image", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/gage/optimsig.c
===================================================================
--- teem/trunk/src/gage/optimsig.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/gage/optimsig.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -369,12 +369,11 @@
oscx->nerr = nrrdNew();
oscx->ninterp = nrrdNew();
oscx->ndiff = nrrdNew();
- if (nrrdMaybeAlloc_va(oscx->nerr, nrrdTypeDouble, 1,
- AIR_CAST(size_t, oscx->trueImgNum))
- || nrrdMaybeAlloc_va(oscx->ninterp, nrrdTypeDouble, 3, AIR_CAST(size_t, oscx->sx),
- AIR_CAST(size_t, oscx->sy), AIR_CAST(size_t, oscx->sz))
- || nrrdMaybeAlloc_va(oscx->ndiff, nrrdTypeDouble, 3, AIR_CAST(size_t, oscx->sx),
- AIR_CAST(size_t, oscx->sy), AIR_CAST(size_t, oscx->sz))) {
+ if (nrrdMaybeAlloc_va(oscx->nerr, nrrdTypeDouble, 1, AIR_SIZE_T(oscx->trueImgNum))
+ || nrrdMaybeAlloc_va(oscx->ninterp, nrrdTypeDouble, 3, AIR_SIZE_T(oscx->sx),
+ AIR_SIZE_T(oscx->sy), AIR_SIZE_T(oscx->sz))
+ || nrrdMaybeAlloc_va(oscx->ndiff, nrrdTypeDouble, 3, AIR_SIZE_T(oscx->sx),
+ AIR_SIZE_T(oscx->sy), AIR_SIZE_T(oscx->sz))) {
biffMovef(GAGE, NRRD, "%s: couldn't allocate buffers", me);
return NULL;
}
@@ -435,9 +434,8 @@
}
for (ii = 0; ii < oscx->sampleNumMax; ii++) {
oscx->nsampleImg[ii] = nrrdNew();
- if (nrrdMaybeAlloc_va(oscx->nsampleImg[ii], nrrdTypeDouble, 3,
- AIR_CAST(size_t, oscx->sx), AIR_CAST(size_t, oscx->sy),
- AIR_CAST(size_t, oscx->sz))) {
+ if (nrrdMaybeAlloc_va(oscx->nsampleImg[ii], nrrdTypeDouble, 3, AIR_SIZE_T(oscx->sx),
+ AIR_SIZE_T(oscx->sy), AIR_SIZE_T(oscx->sz))) {
biffMovef(GAGE, NRRD, "%s: couldn't allocate vol[%u]", me, ii);
return NULL;
}
@@ -1191,8 +1189,8 @@
oscx->imgMeasr = imgMeasr;
oscx->allMeasr = nrrdMeasureUnknown;
oscx->convEps = AIR_NAN;
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, oscx->trueImgNum))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(2),
+ AIR_SIZE_T(oscx->trueImgNum))) {
biffMovef(GAGE, NRRD, "%s: trouble allocating output", me);
return 1;
}
@@ -1297,8 +1295,7 @@
biffAddf(GAGE, "%s: problem setting up gage", me);
return 1;
}
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, sampleNum))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(2), AIR_SIZE_T(sampleNum))) {
biffMovef(GAGE, NRRD, "%s: trouble allocating output", me);
return 1;
}
@@ -1336,9 +1333,8 @@
if (debugReconErrArr) {
Nrrd *nre = nrrdNew();
- nrrdWrap_va(nre, debugReconErr, nrrdTypeDouble, 3, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, oscx->sz * oscx->sy * oscx->sx),
- AIR_CAST(size_t, sampleNum));
+ nrrdWrap_va(nre, debugReconErr, nrrdTypeDouble, 3, AIR_SIZE_T(2),
+ AIR_SIZE_T(oscx->sz * oscx->sy * oscx->sx), AIR_SIZE_T(sampleNum));
nrrdSave(debugReconErrName, nre, NULL);
nrrdNix(nre);
}
Modified: teem/trunk/src/gage/st.c
===================================================================
--- teem/trunk/src/gage/st.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/gage/st.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -216,9 +216,8 @@
osx = AIR_INT((nin->axis[0].size) / dsmp);
osy = AIR_INT((nin->axis[1].size) / dsmp);
osz = AIR_INT((nin->axis[2].size) / dsmp);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 4, AIR_CAST(size_t, 7),
- AIR_CAST(size_t, osx), AIR_CAST(size_t, osy),
- AIR_CAST(size_t, osz))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 4, AIR_SIZE_T(7), AIR_SIZE_T(osx),
+ AIR_SIZE_T(osy), AIR_SIZE_T(osz))) {
biffAddf(GAGE, NRRD, "%s: couldn't allocate output", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/gage/test/genoptsig.c
===================================================================
--- teem/trunk/src/gage/test/genoptsig.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/gage/test/genoptsig.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -39,7 +39,8 @@
double *scalePos, *out, info[512];
Nrrd *nout;
NrrdKernelSpec *kss;
- double *plotPos; unsigned int plotPosNum;
+ double *plotPos;
+ unsigned int plotPosNum;
me = argv[0];
mop = airMopNew();
@@ -62,8 +63,7 @@
hestOptAdd(&hopt, "eps", "eps", airTypeDouble, 1, 1, &convEps, "0.0001",
"convergence threshold for optimization");
hestOptAdd(&hopt, "m", "m1 m2", airTypeEnum, 2, 2, measr, "l2 l2",
- "how to measure error across image, and across scales",
- NULL, nrrdMeasure);
+ "how to measure error across image, and across scales", NULL, nrrdMeasure);
hestOptAdd(&hopt, "p", "s0 s1", airTypeDouble, 1, -1, &plotPos, "nan nan",
"hack: don't do optimization; just plot the recon error given "
"these (two or more) samples along scale. OR, hackier hack: "
@@ -75,10 +75,9 @@
"kernel for gageKernelStack", NULL, NULL, nrrdHestKernelSpec);
hestOptAdd(&hopt, "tent", NULL, airTypeInt, 0, 0, &tentRecon, NULL,
"same hack: plot error with tent recon, not hermite");
- hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, NULL,
- "output array");
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, optsigInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestOptAdd(&hopt, "o", "nout", airTypeString, 1, 1, &outS, NULL, "output array");
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, optsigInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
@@ -85,17 +84,15 @@
nout = nrrdNew();
airMopAdd(mop, nout, AIR_CAST(airMopper, nrrdNuke), airMopAlways);
- osctx = gageOptimSigContextNew(dim, sampleNum[1],
- measrSampleNum,
- sigma[0], sigma[1],
+ osctx = gageOptimSigContextNew(dim, sampleNum[1], measrSampleNum, sigma[0], sigma[1],
cutoff);
if (!osctx) {
airMopAdd(mop, err = biffGetDone(GAGE), airFree, airMopAlways);
fprintf(stderr, "%s: trouble:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
- airMopAdd(mop, osctx, AIR_CAST(airMopper, gageOptimSigContextNix),
- airMopAlways);
+ airMopAdd(mop, osctx, AIR_CAST(airMopper, gageOptimSigContextNix), airMopAlways);
scalePos = AIR_CALLOC(sampleNum[1], double);
airMopAdd(mop, scalePos, airFree, airMopAlways);
@@ -102,32 +99,29 @@
if (1 == plotPosNum && AIR_EXISTS(plotPos[0])) {
/* hackity hack: a different kind of plotting requested */
- if (gageOptimSigErrorPlotSliding(osctx, nout,
- plotPos[0],
- measrSampleNum,
- kss, measr[0])) {
+ if (gageOptimSigErrorPlotSliding(osctx, nout, plotPos[0], measrSampleNum, kss,
+ measr[0])) {
airMopAdd(mop, err = biffGetDone(GAGE), airFree, airMopAlways);
fprintf(stderr, "%s: trouble:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
} else if (AIR_EXISTS(plotPos[0]) && AIR_EXISTS(plotPos[1])) {
/* hack: plotting requested */
- if (gageOptimSigErrorPlot(osctx, nout,
- plotPos, plotPosNum,
- kss,
- measr[0])) {
+ if (gageOptimSigErrorPlot(osctx, nout, plotPos, plotPosNum, kss, measr[0])) {
airMopAdd(mop, err = biffGetDone(GAGE), airFree, airMopAlways);
fprintf(stderr, "%s: trouble:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
} else {
/* do sample position optimization */
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2,
- AIR_CAST(size_t, sampleNum[1]+1),
- AIR_CAST(size_t, sampleNum[1]+1))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 2, AIR_SIZE_T(sampleNum[1] + 1),
+ AIR_SIZE_T(sampleNum[1] + 1))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: trouble allocating output:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
out = AIR_CAST(double *, nout->data);
/* hacky way of saving some of the computation information */
@@ -138,23 +132,23 @@
info[3] = measr[1];
info[4] = convEps;
info[5] = maxIter;
- for (ii=0; ii<sampleNum[1]+1; ii++) {
+ for (ii = 0; ii < sampleNum[1] + 1; ii++) {
out[ii] = info[ii];
}
- for (num=sampleNum[0]; num<=sampleNum[1]; num++) {
- printf("\n%s: ======= optimizing %u/%u samples (sigma %g--%g) \n\n",
- me, num, sampleNum[1]+1, sigma[0], sigma[1]);
- if (gageOptimSigCalculate(osctx, scalePos, num,
- kss, measr[0], measr[1],
- maxIter, convEps)) {
+ for (num = sampleNum[0]; num <= sampleNum[1]; num++) {
+ printf("\n%s: ======= optimizing %u/%u samples (sigma %g--%g) \n\n", me, num,
+ sampleNum[1] + 1, sigma[0], sigma[1]);
+ if (gageOptimSigCalculate(osctx, scalePos, num, kss, measr[0], measr[1], maxIter,
+ convEps)) {
airMopAdd(mop, err = biffGetDone(GAGE), airFree, airMopAlways);
fprintf(stderr, "%s: trouble:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
- for (ii=0; ii<num; ii++) {
- out[ii + (sampleNum[1]+1)*num] = scalePos[ii];
+ for (ii = 0; ii < num; ii++) {
+ out[ii + (sampleNum[1] + 1) * num] = scalePos[ii];
}
- out[sampleNum[1] + (sampleNum[1]+1)*num] = osctx->finalErr;
+ out[sampleNum[1] + (sampleNum[1] + 1) * num] = osctx->finalErr;
}
}
if (nrrdSave(outS, nout, NULL)) {
Modified: teem/trunk/src/gage/test/tplot.c
===================================================================
--- teem/trunk/src/gage/test/tplot.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/gage/test/tplot.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -49,29 +49,27 @@
"domain of plot is t, not sigma");
hestOptAdd(&hopt, "mm", "min max", airTypeDouble, 2, 2, dommm, NULL,
"range of domain to plot");
- hestOptAdd(&hopt, "n", "# samp", airTypeUInt, 1, 1, &num, NULL,
- "number of samples");
- hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &outS, NULL,
- "output volume");
- hestParseOrDie(hopt, argc-1, argv+1, hparm,
- me, tplotInfo, AIR_TRUE, AIR_TRUE, AIR_TRUE);
+ hestOptAdd(&hopt, "n", "# samp", airTypeUInt, 1, 1, &num, NULL, "number of samples");
+ hestOptAdd(&hopt, "o", "filename", airTypeString, 1, 1, &outS, NULL, "output volume");
+ hestParseOrDie(hopt, argc - 1, argv + 1, hparm, me, tplotInfo, AIR_TRUE, AIR_TRUE,
+ AIR_TRUE);
airMopAdd(mop, hopt, (airMopper)hestOptFree, airMopAlways);
airMopAdd(mop, hopt, (airMopper)hestParseFree, airMopAlways);
nout = nrrdNew();
airMopAdd(mop, nout, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 1,
- AIR_CAST(size_t, num))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 1, AIR_SIZE_T(num))) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't allocate output:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
out = AIR_CAST(double *, nout->data);
nout->axis[0].min = dommm[0];
nout->axis[0].max = dommm[1];
nout->axis[0].center = nrrdCenterNode;
- for (ii=0; ii<num; ii++) {
- dd = AIR_AFFINE(0, ii, num-1, dommm[0], dommm[1]);
+ for (ii = 0; ii < num; ii++) {
+ dd = AIR_AFFINE(0, ii, num - 1, dommm[0], dommm[1]);
out[ii] = tee ? gageTauOfTee(dd) : gageTauOfSig(dd);
}
@@ -78,7 +76,8 @@
if (nrrdSave(outS, nout, NULL)) {
airMopAdd(mop, err = biffGetDone(NRRD), airFree, airMopAlways);
fprintf(stderr, "%s: couldn't save output:\n%s", me, err);
- airMopError(mop); return 1;
+ airMopError(mop);
+ return 1;
}
airMopOkay(mop);
Modified: teem/trunk/src/limn/cam.c
===================================================================
--- teem/trunk/src/limn/cam.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/cam.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -230,7 +230,7 @@
airMopAdd(mop, ndist = nrrdNew(), (airMopper)nrrdNuke, airMopAlways);
airMopAdd(mop, nfova = nrrdNew(), (airMopper)nrrdNuke, airMopAlways);
airMopAdd(mop, ntime = nrrdNew(), (airMopper)nrrdNix, airMopAlways);
- if (nrrdWrap_va(ntime, time, nrrdTypeDouble, 1, AIR_CAST(size_t, numKeys))) {
+ if (nrrdWrap_va(ntime, time, nrrdTypeDouble, 1, AIR_SIZE_T(numKeys))) {
biffMovef(LIMN, NRRD, "%s: trouble wrapping time values", me);
airMopError(mop);
return 1;
@@ -238,18 +238,13 @@
airMopAdd(mop, nsample = nrrdNew(), (airMopper)nrrdNuke, airMopAlways);
timeType = limnSplineTypeSpecNew(limnSplineTypeTimeWarp);
airMopAdd(mop, timeType, (airMopper)limnSplineTypeSpecNix, airMopAlways);
- if (nrrdMaybeAlloc_va(nquat, nrrdTypeDouble, 2, AIR_CAST(size_t, 4),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(nfrom, nrrdTypeDouble, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(natpt, nrrdTypeDouble, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(nupvc, nrrdTypeDouble, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(ndist, nrrdTypeDouble, 2, AIR_CAST(size_t, 4),
- AIR_CAST(size_t, numKeys))
- || nrrdMaybeAlloc_va(nfova, nrrdTypeDouble, 2, AIR_CAST(size_t, 2),
- AIR_CAST(size_t, numKeys))) {
+ if (nrrdMaybeAlloc_va(nquat, nrrdTypeDouble, 2, AIR_SIZE_T(4), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(nfrom, nrrdTypeDouble, 2, AIR_SIZE_T(3), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(natpt, nrrdTypeDouble, 2, AIR_SIZE_T(3), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(nupvc, nrrdTypeDouble, 2, AIR_SIZE_T(3), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(ndist, nrrdTypeDouble, 2, AIR_SIZE_T(4), AIR_SIZE_T(numKeys))
+ || nrrdMaybeAlloc_va(nfova, nrrdTypeDouble, 2, AIR_SIZE_T(2),
+ AIR_SIZE_T(numKeys))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate buffer nrrds", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/limn/envmap.c
===================================================================
--- teem/trunk/src/limn/envmap.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/envmap.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -76,8 +76,8 @@
biffAddf(LIMN, "%s: sorry, QN method %d not implemented", me, qnMethod);
return 1;
}
- if (nrrdMaybeAlloc_va(map, nrrdTypeFloat, 3, AIR_CAST(size_t, 3), AIR_CAST(size_t, sx),
- AIR_CAST(size_t, sy))) {
+ if (nrrdMaybeAlloc_va(map, nrrdTypeFloat, 3, AIR_SIZE_T(3), AIR_SIZE_T(sx),
+ AIR_SIZE_T(sy))) {
biffMovef(LIMN, NRRD, "%s: couldn't alloc output", me);
return 1;
}
Modified: teem/trunk/src/limn/polydata.c
===================================================================
--- teem/trunk/src/limn/polydata.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/polydata.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -556,7 +556,7 @@
biffAddf(LIMN, "%s: got NULL pointer", me);
return 1;
}
- if (nrrdMaybeAlloc_va(nout, nrrdTypeUInt, 1, AIR_CAST(size_t, pld->primNum))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeUInt, 1, AIR_SIZE_T(pld->primNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate output", me);
return 1;
}
@@ -581,7 +581,7 @@
biffAddf(LIMN, "%s: got NULL pointer", me);
return 1;
}
- if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 1, AIR_CAST(size_t, pld->primNum))) {
+ if (nrrdMaybeAlloc_va(nout, nrrdTypeDouble, 1, AIR_SIZE_T(pld->primNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate output", me);
return 1;
}
Modified: teem/trunk/src/limn/polyfilter.c
===================================================================
--- teem/trunk/src/limn/polyfilter.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/polyfilter.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -65,7 +65,7 @@
return 1;
}
if (nvertmap) {
- if (nrrdMaybeAlloc_va(nvertmap, nrrdTypeUInt, 1, AIR_CAST(size_t, tubeVertNum))) {
+ if (nrrdMaybeAlloc_va(nvertmap, nrrdTypeUInt, 1, AIR_SIZE_T(tubeVertNum))) {
biffMovef(LIMN, NRRD, "%s: trouble allocating vert map", me);
return 1;
}
Modified: teem/trunk/src/limn/polymod.c
===================================================================
--- teem/trunk/src/limn/polymod.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/polymod.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -282,9 +282,8 @@
for (vertIdx = 0; vertIdx < pld->xyzwNum; vertIdx++) {
maxTriPerVert = AIR_MAX(maxTriPerVert, triWithVertNum[vertIdx]);
}
- if (nrrdMaybeAlloc_va(nTriWithVert, nrrdTypeUInt, 2,
- AIR_CAST(size_t, 1 + maxTriPerVert),
- AIR_CAST(size_t, pld->xyzwNum))) {
+ if (nrrdMaybeAlloc_va(nTriWithVert, nrrdTypeUInt, 2, AIR_SIZE_T(1 + maxTriPerVert),
+ AIR_SIZE_T(pld->xyzwNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate output", me);
airMopError(mop);
return 1;
@@ -331,8 +330,8 @@
}
triNum = limnPolyDataPolygonNumber(pld);
- if (nrrdMaybeAlloc_va(nVertWithTri, nrrdTypeUInt, 2, AIR_CAST(size_t, 3),
- AIR_CAST(size_t, triNum))) {
+ if (nrrdMaybeAlloc_va(nVertWithTri, nrrdTypeUInt, 2, AIR_SIZE_T(3),
+ AIR_SIZE_T(triNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate output", me);
return 1;
}
@@ -1315,7 +1314,7 @@
airMopAdd(mop, nTriMap, (airMopper)nrrdNuke, airMopAlways);
nccSize = nrrdNew();
airMopAdd(mop, nccSize, (airMopper)nrrdNuke, airMopAlways);
- if (nrrdMaybeAlloc_va(nTriMap, nrrdTypeUInt, 1, AIR_CAST(size_t, realTriNum))) {
+ if (nrrdMaybeAlloc_va(nTriMap, nrrdTypeUInt, 1, AIR_SIZE_T(realTriNum))) {
biffMovef(LIMN, NRRD, "%s: couldn't allocate equivalence map", me);
airMopError(mop);
return 1;
Modified: teem/trunk/src/limn/qn.c
===================================================================
--- teem/trunk/src/limn/qn.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/qn.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -899,9 +899,8 @@
biffAddf(LIMN, "%s: got NULL pointer", me);
return 1;
}
- if (nrrdMaybeAlloc_va(nqn, nrrdTypeDouble, 4, AIR_CAST(size_t, reso),
- AIR_CAST(size_t, reso), AIR_CAST(size_t, 6),
- AIR_CAST(size_t, 2))) {
+ if (nrrdMaybeAlloc_va(nqn, nrrdTypeDouble, 4, AIR_SIZE_T(reso), AIR_SIZE_T(reso),
+ AIR_SIZE_T(6), AIR_SIZE_T(2))) {
biffMovef(LIMN, NRRD, "%s: couldn't alloc output", me);
return 1;
}
Modified: teem/trunk/src/limn/splineMethods.c
===================================================================
--- teem/trunk/src/limn/splineMethods.c 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/limn/splineMethods.c 2023-07-16 02:29:25 UTC (rev 7117)
@@ -197,8 +197,8 @@
/* now allocate the real control point information */
spline->ncpt = nrrdNew();
airMopAdd(mop, spline->ncpt, (airMopper)nrrdNuke, airMopOnError);
- if (nrrdMaybeAlloc_va(spline->ncpt, nrrdTypeDouble, 3, AIR_CAST(size_t, 1),
- AIR_CAST(size_t, 3), _ncpt->axis[0].size)) {
+ if (nrrdMaybeAlloc_va(spline->ncpt, nrrdTypeDouble, 3, AIR_SIZE_T(1), AIR_SIZE_T(3),
+ _ncpt->axis[0].size)) {
biffMovef(LIMN, NRRD, "%s: trouble allocating real control points", me);
airMopError(mop);
return NULL;
Modified: teem/trunk/src/make/darwin.mk
===================================================================
--- teem/trunk/src/make/darwin.mk 2023-07-16 02:21:56 UTC (rev 7116)
+++ teem/trunk/src/make/darwin.mk 2023-07-16 02:29:25 UTC (rev 7117)
@@ -1,24 +1,26 @@
#
# Teem: Tools to process and visualize scientific data and images
-# Copyright (C) 2009--2023 University of Chicago
-# Copyright (C) 2005--2008 Gordon Kindlmann
-# Copyright (C) 1998--2004 University of Utah
+# Copyright (C) 2008, 2007, 2006, 2005 Gordon Kindlmann
+# Copyright (C) 2004, 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 (LGPL) as published by the Free Software
-# Foundation; either version 2.1 of the License, or (at your option) any later version.
-# The terms of redistributing and/or modifying this software also include exceptions to
-# the LGPL that facilitate static linking.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# (LGPL) as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# The terms of redistributing and/or modifying this software also
+# include exceptions to the LGPL that facilitate static linking.
#
-# This library is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without...
[truncated message content] |
