From 1774ae268e96c8eac82e548c2337c58a98fcfd8c Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Fri, 27 Aug 2010 04:52:26 -0300
Subject: [PATCH] Fixed two small bugs in schhist2web.

- scripts/schhist2web: second file argument was missing when invoking
  pngdiff for file addition or removal
- scripts/schhist2web: keep track of columns also after a file is gone
---
 scripts/schhist2web | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/scripts/schhist2web b/scripts/schhist2web
index 560f832..26c20f0 100755
--- a/scripts/schhist2web
+++ b/scripts/schhist2web
@@ -131,13 +131,16 @@ for n in `git rev-list $first..HEAD~1` $first; do
 	    pngdiff shrink "$thumb" -f $THUMB_OPTS "$fat_a" "$fat_b" || exit
 	elif [ -f "$a" ]; then
 	    s="$s<TD>"
-	    pngdiff cat "$diff" -f -c 1,0,0 "$a" || exit
-	    pngdiff shrink "$thumb" -f -c 1,0,0 $THUMB_OPTS "$fat_a" || exit
+	    pngdiff cat "$diff" -f -c 1,0,0 "$a" "$a" || exit
+	    pngdiff shrink "$thumb" -f -c 1,0,0 $THUMB_OPTS "$fat_a" "$fat_a" \
+	      || exit
 	elif [ -f "$out/$next/$m.ppm" ]; then
 	    s="$s<TD>"
-	    pngdiff cat "$diff" -f -c 0,1,0 "$b" || exit
-	    pngdiff shrink "$thumb" -f -c 0,1,0 $THUMB_OPTS "$fat_b" || exit
+	    pngdiff cat "$diff" -f -c 0,1,0 "$b" "$b" || exit
+	    pngdiff shrink "$thumb" -f -c 0,1,0 $THUMB_OPTS "$fat_b" "$fat_b" \
+	      || exit
 	else
+	    s="$s<TD>"
 	    continue
 	fi
 	echo "$s" >>"$out/index.html"