removed volumeinfo

fslorient.cc

@@ -106,11 +106,10 @@ int fmrib_main(int argc,char *argv[])
   int retval=0;
   string option=argv[1], filename;
 
-  volumeinfo volinfo;
   volume4D<T> invol;
 
   filename=argv[argc-1];
-  read_orig_volume4D(invol,filename,volinfo);
+  read_orig_volume4D(invol,filename);
 
   if (option=="-getorient") {
     getorient(invol);
@@ -185,9 +184,9 @@ int fmrib_main(int argc,char *argv[])
 
 
   if (modified) {
-    if (FslBaseFileType(FslGetFileType(&volinfo))!=FSL_TYPE_ANALYZE) {
-      FslSetOverrideOutputType(FslGetFileType(&volinfo));
-      save_orig_volume4D(invol,filename,volinfo);
+    if (FslBaseFileType(fslFileType(filename))!=FSL_TYPE_ANALYZE) {
+      FslSetOverrideOutputType(fslFileType(filename));
+      save_orig_volume4D(invol,filename);
       FslSetOverrideOutputType(-1);  // restore to default
     } else {
       cerr << "Cannot modify orientation for Analyze files" << endl;

fslpspec.cc

@@ -60,28 +60,19 @@ int fmrib_main(int argc, char* argv[])
     outname=inname;
 
   Matrix iMat, oMat;
-  volume4D<float> vout;
+  volume4D<float> vin,vout;
   volume<float> mask;
-  volumeinfo volinfo;
-  float vinTR;
 
-  {
-    volume4D<float> vin;
-    read_volume4D(vin,argv[1],volinfo);
-
-    generate_masks(mask,stddevvol(vin));
-    iMat = vin.matrix(mask);
-    vinTR=vin.TR();
-  } 
+  read_volume4D(vin,argv[1]);
+  generate_masks(mask,stddevvol(vin));
+  iMat = vin.matrix(mask);  
 
   oMat = calcFFT(iMat);
  
   vout.setmatrix(oMat,mask);
-  vout.setTR(vinTR);
+  copybasicproperties(vin,vout);
 
-  int retval=0;
-  retval = save_volume4D(vout,outname,volinfo);
-  return retval;
+  return save_volume4D(vout,outname);
 }
 
   

fslswapdim.cc

@@ -35,9 +35,8 @@ int fmrib_main(int argc,char *argv[])
     showmat=true;
   }
 
-  volumeinfo volinfo;
   volume4D<T> invol;
-  read_orig_volume4D(invol,inname,volinfo);
+  read_orig_volume4D(invol,inname);
 
   Matrix affmat;
   affmat = invol.swapmat(newx,newy,newz);
@@ -54,7 +53,7 @@ int fmrib_main(int argc,char *argv[])
 
   int retval=0;
   if (outname!="") {
-    retval = save_orig_volume4D(invol,outname,volinfo);
+    retval = save_orig_volume4D(invol,outname);
   }
   return retval;
 }