1
0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2025-04-21 12:27:27 +03:00

Allow markup to be synchronized with other (better resolution) pair of

images.

- scripts/ppmdiff/ppmdiff.c (usage, main): ppmdiff now accepts the name
  of an output file as the last argument
- scripts/ppmdiff/ppmdiff.c (shadow_diff, usage, main): a second set of
  images can be specified that will only be scanned for changes, without
  otherwise becoming part of the merged image
- scripts/schhist2web (pngdiff): specify output name as last argument of
  ppmdiff
- scripts/schhist2web: use shadow images to mark changes only visible
  in regular version also in thumbnails
This commit is contained in:
Werner Almesberger
2010-08-27 06:44:10 -03:00
parent 1774ae268e
commit 0d537612c3
2 changed files with 61 additions and 10 deletions

View File

@@ -15,12 +15,12 @@ pngdiff()
pp="$1"
of="$2"
shift 2
if ! PATH=$PATH:`dirname $0`/ppmdiff ppmdiff "$@" >"$out/_tmp"; then
rm "$out/_tmp"
if ! PATH=$PATH:`dirname $0`/ppmdiff ppmdiff "$@" "$out/_tmp"; then
rm -f "$out/_tmp"
return 1
fi
$pp "$out/_tmp" | pnmtopng >"$of"
rm -f "$out/_tmp"
rm "$out/_tmp"
}
@@ -128,7 +128,8 @@ for n in `git rev-list $first..HEAD~1` $first; do
if [ -f "$a" -a -f "$b" ]; then
s="$s<TD>"
pngdiff cat "$diff" "$a" "$b" || continue
pngdiff shrink "$thumb" -f $THUMB_OPTS "$fat_a" "$fat_b" || exit
pngdiff shrink "$thumb" -f $THUMB_OPTS "$fat_a" "$fat_b" \
"$a" "$b" || exit
elif [ -f "$a" ]; then
s="$s<TD>"
pngdiff cat "$diff" -f -c 1,0,0 "$a" "$a" || exit