--- ray/src/common/resolu.h 2003/02/22 02:07:22 2.3
+++ ray/src/common/resolu.h 2003/10/27 10:19:31 2.8
@@ -1,4 +1,4 @@
-/* RCSid: $Id: resolu.h,v 2.3 2003/02/22 02:07:22 greg Exp $ */
+/* RCSid $Id: resolu.h,v 2.8 2003/10/27 10:19:31 schorsch Exp $ */
/*
* Definitions for resolution line in image file.
*
@@ -13,64 +13,12 @@
* 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_
-/* ====================================================================
- * 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
- * .
- */
+#include
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -107,30 +55,7 @@ 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)
-#ifdef NOPROTO
/* defined in resolu.c */
-extern void fputresolu();
-extern int fgetresolu();
-extern char *resolu2str();
-extern int str2resolu();
- /* defined in header.c */
-extern void newheader();
-extern int isheadid();
-extern int headidval();
-extern int dateval();
-extern int isdate();
-extern void fputdate();
-extern void fputnow();
-extern void printargs();
-extern int isformat();
-extern int formatval();
-extern void fputformat();
-extern int getheader();
-extern int globmatch();
-extern int checkheader();
-
-#else
- /* 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);
@@ -151,8 +76,8 @@ 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);
-#endif
-
#ifdef __cplusplus
}
#endif
+#endif /* _RAD_RESOLU_H_ */
+