From e5a756f63cf84d17778f6d9ae2935f204e54ce6f Mon Sep 17 00:00:00 2001
From: Mark Jenkinson <mark@fmrib.ox.ac.uk>
Date: Fri, 24 Sep 2004 10:09:08 +0000
Subject: [PATCH] Changed makefile and fixed error in avworient
---
Makefile | 7 +++++--
fslorient.cc | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index d2fb088..14c1ffc 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,9 @@ XFILES = avwcpgeom avwmerge avwnvols avwsplit \
avwinterleave_8UI avwinterleave_8SI avwinterleave_16UI avwinterleave_16SI avwinterleave_32UI avwinterleave_32SI avwinterleave_32R avwinterleave_64R \
avwroi_8UI avwroi_8SI avwroi_16UI avwroi_16SI avwroi_32UI avwroi_32SI avwroi_32R avwroi_64R \
avwfill_8UI avwfill_8SI avwfill_16UI avwfill_16SI avwfill_32UI avwfill_32SI avwfill_32R avwfill_64R \
- avwstats avwcomplex avwstats++ avwfft avwmeants avwcheck avwswapdim avwconv avwslice
+ avwstats avwcomplex avwstats++ avwfft avwmeants avwcheck avwswapdim avwconv avwslice avworient
-SCRIPTS = avwval avwchpixdim avwanimate sliceanimate avwsize avwinfo avwedithd
+SCRIPTS = avwval avwchpixdim avwanimate sliceanimate avwsize avwinfo avwedithd avwchfiletype
RUNAVWS = avw2ascii avwmaths avwcc avwroi avwfill avwinterleave
@@ -107,5 +107,8 @@ avw2ascii_8UI: avw2ascii.c
avwswapdim: avwswapdim.o
${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ avwswapdim.o ${LIBS}
+avworient: avworient.o
+ ${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ avworient.o ${LIBS}
+
avwslice: avwslice.cc
${CXX} ${CXXFLAGS} ${LDFLAGS} -o avwslice avwslice.cc ${LIBS}
diff --git a/fslorient.cc b/fslorient.cc
index c7559ae..a9148f8 100644
--- a/fslorient.cc
+++ b/fslorient.cc
@@ -77,8 +77,8 @@ int fmrib_main(int argc,char *argv[])
retval = -1;
}
- if (FslBaseFileType(FslGetFileType(volinfo))!=FSL_TYPE_ANALYZE) {
- FslSetOverrideOutputType(FslGetFileType(volinfo));
+ if (FslBaseFileType(FslGetFileType(&volinfo))!=FSL_TYPE_ANALYZE) {
+ FslSetOverrideOutputType(FslGetFileType(&volinfo));
write_volume4D(invol,filename,volinfo);
FslSetOverrideOutputType(-1); // restore to default
} else {
--
GitLab