spm2-fileparts.patch

Fix for Matlab 7.13 (R2011b)

The fourth output argument of fileparts (file version) is no longer supported and has been removed.
http://www.mathworks.fr/help/techdoc/ref/fileparts.html

This had been generating warnings since R2010a.
Starting with R2011b it generates actual errors.


git-svn-id: https://svn.code.sf.net/p/spm2/code/trunk@42 05888fa5-3f6b-416b-901c-fe7d8d848dd3

Author: papadopo

spm_applydef_ui.m

@@ -60,7 +60,7 @@ function spm_applydef(VD,VI)
 
 %_______________________________________________________________________
 function out = prepend(in, pre)
-[pth,nme,ext,ver] = fileparts(in);
-out = fullfile(pth,[pre nme ext ver]);
+[pth,nme,ext] = fileparts(in);
+out = fullfile(pth,[pre nme ext]);
 return;
 %_______________________________________________________________________

spm_bias_apply.m

@@ -30,9 +30,9 @@
 VO.dim(4)      = spm_type('float');
 
 if nargout==0,
-	[pth,nm,xt,vr] = fileparts(deblank(V.fname));
-	VO.fname       = fullfile(pth,['m' nm xt vr]);
-	%VO.fname      = ['m' nm xt vr];
+	[pth,nm,xt]    = fileparts(deblank(V.fname));
+	VO.fname       = fullfile(pth,['m' nm xt]);
+	%VO.fname      = ['m' nm xt];
 	VO.pinfo       = [1 0 0]';
 	VO             = spm_create_vol(VO);
 else,

spm_bias_estimate.m

@@ -68,9 +68,9 @@
 	T     = (Alpha + IC0)\(Alpha*T - Beta);
 	T     = reshape([0 ; T],nbas);
 
-	[pth,nm,xt,vr] = fileparts(deblank(V.fname));
-	S              = fullfile(pth,['bias_' nm '.mat']);
-	%S             = ['bias_' nm '.mat'];
+	[pth,nm,xt] = fileparts(deblank(V.fname));
+	S           = fullfile(pth,['bias_' nm '.mat']);
+	%S          = ['bias_' nm '.mat'];
 	save(S,'V','T','h');
 	fprintf('%g %g\n', ll, lp);
 

spm_bias_ui.m

@@ -85,11 +85,11 @@ function bias_ui(flags)
 for i=1:size(PP,1),
 	spm('FigName',['Flatten: working on scan ' num2str(i)],Finter,CmdLine);
 	drawnow;
-	P              = deblank(PP(i,:));
-	T              = spm_bias_estimate(P,flags);
-	[pth,nm,xt,vr] = fileparts(P);
-	S              = fullfile(pth,['bias_' nm '.mat']);
-	%S             = ['bias_' nm '.mat'];
+	P           = deblank(PP(i,:));
+	T           = spm_bias_estimate(P,flags);
+	[pth,nm,xt] = fileparts(P);
+	S           = fullfile(pth,['bias_' nm '.mat']);
+	%S          = ['bias_' nm '.mat'];
 	spm_bias_apply(P,S);
 end;
 if 0,

spm_mask.m

@@ -48,8 +48,8 @@ function spm_mask(P1,P2, thresh)
 % Create headers
 VO=V2;
 for i=1:m2,
-	[pth,nm,xt,vr] = fileparts(deblank(VO(i).fname));
-	%VO(i).fname   = fullfile(pth,['m' nm xt vr]);
+	[pth,nm,xt]    = fileparts(deblank(VO(i).fname));
+	%VO(i).fname   = fullfile(pth,['m' nm xt]);
 	VO(i).fname    = ['m' nm '.img'];
 	VO(i).descrip  = 'Masked';
 	VO(i).mat      = VO(1).mat;

spm_normalise.m

@@ -124,8 +124,8 @@
 if ischar(VG), VG = spm_vol(VG); end;
 if nargin<3,
 	if nargout==0,
-		[pth,nm,xt,vr] = fileparts(deblank(VF(1).fname));
-		matname        = fullfile(pth,[nm '_sn.mat']);
+		[pth,nm,xt] = fileparts(deblank(VF(1).fname));
+		matname     = fullfile(pth,[nm '_sn.mat']);
 	else,
 		matname = '';
 	end;

spm_orthviews.m

@@ -1167,7 +1167,7 @@ function redraw(arg1)
 		addpath(pluginpath);
 		% fprintf('spm_orthviews: Using Plugins in %s\n', pluginpath);
 		for k = 1:length(pluginfiles)
-			[p pluginname e v] = fileparts(pluginfiles(k).name);
+			[p pluginname e] = fileparts(pluginfiles(k).name);
 			st.plugins{k} = strrep(pluginname, 'spm_ov_','');
 			% fprintf('%s\n',st.plugins{k});
 		end;

spm_orthviews/spm_ov_roi.m

@@ -229,8 +229,8 @@
       roifname = [];
     else
       imfname = spm_get(1, '*.img', 'Select image defining ROI space');
-      [p n e v] = fileparts(imfname);
-      roifname = fullfile(p,['roitool' e v]);
+      [p n e] = fileparts(imfname);
+      roifname = fullfile(p,['roitool' e]);
       roifname = spm_input('ROI filename','!+1','s',roifname);
     end;
     spm_figure('Clear', Finter);

spm_realign.m

@@ -493,7 +493,7 @@ function save_parameters(V)
 
 %_______________________________________________________________________
 function PO = prepend(PI,pre)
-[pth,nm,xt,vr] = fileparts(deblank(PI));
-PO             = fullfile(pth,[pre nm xt vr]);
+[pth,nm,xt] = fileparts(deblank(PI));
+PO          = fullfile(pth,[pre nm xt]);
 return;
 %_______________________________________________________________________

spm_realign_ui.m

@@ -540,7 +540,7 @@ function run_ui(defs, modality, unwarp)
 			end
 			ds = spm_uw_estimate(P{i}{j},uwe_flags);
                         ads(j) = ds;
-			[path,name,ext,ver] = fileparts(P{i}{j}(1,:));
+			[path,name,ext] = fileparts(P{i}{j}(1,:));
 			pefile = fullfile(path,[name '_uw.mat']);
 			save(pefile,'ds');
 		end