|
From: <ik...@us...> - 2003-11-10 11:02:08
|
Update of /cvsroot/teem/teem/src/nrrd
In directory sc8-pr-cvs1:/tmp/cvs-serv21237
Modified Files:
axis.c nrrd.h
Log Message:
renamed map to axmap, so that the VC6 compiler will not complain
Index: axis.c
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/axis.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** axis.c 12 Sep 2003 12:10:05 -0000 1.2
--- axis.c 10 Nov 2003 11:02:03 -0000 1.3
***************
*** 116,120 ****
*/
int
! nrrdAxisInfoCopy(Nrrd *nout, const Nrrd *nin, const int *map, int bitflag) {
int d, from;
--- 116,120 ----
*/
int
! nrrdAxisInfoCopy(Nrrd *nout, const Nrrd *nin, const int *axmap, int bitflag) {
int d, from;
***************
*** 127,136 ****
return 2;
}
! if (map) {
for (d=0; d<nout->dim; d++) {
! if (-1 == map[d]) {
continue;
}
! if (!AIR_IN_CL(0, map[d], nin->dim-1)) {
return 3;
}
--- 127,136 ----
return 2;
}
! if (axmap) {
for (d=0; d<nout->dim; d++) {
! if (-1 == axmap[d]) {
continue;
}
! if (!AIR_IN_CL(0, axmap[d], nin->dim-1)) {
return 3;
}
***************
*** 139,143 ****
for (d=0; d<nout->dim; d++) {
! from = map ? map[d] : d;
if (-1 == from) {
/* for this axis, we don't touch a thing */
--- 139,143 ----
for (d=0; d<nout->dim; d++) {
! from = axmap ? axmap[d] : d;
if (-1 == from) {
/* for this axis, we don't touch a thing */
Index: nrrd.h
===================================================================
RCS file: /cvsroot/teem/teem/src/nrrd/nrrd.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -C2 -d -r1.119 -r1.120
*** nrrd.h 30 Oct 2003 21:35:24 -0000 1.119
--- nrrd.h 10 Nov 2003 11:02:04 -0000 1.120
***************
*** 519,523 ****
/* axis.c */
extern int nrrdAxisInfoCopy(Nrrd *nout, const Nrrd *nin,
! const int *map, int bitflag);
extern void nrrdAxisInfoSet_nva(Nrrd *nin, int axInfo, const void *info);
extern void nrrdAxisInfoSet(Nrrd *nin, int axInfo,
--- 519,523 ----
/* axis.c */
extern int nrrdAxisInfoCopy(Nrrd *nout, const Nrrd *nin,
! const int *axmap, int bitflag);
extern void nrrdAxisInfoSet_nva(Nrrd *nin, int axInfo, const void *info);
extern void nrrdAxisInfoSet(Nrrd *nin, int axInfo,
|