--- ray/src/px/ra_pr.c 1990/01/18 23:58:19 1.5 +++ ray/src/px/ra_pr.c 1990/03/12 15:14:40 1.8 @@ -47,7 +47,7 @@ char *progname; char errmsg[128]; -COLR *inline; +COLR *inl; int xmax, ymax; @@ -113,7 +113,7 @@ char *argv[]; head.ras_depth != 8) quiterr("incompatible format"); /* put header */ - printargs(argc, argv, stdout); + printargs(i, argv, stdout); putchar('\n'); fputresolu(YMAJOR|YDECR, xmax, ymax, stdout); /* convert file */ @@ -203,7 +203,7 @@ register struct rasterfile *h; h->ras_maptype = RMT_EQUAL_RGB; h->ras_maplength = 256*3; /* allocate scanline */ - inline = (COLR *)emalloc(xmax*sizeof(COLR)); + inl = (COLR *)emalloc(xmax*sizeof(COLR)); return(p); } @@ -277,7 +277,7 @@ register rgbpixel *l3; if (inpic->bytes_line == 0) { if (inpic->pos.y[y] == 0) { while (inpic->nexty < y) { - if (freadcolrs(inline, xmax, inpic->fp) < 0) + if (freadcolrs(inl, xmax, inpic->fp) < 0) quiterr("read error in picreadline3"); inpic->pos.y[++inpic->nexty] = ftell(inpic->fp); } @@ -287,15 +287,15 @@ register rgbpixel *l3; quiterr("seek error in picreadline3"); } else if (inpic->bytes_line == 0 && inpic->pos.y[inpic->nexty] == 0) inpic->pos.y[inpic->nexty] = ftell(inpic->fp); - if (freadcolrs(inline, xmax, inpic->fp) < 0) /* read scanline */ + if (freadcolrs(inl, xmax, inpic->fp) < 0) /* read scanline */ quiterr("read error in picreadline3"); inpic->nexty = y+1; /* convert scanline */ - normcolrs(inline, xmax); + normcolrs(inl, xmax, 0); for (i = 0; i < xmax; i++) { - l3[i].r = inline[i][RED]; - l3[i].g = inline[i][GRN]; - l3[i].b = inline[i][BLU]; + l3[i].r = inl[i][RED]; + l3[i].g = inl[i][GRN]; + l3[i].b = inl[i][BLU]; } }