--- ray/src/px/protate.c 1998/10/27 12:34:39 2.5 +++ ray/src/px/protate.c 2003/02/22 02:07:27 2.7 @@ -1,9 +1,6 @@ -/* Copyright (c) 1991 Regents of the University of California */ - #ifndef lint -static char SCCSid[] = "$SunId$ LBL"; +static const char RCSid[] = "$Id: protate.c,v 2.7 2003/02/22 02:07:27 greg Exp $"; #endif - /* * prot.c - program to rotate picture file 90 degrees clockwise. * @@ -14,6 +11,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include "color.h" +#include + #include "resolu.h" int order; /* input scanline order */ @@ -142,9 +141,8 @@ FILE *fp; exit(1); } for (inx = 0; inx < nrows && xoff+inx < xres; inx++) - bcopy((char *)inln[xoff+inx], - (char *)scanbar[inx*yres+iny], - sizeof(COLR)); + copycolr(scanbar[inx*yres+iny], + inln[xoff+inx]); } for (inx = 0; inx < nrows && xoff+inx < xres; inx++) if (fwritecolrs(scanbar+inx*yres, yres, stdout) < 0) { @@ -152,7 +150,7 @@ FILE *fp; exit(1); } } - free((char *)inln); + free((void *)inln); } @@ -179,9 +177,8 @@ FILE *fp; exit(1); } for (inx = 0; inx < nrows && xoff-inx >= 0; inx++) - bcopy((char *)inln[xoff-inx], - (char *)scanbar[inx*yres+iny], - sizeof(COLR)); + copycolr(scanbar[inx*yres+iny], + inln[xoff-inx]); } for (inx = 0; inx < nrows && xoff-inx >= 0; inx++) if (fwritecolrs(scanbar+inx*yres, yres, stdout) < 0) { @@ -189,5 +186,5 @@ FILE *fp; exit(1); } } - free((char *)inln); + free((void *)inln); }