Merge branch 'master' of ssh://tetalab.org:2213/tTh/FloatImg

Ok.

Fonderie/crapulator.c

@@ -178,7 +178,7 @@ switch (idFx) {
 						image->height/20);
 		break;
 	case 16:
-		retval = bouger_les_pixels(image, 6);
+		retval = bouger_les_pixels(image, 8);
 		break;
 	case 17:
 		retval = mirror_split(image, 0);

Fonderie/filterstack.c

@@ -20,10 +20,10 @@ extern int		verbosity;
 static	FilterStack 	f_stacks[NUMBER_OF_STACK];
 
 /* -------------------------------------------------------------- */
-int filterstack_init(int numid, int nbre)
+int filterstack_init(int numid, int notused)
 {
 #if DEBUG_LEVEL
-fprintf(stderr, ">>> %s ( %d %d )\n", __func__, numid, nbre);
+fprintf(stderr, ">>> %s ( %d %d )\n", __func__, numid, notused);
 #endif
 
 if (numid < 0 || numid > NUMBER_OF_STACK) {
@@ -105,6 +105,11 @@ if (numid < 0 || numid > NUMBER_OF_STACK) {
 	exit(1);
 	}
 
+if (0==f_stacks[numid].count) {
+	fprintf(stderr, "%s: stack %d empty ?\n", __func__, numid);
+	return -11;
+	}
+
 for (idx=0; idx<f_stacks[numid].count; idx++) {
 
 	eff = f_stacks[numid].slots[idx].numero;

Fonderie/filterstack.h

@@ -16,7 +16,7 @@ typedef struct {
 	FilterSlot	slots[FILTER_BY_STACK];
 	} FilterStack;
 
-int filterstack_init(int numid, int nbre);
+int filterstack_init(int numid, int notused);
 
 int filterstack_add(int numid, int code, int ival, float fval);
 

Fonderie/interpolator.c

@@ -163,7 +163,13 @@ for (idx=0; idx<globbuf.gl_pathc; idx++) {
 	value = idx_values[idx].value;
 
 	/* here, insert the input filter */
-	foo = crapulator(&B, infx, value);
+	if (infx) {
+		foo = crapulator(&B, infx, value);
+		}
+	else	{
+		foo = filterstack_run(0, &B, 0);
+		}
+
 	if (foo) {
 		fprintf(stderr, "%s: input fx fail %d\n", __func__, foo);
 		exit(1);
@@ -181,9 +187,9 @@ for (idx=0; idx<globbuf.gl_pathc; idx++) {
 		//	exit(1);
 		//	}
 
-		foo = filterstack_run(0, &Out, 0);
+		foo = filterstack_run(1, &Out, 0);
 		if (foo) {
-			fprintf(stderr, "run filt stk--> %d\n", foo);
+			fprintf(stderr, "run filt stack--> %d\n", foo);
 			return foo;
 			}
 
@@ -243,15 +249,17 @@ int		opt;
 int		inFx = 0;
 int		outFx = 0;
 int		sort = 0;
-char		*filterchain = "0";
+char		*InFchain  = "0";
+char		*OutFchain = "0";
 
 fprintf(stderr, "*** %s : compiled by tTh, %s %s\n", __FILE__,
 			__DATE__, __TIME__);
 fimg_print_version(2);
 
-while ((opt = getopt(argc, argv, "F:hS:vw:x:")) != -1) {
+while ((opt = getopt(argc, argv, "E:F:hS:vw:x:")) != -1) {
 	switch(opt) {
-		case 'F':	filterchain = optarg;	break;
+		case 'E':	InFchain = optarg;	break;
+		case 'F':	OutFchain = optarg;	break;
 		case 'h':	help();			break;
 		case 'S':	sort = atoi(optarg);	break;
 		case 'v':	verbosity++;		break;
@@ -269,19 +277,29 @@ if (3 != (argc-optind)) {
 	exit(1);
 	}
 
-foo = parse_filter_chain(0, filterchain);
+foo = parse_filter_chain(0, InFchain);
 if (foo) {
-	fprintf(stderr, "err %d parsing '%s'\n", foo, filterchain);
+	fprintf(stderr, "err %d parsing '%s'\n", foo, InFchain);
+	exit(1);
+	}
+foo = parse_filter_chain(1, OutFchain);
+if (foo) {
+	fprintf(stderr, "err %d parsing '%s'\n", foo, OutFchain);
 	exit(1);
 	}
 
-// filterstack_list(__FILE__);
+if (verbosity) {
+	puts("==============");
+	filterstack_list(0, __FILE__);
+	filterstack_list(1, __FILE__);
+	puts("==============");
+	}
 
 nbrsteps = atoi(argv[optind+2]);
 foo = interpolator(argv[optind], argv[optind+1], nbrsteps,
 					inFx, outFx, sort);
 
-fprintf(stderr, "interpolator give a %d score\n", foo);
+fprintf(stderr, "interpolator give us a %d score\n", foo);
 
 return 0;
 }