New release 1.7.0

1 files changed, 7 insertions, 14 deletions

diff --git a/rspl/t3d.c b/rspl/t3d.c
index 1935545..c526669 100644
--- a/rspl/t3d.c
+++ b/rspl/t3d.c
@@ -22,6 +22,7 @@
 #include "rspl.h"
 #include "tiffio.h"
 #include "plot.h"
+#include "ui.h"
 
 #ifdef NEVER
 #define INTERP spline_interp
@@ -357,8 +358,7 @@ void usage(void) {
 	fprintf(stderr," -r resx,resy,resz  Set grid resolutions (def %d %d %d)\n",GRES0,GRES1,GRES2);
 	fprintf(stderr," -h                    Test half scale resolution too\n");
 	fprintf(stderr," -q                    Test quarter scale resolution too\n");
-	fprintf(stderr," -2                    Use two pass smoothing\n");
-	fprintf(stderr," -x                    Use extra fitting\n");
+	fprintf(stderr," -x                    Use auto smoothing\n");
 	fprintf(stderr," -s                    Test symetric smoothness\n");
 	fprintf(stderr," -p                    plot 4 slices, xy = 0.5, yz = 0.5, xz = 0.5,  x=y=z\n");
 	fprintf(stderr," -P x1:y1:z1:x2:y2:z2  plot slice from x1,y1,z1,x2,y2,z2\n");
@@ -377,8 +377,7 @@ int main(int argc, char *argv[]) {
 	co *test_points = test_points1;
 	int npoints = sizeof(test_points1)/sizeof(co);
 	int dosym = 0;
-	int twopass = 0;
-	int extra = 0;
+	int autosm = 0;
 	int doplot = 0;
 	double plotpts[2][3];       /* doplot == 2 start/end points */
 	int doh = 0;				/* half scale */
@@ -482,11 +481,8 @@ int main(int argc, char *argv[]) {
 			} else if (argv[fa][1] == 's') {
 				dosym = 1;
 
-			} else if (argv[fa][1] == '2') {
-				twopass = 1;
-
-			} else if (argv[fa][1] == 'x' || argv[fa][1] == 'X') {
-				extra = 1;
+			} else if (argv[fa][1] == 'x') {
+				autosm = 1;
 
 			/* smoothing factor */
 			} else if (argv[fa][1] == 'S') {
@@ -502,11 +498,8 @@ int main(int argc, char *argv[]) {
 	}
 
 
-	if (twopass)
-		flags |= RSPL_2PASSSMTH;
-
-	if (extra)
-		flags |= RSPL_EXTRAFIT2;
+	if (autosm)
+		flags |= RSPL_AUTOSMOOTH;
 
 	if (dosym)
 		flags |= RSPL_SYMDOMAIN;