--- ray/src/common/resolu.c	2003/02/22 02:07:22	2.3
+++ ray/src/common/resolu.c	2023/11/21 18:47:03	2.9
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: resolu.c,v 2.3 2003/02/22 02:07:22 greg Exp $";
+static const char	RCSid[] = "$Id: resolu.c,v 2.9 2023/11/21 18:47:03 greg Exp $";
 #endif
 /*
  * Read and write image resolutions.
@@ -7,66 +7,10 @@ static const char	RCSid[] = "$Id: resolu.c,v 2.3 2003/
  * Externals declared in resolu.h
  */
 
-/* ====================================================================
- * The Radiance Software License, Version 1.0
- *
- * Copyright (c) 1990 - 2002 The Regents of the University of California,
- * through Lawrence Berkeley National Laboratory.   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *         notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *           if any, must include the following acknowledgment:
- *             "This product includes Radiance software
- *                 (http://radsite.lbl.gov/)
- *                 developed by the Lawrence Berkeley National Laboratory
- *               (http://www.lbl.gov/)."
- *       Alternately, this acknowledgment may appear in the software itself,
- *       if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
- *       and "The Regents of the University of California" must
- *       not be used to endorse or promote products derived from this
- *       software without prior written permission. For written
- *       permission, please contact radiance@radsite.lbl.gov.
- *
- * 5. Products derived from this software may not be called "Radiance",
- *       nor may "Radiance" appear in their name, without prior written
- *       permission of Lawrence Berkeley National Laboratory.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
- * information on Lawrence Berkeley National Laboratory, please see
- * <http://www.lbl.gov/>.
- */
+#include "copyright.h"
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
+#include <stdio.h>
 
 #include "resolu.h"
 
@@ -75,10 +19,11 @@ char  resolu_buf[RESOLU_BUFLEN];	/* resolution line bu
 
 
 void
-fputresolu(ord, sl, ns, fp)		/* put out picture dimensions */
-int  ord;			/* scanline ordering */
-int  sl, ns;			/* scanline length and number */
-FILE  *fp;
+fputresolu(				/* put out picture dimensions */
+	int  ord,		/* scanline ordering */
+	int  sl, int ns,	/* scanline length and number */
+	FILE  *fp
+)
 {
 	RESOLU  rs;
 
@@ -94,9 +39,10 @@ FILE  *fp;
 
 
 int
-fgetresolu(sl, ns, fp)			/* get picture dimensions */
-int  *sl, *ns;			/* scanline length and number */
-FILE  *fp;
+fgetresolu(				/* get picture dimensions */
+	int  *sl, int *ns,		/* scanline length and number */
+	FILE  *fp
+)
 {
 	RESOLU  rs;
 
@@ -114,16 +60,17 @@ FILE  *fp;
 
 
 char *
-resolu2str(buf, rp)		/* convert resolution struct to line */
-char  *buf;
-register RESOLU  *rp;
+resolu2str(			/* convert resolution struct to line */
+	char  *buf,
+	RESOLU  *rp
+)
 {
 	if (rp->rt&YMAJOR)
-		sprintf(buf, "%cY %d %cX %d\n",
+		sprintf(buf, "%cY %8d %cX %8d\n",
 				rp->rt&YDECR ? '-' : '+', rp->yr,
 				rp->rt&XDECR ? '-' : '+', rp->xr);
 	else
-		sprintf(buf, "%cX %d %cY %d\n",
+		sprintf(buf, "%cX %8d %cY %8d\n",
 				rp->rt&XDECR ? '-' : '+', rp->xr,
 				rp->rt&YDECR ? '-' : '+', rp->yr);
 	return(buf);
@@ -131,12 +78,13 @@ register RESOLU  *rp;
 
 
 int
-str2resolu(rp, buf)		/* convert resolution line to struct */
-register RESOLU  *rp;
-char  *buf;
+str2resolu(			/* convert resolution line to struct */
+	RESOLU  *rp,
+	char  *buf
+)
 {
-	register char  *xndx, *yndx;
-	register char  *cp;
+	char  *xndx, *yndx;
+	char  *cp;
 
 	if (buf == NULL)
 		return(0);