--- ray/src/common/resolu.c	1991/11/12 16:54:21	2.1
+++ ray/src/common/resolu.c	2005/02/01 01:28:16	2.5
@@ -1,13 +1,14 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: resolu.c,v 2.5 2005/02/01 01:28:16 greg Exp $";
 #endif
-
 /*
  * Read and write image resolutions.
+ *
+ * Externals declared in resolu.h
  */
 
+#include "copyright.h"
+
 #include <stdio.h>
 
 #include "resolu.h"
@@ -16,6 +17,7 @@ static char SCCSid[] = "$SunId$ LBL";
 char  resolu_buf[RESOLU_BUFLEN];	/* resolution line buffer */
 
 
+void
 fputresolu(ord, sl, ns, fp)		/* put out picture dimensions */
 int  ord;			/* scanline ordering */
 int  sl, ns;			/* scanline length and number */
@@ -23,7 +25,7 @@ FILE  *fp;
 {
 	RESOLU  rs;
 
-	if ((rs.or = ord) & YMAJOR) {
+	if ((rs.rt = ord) & YMAJOR) {
 		rs.xr = sl;
 		rs.yr = ns;
 	} else {
@@ -43,14 +45,14 @@ FILE  *fp;
 
 	if (!fgetsresolu(&rs, fp))
 		return(-1);
-	if (rs.or & YMAJOR) {
+	if (rs.rt & YMAJOR) {
 		*sl = rs.xr;
 		*ns = rs.yr;
 	} else {
 		*sl = rs.yr;
 		*ns = rs.xr;
 	}
-	return(rs.or);
+	return(rs.rt);
 }
 
 
@@ -59,39 +61,40 @@ resolu2str(buf, rp)		/* convert resolution struct to l
 char  *buf;
 register RESOLU  *rp;
 {
-	if (rp->or&YMAJOR)
+	if (rp->rt&YMAJOR)
 		sprintf(buf, "%cY %d %cX %d\n",
-				rp->or&YDECR ? '-' : '+', rp->yr,
-				rp->or&XDECR ? '-' : '+', rp->xr);
+				rp->rt&YDECR ? '-' : '+', rp->yr,
+				rp->rt&XDECR ? '-' : '+', rp->xr);
 	else
 		sprintf(buf, "%cX %d %cY %d\n",
-				rp->or&XDECR ? '-' : '+', rp->xr,
-				rp->or&YDECR ? '-' : '+', rp->yr);
+				rp->rt&XDECR ? '-' : '+', rp->xr,
+				rp->rt&YDECR ? '-' : '+', rp->yr);
 	return(buf);
 }
 
 
+int
 str2resolu(rp, buf)		/* convert resolution line to struct */
 register RESOLU  *rp;
 char  *buf;
 {
-	char  *xndx, *yndx;
+	register char  *xndx, *yndx;
 	register char  *cp;
 
 	if (buf == NULL)
 		return(0);
 	xndx = yndx = NULL;
-	for (cp = buf+1; *cp; cp++)
+	for (cp = buf; *cp; cp++)
 		if (*cp == 'X')
 			xndx = cp;
 		else if (*cp == 'Y')
 			yndx = cp;
 	if (xndx == NULL || yndx == NULL)
 		return(0);
-	rp->or = 0;
-	if (xndx > yndx) rp->or |= YMAJOR;
-	if (xndx[-1] == '-') rp->or |= XDECR;
-	if (yndx[-1] == '-') rp->or |= YDECR;
+	rp->rt = 0;
+	if (xndx > yndx) rp->rt |= YMAJOR;
+	if (xndx[-1] == '-') rp->rt |= XDECR;
+	if (yndx[-1] == '-') rp->rt |= YDECR;
 	if ((rp->xr = atoi(xndx+1)) <= 0)
 		return(0);
 	if ((rp->yr = atoi(yndx+1)) <= 0)