|
From: <kin...@us...> - 2004-02-27 16:51:54
|
Update of /cvsroot/teem/teem/src/mite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20918/mite Modified Files: txf.c Log Message: starting to expand number of quantized normal schemes Index: txf.c =================================================================== RCS file: /cvsroot/teem/teem/src/mite/txf.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** txf.c 26 Feb 2004 18:41:14 -0000 1.15 --- txf.c 27 Feb 2004 16:43:04 -0000 1.16 *************** *** 203,216 **** } for (axi=1; axi<ntxf->dim; axi++) { - if (!( AIR_EXISTS(ntxf->axis[axi].min) && - AIR_EXISTS(ntxf->axis[axi].max) )) { - sprintf(err, "%s: min and max of axis %d aren't both set", me, axi); - biffAdd(MITE, err); return 1; - } - if (!( ntxf->axis[axi].min < ntxf->axis[axi].max )) { - sprintf(err, "%s: min (%g) not less than max (%g) on axis %d", - me, ntxf->axis[axi].min, ntxf->axis[axi].max, axi); - biffAdd(MITE, err); return 1; - } if (1 == ntxf->axis[axi].size) { sprintf(err, "%s: # samples on axis %d must be > 1", me, axi); --- 203,206 ---- *************** *** 245,248 **** --- 235,249 ---- biffAdd(MITE, err); return 1; } + } else { + if (!( AIR_EXISTS(ntxf->axis[axi].min) && + AIR_EXISTS(ntxf->axis[axi].max) )) { + sprintf(err, "%s: min and max of axis %d aren't both set", me, axi); + biffAdd(MITE, err); return 1; + } + if (!( ntxf->axis[axi].min < ntxf->axis[axi].max )) { + sprintf(err, "%s: min (%g) not less than max (%g) on axis %d", + me, ntxf->axis[axi].min, ntxf->axis[axi].max, axi); + biffAdd(MITE, err); return 1; + } } } |