--- ray/src/px/ra_t8.c 1994/06/10 12:51:18 2.7 +++ ray/src/px/ra_t8.c 2003/02/22 02:07:28 2.10 @@ -1,9 +1,6 @@ -/* Copyright (c) 1992 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: ra_t8.c,v 2.10 2003/02/22 02:07:28 greg Exp $"; #endif - /* * ra_t8.c - program to convert between RADIANCE and * Targa 8-bit color-mapped images. @@ -13,6 +10,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include +#include + #include "color.h" #include "resolu.h" @@ -27,7 +26,6 @@ static char SCCSid[] = "$SunId$ LBL"; #ifndef BSD #define bcopy(s,d,n) (void)memcpy(d,s,n) -extern char *memcpy(); #endif #define goodpic(h) (my_imType(h) && my_mapType(h)) @@ -154,7 +152,7 @@ char *argv[]; quiterr(NULL); userr: fprintf(stderr, - "Usage: %s [-d][-c ncolors][-b][-g gamv][-e +/-stops] input [output]\n", + "Usage: %s [-d][-n samp][-c ncolors][-b][-g gamv][-e +/-stops] input [output]\n", progname); fprintf(stderr, " Or: %s -r [-g gamv][-e +/-stops] [input [output]]\n", progname); @@ -195,6 +193,7 @@ char *err; } +void eputs(s) char *s; { @@ -202,6 +201,7 @@ char *s; } +void quit(code) int code; { @@ -344,8 +344,8 @@ struct hdStruct *hp; if (fwritecolrs(scanline, xmax, stdout) < 0) quiterr("error writing RADIANCE file"); } - free((char *)scanline); - free((char *)tarData); + free((void *)scanline); + free((void *)tarData); }