--- ray/src/px/ttyimage.c 1991/04/18 14:35:47 1.7 +++ ray/src/px/ttyimage.c 2003/06/05 19:29:34 2.4 @@ -1,9 +1,6 @@ -/* Copyright (c) 1986 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: ttyimage.c,v 2.4 2003/06/05 19:29:34 schorsch Exp $"; #endif - /* * ttyimage.c - program to dump pixel file to dumb terminal. * @@ -11,11 +8,14 @@ static char SCCSid[] = "$SunId$ LBL"; */ #include +#include +#include "platform.h" #include "color.h" +#include "resolu.h" -#define NCOLS 133 +#define NCOLS 133 main(argc, argv) @@ -33,10 +33,10 @@ char **argv; fprintf(stderr, "%s: can't open file \"%s\"\n", argv[0], argv[1]); exit(1); } - + SET_FILE_BINARY(input); /* get picture dimensions */ if (checkheader(input, COLRFMT, NULL) < 0 || - fgetresolu(&xres, &yres, input) != (YMAJOR|YDECR)) { + fgetresolu(&xres, &yres, input) < 0) { fprintf(stderr, "%s: bad picture format\n", argv[0]); exit(1); } @@ -64,7 +64,7 @@ int shade(clr) /* return character for color */ COLR clr; { -#define NSHADES 13 +#define NSHADES 13 static char shadech[NSHADES+1] = " .,:;+?%&*$@#";