From: <kin...@us...> - 2010-02-12 05:56:39
|
Revision: 4561 http://teem.svn.sourceforge.net/teem/?rev=4561&view=rev Author: kindlmann Date: 2010-02-12 05:56:29 +0000 (Fri, 12 Feb 2010) Log Message: ----------- removing debugging Modified Paths: -------------- teem/trunk/src/nrrd/TODO.txt teem/trunk/src/nrrd/filt.c teem/trunk/src/nrrd/subset.c Modified: teem/trunk/src/nrrd/TODO.txt =================================================================== --- teem/trunk/src/nrrd/TODO.txt 2010-02-12 05:54:54 UTC (rev 4560) +++ teem/trunk/src/nrrd/TODO.txt 2010-02-12 05:56:29 UTC (rev 4561) @@ -1,4 +1,7 @@ +unu dist -i dist-prob.nrrd -th 0.5 -o d.nrrd +will segfault if the hack check isn't turned on; fix this + get back verbose IO messages about fread-vs-directIO call fflush(file) before airDioTest() ? Modified: teem/trunk/src/nrrd/filt.c =================================================================== --- teem/trunk/src/nrrd/filt.c 2010-02-12 05:54:54 UTC (rev 4560) +++ teem/trunk/src/nrrd/filt.c 2010-02-12 05:56:29 UTC (rev 4561) @@ -461,7 +461,7 @@ distanceL2Sqrd1D(double *dd, const double *ff, double *zz, unsigned int *vv, size_t len, double spc) { - unsigned int kk, qq; + size_t kk, qq; if (!( dd && ff && zz && vv && len > 0 )) { /* error */ @@ -475,7 +475,10 @@ for (qq=1; qq<len; qq++) { double ss; ss = intx(qq, ff[qq], vv[kk], ff[vv[kk]], spc); - while (ss <= zz[kk]) { + /* while (ss <= zz[kk]) { + ** HEY this can have kk going to -1 and into memory errors! + */ + while (ss <= zz[kk] && kk) { kk--; ss = intx(qq, ff[qq], vv[kk], ff[vv[kk]], spc); } Modified: teem/trunk/src/nrrd/subset.c =================================================================== --- teem/trunk/src/nrrd/subset.c 2010-02-12 05:54:54 UTC (rev 4560) +++ teem/trunk/src/nrrd/subset.c 2010-02-12 05:56:29 UTC (rev 4561) @@ -457,8 +457,6 @@ if (aa < saxi) { stride *= nin->axis[aa].size; } - fprintf(stderr, "!%s: slice axis[%u].size = %u\n", me, - bb, AIR_CAST(unsigned int, nslice->axis[bb].size)); bb++; } else { axmap[aa] = -1; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |