Merge branch 'dev' of github.com:freesurfer/freesurfer into dev

ayendiki · Sep 9, 2019 · 303d28b · 303d28b
2 parents c0b1ceb + 8dedc0b
commit 303d28b
Show file tree

Hide file tree

Showing 2 changed files with 153 additions and 171 deletions.
diff --git a/mri_ms_fitparms/mri_ms_fitparms.cpp b/mri_ms_fitparms/mri_ms_fitparms.cpp
@@ -874,7 +874,8 @@ main(int argc, char *argv[])
   }
   mri_T2star = estimate_T2star(mri_all_flash, nvolumes_total, mri_PD,
                                M_reg, Glta, mri_T1) ;
-  MRIfree(&mri_T1) ;
+  if (mri_T1)
+    MRIfree(&mri_T1) ;
   if (mri_T2star)
   {
     resetTRTEFA(mri_T2star, TR, TE, FA);
@@ -3131,9 +3132,9 @@ compute_T2star_map(MRI **mri_flash, int nvolumes, int *scan_types,
 
           if (Mreg[scan_types[e]-1])
           {
-            MatrixMultiply(vox2ras[i],v_src,rasvec1);
+            MatrixMultiply(vox2ras[e],v_src,rasvec1);
             MatrixMultiply(Mreg[scan_types[e]-1],rasvec1,rasvec2);
-            MatrixMultiply(ras2vox[i],rasvec2,v_dst);
+            MatrixMultiply(ras2vox[e],rasvec2,v_dst);
           }
           else
           {