--- ray/src/px/ra_ps.c 1992/07/13 10:53:42 2.3 +++ ray/src/px/ra_ps.c 1995/09/27 13:29:52 2.10 @@ -9,27 +9,37 @@ static char SCCSid[] = "$SunId$ LBL"; */ #include +#ifdef MSDOS +#include +#endif #include "color.h" -#include "random.h" #define HMARGIN (.5*72) /* horizontal margin */ #define VMARGIN (.5*72) /* vertical margin */ #define PWIDTH (8.5*72-2*HMARGIN) /* width of device */ #define PHEIGHT (11*72-2*VMARGIN) /* height of device */ +#define RUNCHR '*' /* character to start rle */ +#define MINRUN 4 /* minimum run-length */ +#define RSTRT '!' /* character for MINRUN */ +#define MAXRUN (MINRUN+'~'-RSTRT) /* maximum run-length */ + char code[] = /* 6-bit code lookup table */ "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ@+"; int wrongformat = 0; /* input in wrong format? */ -double pixaspect = 1.0; /* pixel aspect ratio */ +double pixaspect = 1.0; /* pixel aspect ratio */ int bradj = 0; /* brightness adjustment */ +int ncopies = 1; /* number of copies */ char *progname; int xmax, ymax; +extern char *malloc(); + headline(s) /* check header line */ char *s; { @@ -59,6 +69,9 @@ char *argv[]; goto userr; bradj = atoi(argv[++i]); break; + case 'n': /* number of copies */ + ncopies = atoi(argv[++i]); + break; default: goto userr; } @@ -73,10 +86,13 @@ char *argv[]; exit(1); } if (i == argc-2 && freopen(argv[i+1], "w", stdout) == NULL) { - fprintf(stderr, "can't open output \"%s\"\n", + fprintf(stderr, "%s: can't open output \"%s\"\n", progname, argv[i+1]); exit(1); } +#ifdef MSDOS + setmode(fileno(stdin), O_BINARY); +#endif /* get our header */ getheader(stdin, headline, NULL); if (wrongformat || fgetresolu(&xmax, &ymax, stdin) < 0) @@ -109,27 +125,18 @@ PSheader(name) /* print PostScript header */ char *name; { int landscape = 0; - double pwidth, pheight; - double iwidth, iheight; - - printf("%%!\n"); + double pwidth, pheight; + double iwidth, iheight; + /* EPS comments */ + puts("%%!PS-Adobe-2.0 EPSF-2.0"); printf("%%%%Title: %s\n", name); - printf("%%%%Creator: %s\n", progname); - printf("%%%%Pages: 1\n"); + printf("%%%%Creator: %s = %s\n", progname, SCCSid); + printf("%%%%Pages: %d\n", ncopies); if (landscape = xmax > pixaspect*ymax) - printf("%%%%Landscape\n"); + puts("%%Orientation: Landscape"); else - printf("%%%%Portrait\n"); - printf("%%%%EndComments\n"); - printf("gsave\n"); - printf("64 dict begin\n"); - /* define image reader */ - PSprocdef("read6bit"); - /* set up transformation matrix */ - printf("%f %f translate\n", HMARGIN, VMARGIN); + puts("%%Orientation: Portrait"); if (PWIDTH > PHEIGHT ^ landscape) { - printf("0 %f translate\n", PHEIGHT); - printf("-90 rotate\n"); pwidth = PHEIGHT; pheight = PWIDTH; } else { @@ -143,11 +150,34 @@ char *name; iheight = pheight; iwidth = pheight*xmax/(pixaspect*ymax); } + if (pwidth == PHEIGHT) + printf("%%%%BoundingBox: %.0f %.0f %.0f %.0f\n", + HMARGIN+(pheight-iheight)*.5, + VMARGIN+(pwidth-iwidth)*.5, + HMARGIN+(pheight-iheight)*.5+iheight, + VMARGIN+(pwidth-iwidth)*.5+iwidth); + else + printf("%%%%BoundingBox: %.0f %.0f %.0f %.0f\n", + HMARGIN+(pwidth-iwidth)*.5, + VMARGIN+(pheight-iheight)*.5, + HMARGIN+(pwidth-iwidth)*.5+iwidth, + VMARGIN+(pheight-iheight)*.5+iheight); + puts("%%EndComments"); + puts("save"); + puts("64 dict begin"); + /* define image reader */ + PSprocdef("read6bitRLE"); + /* set up transformation matrix */ + printf("%f %f translate\n", HMARGIN, VMARGIN); + if (pwidth == PHEIGHT) { + printf("0 %f translate\n", PHEIGHT); + puts("-90 rotate"); + } printf("%f %f translate\n", (pwidth-iwidth)*.5, (pheight-iheight)*.5); printf("%f %f scale\n", iwidth, iheight); - printf("%%%%EndProlog\n"); + puts("%%%%EndProlog"); /* start image procedure */ - printf("%d %d 8 [%d 0 0 %d 0 %d] {read6bit} image", xmax, ymax, + printf("%d %d 8 [%d 0 0 %d 0 %d] {read6bitRLE} image\n", xmax, ymax, xmax, -ymax, ymax); } @@ -155,9 +185,11 @@ char *name; PStrailer() /* print PostScript trailer */ { puts("%%Trailer"); - puts("end"); + if (ncopies > 1) + printf("/#copies %d def\n", ncopies); puts("showpage"); - puts("grestore"); + puts("end"); + puts("restore"); puts("%%EOF"); } @@ -167,12 +199,14 @@ char *nam; { short itab[128]; register int i; - - for (i = 0; i < 128; i++) + /* assign code values */ + for (i = 0; i < 128; i++) /* clear */ itab[i] = -1; - for (i = 0; i < 64; i++) + for (i = 1; i < 63; i++) /* assign greys */ itab[code[i]] = i<<2 | 2; - printf("/decode ["); + itab[code[0]] = 0; /* black is black */ + itab[code[63]] = 255; /* and white is white */ + printf("/codetab ["); for (i = 0; i < 128; i++) { if (!(i & 0xf)) putchar('\n'); @@ -180,19 +214,31 @@ char *nam; } printf("\n] def\n"); printf("/scanline %d string def\n", xmax); + printf("/nrept 0 def\n"); + printf("/readbyte { currentfile read not {stop} if } def\n"); + printf("/decode { codetab exch get } def\n"); printf("/%s {\n", nam); printf("\t{ 0 1 %d { scanline exch\n", xmax-1); - printf("\t\t{ decode currentfile read not {stop} if get\n"); - printf("\tdup 0 lt {pop} {exit} ifelse } loop put } for\n"); - printf("} stopped {pop pop pop 0 string} {scanline} ifelse } def\n"); + printf("\t\tnrept 0 le\n"); + printf("\t\t\t{ { readbyte dup %d eq\n", RUNCHR); + printf("\t\t\t\t\t{ pop /nrept readbyte %d sub def\n", RSTRT-MINRUN+1); + printf("\t\t\t\t\t\t/reptv readbyte decode def\n"); + printf("\t\t\t\t\t\treptv exit }\n"); + printf("\t\t\t\t\t{ decode dup 0 lt {pop} {exit} ifelse }\n"); + printf("\t\t\t\tifelse } loop }\n"); + printf("\t\t\t{ /nrept nrept 1 sub def reptv }\n"); + printf("\t\tifelse put\n"); + printf("\t\t} for\n"); + printf("\t} stopped {pop pop 0 string} {scanline} ifelse\n"); + printf("} bind def\n"); } ra2ps() /* convert Radiance scanlines to 6-bit */ { - COLR *scanin; - register int col = 0; + register COLR *scanin; register int c; + int lastc, cnt; register int x; int y; /* allocate scanline */ @@ -203,18 +249,47 @@ ra2ps() /* convert Radiance scanlines to 6-bit */ for (y = ymax-1; y >= 0; y--) { if (freadcolrs(scanin, xmax, stdin) < 0) quiterr("error reading Radiance picture"); - normcolrs(scanin, xmax, bradj); /* normalize */ + normcolrs(scanin, xmax, bradj); /* normalize */ + lastc = -1; cnt = 0; for (x = 0; x < xmax; x++) { - if (!(col++ & 0x3f)) - putchar('\n'); - c = normbright(scanin[x]) + (random()&3); + c = normbright(scanin[x]) + 2; if (c > 255) c = 255; - putchar(code[c>>2]); + c = code[c>>2]; + if (c == lastc && cnt < MAXRUN) + cnt++; + else { + putrle(cnt, lastc); + lastc = c; + cnt = 1; + } } + putrle(cnt, lastc); if (ferror(stdout)) quiterr("error writing PostScript file"); } putchar('\n'); /* free scanline */ free((char *)scanin); +} + + +putrle(cnt, cod) /* put out cnt of cod */ +register int cnt, cod; +{ + static int col = 0; + + if (cnt >= MINRUN) { + col += 3; + putchar(RUNCHR); + putchar(RSTRT-MINRUN+cnt); + putchar(cod); + } else { + col += cnt; + while (cnt-- > 0) + putchar(cod); + } + if (col >= 72) { + putchar('\n'); + col = 0; + } }