fixes for tfce

fslmaths.cc

@@ -858,18 +858,21 @@ if (!separatenoise)
     /*****************END OF FILTERING OPTIONS***************/
     else if (string(argv[i])=="-edge")
        input_volume=edge_strengthen(input_volume);
-    else if (string(argv[i])=="-tfce")
-      // {{{ TFCE option
+    else if (string(argv[i])=="-tfce") {
+      float height_power = atof(argv[++i]);
+      float size_power = atof(argv[++i]);
+      int connectivity = atoi(argv[++i]);
 
-      {
-	float height_power = atof(argv[++i]);
-	float size_power = atof(argv[++i]);
-	int connectivity = atoi(argv[++i]);
-
-	for(int t=0;t<input_volume.tsize();t++)
+      for(int t=0;t<input_volume.tsize();t++) {
+	try { 
 	  tfce(input_volume[t], height_power, size_power, connectivity, 0, input_volume[t].max());
+	}
+	catch(Exception& e) { 
+	  cerr << "ERROR: TFCE failed, please check your file for valid sizes and voxel values." <<  e.what() << endl << endl << "Exiting" << endl; 
+	  return 1;
+	}
       }
-
+    }
 // }}}
     else if (string(argv[i])=="-tfceS")
       // {{{ TFCE supporting-area option