--- ray/src/common/resolu.h	1991/11/11 14:03:22	1.1
+++ ray/src/common/resolu.h	2003/10/27 10:19:31	2.8
@@ -1,10 +1,9 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: resolu.h,v 2.8 2003/10/27 10:19:31 schorsch Exp $ */
 /*
  * Definitions for resolution line in image file.
  *
+ * Include after <stdio.h>, <string.h>, and <time.h>
+ *
  * True image orientation is defined by an xy coordinate system
  * whose origin is at the lower left corner of the image, with
  * x increasing to the right and y increasing in the upward direction.
@@ -14,7 +13,16 @@
  * A typical line for a 1024x600 image might be "-Y 600 +X 1024\n",
  * indicating that the scanlines are in English text order (PIXSTANDARD).
  */
+#ifndef _RAD_RESOLU_H_
+#define _RAD_RESOLU_H_
 
+#include <time.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 			/* flags for scanline ordering */
 #define  XDECR			1
 #define  YDECR			2
@@ -26,13 +34,13 @@
 
 			/* structure for image dimensions */
 typedef struct {
-	int	or;		/* orientation (from flags above) */
+	int	rt;		/* orientation (from flags above) */
 	int	xr, yr;		/* x and y resolution */
 } RESOLU;
 
 			/* macros to get scanline length and number */
-#define  scanlen(rs)		((rs)->or & YMAJOR ? (rs)->xr : (rs)->yr)
-#define  numscans(rs)		((rs)->or & YMAJOR ? (rs)->yr : (rs)->xr)
+#define  scanlen(rs)		((rs)->rt & YMAJOR ? (rs)->xr : (rs)->yr)
+#define  numscans(rs)		((rs)->rt & YMAJOR ? (rs)->yr : (rs)->xr)
 
 			/* resolution string buffer and its size */
 #define  RESOLU_BUFLEN		32
@@ -47,4 +55,29 @@ extern char  resolu_buf[RESOLU_BUFLEN];
 #define  fprtresolu(sl,ns,fp)	fprintf(fp,PIXSTDFMT,ns,sl)
 #define  fscnresolu(sl,ns,fp)	(fscanf(fp,PIXSTDFMT,ns,sl)==2)
 
-extern char  *fgets(), *resolu2str();
+					/* 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
+}
+#endif
+#endif /* _RAD_RESOLU_H_ */
+