Commit2c1d332

committed

Merge remote-tracking branch 'upstream/master'

2 parents920cf49 +6104bd1 commit2c1d332Copy full SHA for 2c1d332

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,5 +91,6 @@ def bench_load_trk():`
`91`	`91`	`fors1,s2inzip(scalars_new,scalars_old):`
`92`	`92`	`assert_array_equal(s1,s2)`
`93`	`93`
	`94`	`+`
`94`	`95`	`if__name__=='__main__':`
`95`	`96`	`bench_load_trk()`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,6 +165,7 @@ def shared_range(flt_type, int_type):`
`165`	`165`	`_SHARED_RANGES[key]= (mn,mx)`
`166`	`166`	`returnmn,mx`
`167`	`167`
	`168`	`+`
`168`	`169`	`# ----------------------------------------------------------------------------`
`169`	`170`	`# Routines to work out the next lowest representable integer in floating point`
`170`	`171`	`# types.`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ class ClassMapDict(dict):`
`40`	`40`	`def__getitem__(self,args,*kwargs):`
`41`	`41`	`returnsuper(ClassMapDict,self).__getitem__(args,*kwargs)`
`42`	`42`
	`43`	`+`
`43`	`44`	`class_map=ClassMapDict(`
`44`	`45`	`analyze={'class':AnalyzeImage,# Image class`
`45`	`46`	`'ext':'.img',# characteristic image extension`
`@@ -95,6 +96,7 @@ class ExtMapRecoder(Recoder):`
`95`	`96`	`def__getitem__(self,args,*kwargs):`
`96`	`97`	`returnsuper(ExtMapRecoder,self).__getitem__(args,*kwargs)`
`97`	`98`
	`99`	`+`
`98`	`100`	`# mapping of extensions to default image class names`
`99`	`101`	`ext_map=ExtMapRecoder((`
`100`	`102`	`('nifti_single','.nii'),`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ def io_orientation(affine, tol=None):`
`63`	`63`	`RS=RZS/zooms`
`64`	`64`	`# Transform below is polar decomposition, returning the closest`
`65`	`65`	`# shearless matrix R to RS`
`66`		`-P,S,Qs=npl.svd(RS)`
	`66`	`+P,S,Qs=npl.svd(RS,full_matrices=False)`
`67`	`67`	`# Threshold the singular values to determine the rank.`
`68`	`68`	`iftolisNone:`
`69`	`69`	`tol=S.max()max(RS.shape)np.finfo(S.dtype).eps`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -130,5 +130,6 @@ class Spm2AnalyzeImage(spm99.Spm99AnalyzeImage):`
`130`	`130`	`"""`
`131`	`131`	`header_class=Spm2AnalyzeHeader`
`132`	`132`
	`133`	`+`
`133`	`134`	`load=Spm2AnalyzeImage.load`
`134`	`135`	`save=Spm2AnalyzeImage.instance_to_filename`

Comments

(0)