--- ray/src/common/resolu.h	2003/06/06 16:38:47	2.5
+++ ray/src/common/resolu.h	2022/03/03 03:55:13	2.16
@@ -1,8 +1,8 @@
-/* RCSid $Id: resolu.h,v 2.5 2003/06/06 16:38:47 schorsch Exp $ */
+/* RCSid $Id: resolu.h,v 2.16 2022/03/03 03:55:13 greg Exp $ */
 /*
  * Definitions for resolution line in image file.
  *
- * Include after <stdio.h>, <string.h>, and <time.h>
+ * Include after <stdio.h>
  *
  * True image orientation is defined by an xy coordinate system
  * whose origin is at the lower left corner of the image, with
@@ -15,12 +15,11 @@
  */
 #ifndef _RAD_RESOLU_H_
 #define _RAD_RESOLU_H_
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "copyright.h"
-
 			/* flags for scanline ordering */
 #define  XDECR			1
 #define  YDECR			2
@@ -28,7 +27,7 @@ extern "C" {
 
 			/* standard scanline ordering */
 #define  PIXSTANDARD		(YMAJOR|YDECR)
-#define  PIXSTDFMT		"-Y %d +X %d\n"
+#define  PIXSTDFMT		"-Y %8d +X %8d\n"
 
 			/* structure for image dimensions */
 typedef struct {
@@ -51,29 +50,13 @@ extern char  resolu_buf[RESOLU_BUFLEN];
 
 			/* reading/writing of standard ordering */
 #define  fprtresolu(sl,ns,fp)	fprintf(fp,PIXSTDFMT,ns,sl)
-#define  fscnresolu(sl,ns,fp)	(fscanf(fp,PIXSTDFMT,ns,sl)==2)
+#define  fscnresolu(sl,ns,fp)	(fgetresolu(sl,ns,fp)==PIXSTANDARD)
 
-					/* defined in resolu.c */
+			/* defined in resolu.c */
 extern void	fputresolu(int ord, int sl, int ns, FILE *fp);
 extern int	fgetresolu(int *sl, int *ns, FILE *fp);
 extern char *	resolu2str(char *buf, RESOLU *rp);
 extern int	str2resolu(RESOLU *rp, char *buf);
-					/* defined in header.c */
-extern void	newheader(char *t, FILE *fp);
-extern int	isheadid(char *s);
-extern int	headidval(char *r, char *s);
-extern int	dateval(time_t *t, char *s);
-extern int	isdate(char *s);
-extern void	fputdate(time_t t, FILE *fp);
-extern void	fputnow(FILE *fp);
-extern void	printargs(int ac, char **av, FILE *fp);
-extern int	isformat(char *s);
-extern int	formatval(char *r, char *s);
-extern void	fputformat(char *s, FILE *fp);
-extern int	getheader(FILE *fp, int (*f)(), char *p);
-extern int	globmatch(char *pat, char *str);
-extern int	checkheader(FILE *fin, char *fmt, FILE *fout);
-
 
 #ifdef __cplusplus
 }