From 1008a778c9949aa12554c2841c3798dd028ce748 Mon Sep 17 00:00:00 2001
From: Tonton Th <sigfood@dinorama.fr>
Date: Sun, 30 Jun 2019 01:18:39 +0200
Subject: [PATCH] j'adore quand un plan se deroule sans accroc

---
 lib/fimg-pnm.c      | 3 +--
 tools/Makefile      | 2 +-
 tools/addpnm2fimg.c | 7 ++++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/fimg-pnm.c b/lib/fimg-pnm.c
index d01b2af1..a4d39196 100644
--- a/lib/fimg-pnm.c
+++ b/lib/fimg-pnm.c
@@ -61,7 +61,7 @@ fseek(fp, 1L, SEEK_CUR);		/* black magic */
 Rptr = head->R;    Gptr = head->G;    Bptr = head->B;
 for (line=0; line<height; line++) {
 	foo = fread(buffline, 3, width, fp);
-	fprintf(stderr, "line %d read %d\n", line, width);
+	// fprintf(stderr, "line %d read %d\n", line, width);
 	idxrd = buffline;
 	for (column=0; column<width; column++)
 		{
@@ -130,7 +130,6 @@ for (idx=0; idx<sz; idx++) {
 	}
 fputs("\n", fp);
 
-
 fclose(fp);
 
 return 0;
diff --git a/tools/Makefile b/tools/Makefile
index 5b94864f..31044e65 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -27,7 +27,7 @@ addtga2fimg:	addtga2fimg.c  $(DEPS)
 	gcc -g $< ../libfloatimg.a -limageSO -lm -o $@
 
 addpnm2fimg:	addpnm2fimg.c  $(DEPS)
-	gcc -g $< ../libfloatimg.a -limageSO -lm -o $@
+	gcc -g $< ../libfloatimg.a -lm -o $@
 
 
 # if "undefined reference to crc32" then "use -lz"
diff --git a/tools/addpnm2fimg.c b/tools/addpnm2fimg.c
index bf328d45..303ef4b7 100644
--- a/tools/addpnm2fimg.c
+++ b/tools/addpnm2fimg.c
@@ -32,12 +32,15 @@ if (foo) fprintf(stderr, "create src fimg from '%s' -> %d\n", dstname, foo);
 fimg_describe(&qrc, "created fimg from PNM");
 #endif
 
+// fprintf(stderr, "src is %dx%d\n", src.width, src.height); 
+
 idx = 0;
 for (y=0; y<src.height; y++) {
 	for (x=0; x<src.width; x++) {
 		dst.R[idx] += src.R[idx];
 		dst.G[idx] += src.G[idx];
 		dst.B[idx] += src.B[idx];
+		idx++;
 		}
 	}
 
@@ -59,8 +62,10 @@ if (3 != argc) {
 	exit(1);
 	}
 
+verbosity = 0;
+
 if ( 0==access(argv[2], R_OK|W_OK) ) {		/* fimg is readable */
-	fprintf(stderr, "%s exist\n", argv[2]);
+	// fprintf(stderr, "%s exist\n", argv[2]);
 	}
 /*
 else	{