--- ray/src/common/resolu.h 1993/06/04 17:01:29 2.2 +++ ray/src/common/resolu.h 2003/02/22 02:07:22 2.3 @@ -1,10 +1,9 @@ -/* Copyright (c) 1991 Regents of the University of California */ - -/* SCCSid "$SunId$ LBL" */ - +/* RCSid: $Id: resolu.h,v 2.3 2003/02/22 02:07:22 greg Exp $ */ /* * Definitions for resolution line in image file. * + * Include after , , and + * * 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. @@ -15,6 +14,67 @@ * indicating that the scanlines are in English text order (PIXSTANDARD). */ +/* ==================================================================== + * 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 + * . + */ + +#ifdef __cplusplus +extern "C" { +#endif + /* flags for scanline ordering */ #define XDECR 1 #define YDECR 2 @@ -26,13 +86,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 +107,52 @@ 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 *resolu2str(); +#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); +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); + +#endif + +#ifdef __cplusplus +} +#endif