--- ray/src/common/resolu.c 1990/09/22 10:44:55 1.1
+++ ray/src/common/resolu.c 2003/02/22 02:07:22 2.3
@@ -1,57 +1,160 @@
#ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: resolu.c,v 2.3 2003/02/22 02:07:22 greg Exp $";
#endif
-
/*
* Read and write image resolutions.
+ *
+ * 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
+ * .
+ */
+
#include
+#include
+#include
-#include "color.h"
+#include "resolu.h"
-fputresolu(ord, xres, yres, fp) /* put x and y resolution */
-register int ord;
-int xres, yres;
+char resolu_buf[RESOLU_BUFLEN]; /* resolution line buffer */
+
+
+void
+fputresolu(ord, sl, ns, fp) /* put out picture dimensions */
+int ord; /* scanline ordering */
+int sl, ns; /* scanline length and number */
FILE *fp;
{
- if (ord&YMAJOR)
- fprintf(fp, "%cY %d %cX %d\n",
- ord&YDECR ? '-' : '+', yres,
- ord&XDECR ? '-' : '+', xres);
- else
- fprintf(fp, "%cX %d %cY %d\n",
- ord&XDECR ? '-' : '+', xres,
- ord&YDECR ? '-' : '+', yres);
+ RESOLU rs;
+
+ if ((rs.rt = ord) & YMAJOR) {
+ rs.xr = sl;
+ rs.yr = ns;
+ } else {
+ rs.xr = ns;
+ rs.yr = sl;
+ }
+ fputsresolu(&rs, fp);
}
-fgetresolu(xrp, yrp, fp) /* get x and y resolution */
-int *xrp, *yrp;
+int
+fgetresolu(sl, ns, fp) /* get picture dimensions */
+int *sl, *ns; /* scanline length and number */
FILE *fp;
{
- char buf[64], *xndx, *yndx;
- register char *cp;
- register int ord;
+ RESOLU rs;
- if (fgets(buf, sizeof(buf), fp) == NULL)
+ if (!fgetsresolu(&rs, fp))
return(-1);
+ if (rs.rt & YMAJOR) {
+ *sl = rs.xr;
+ *ns = rs.yr;
+ } else {
+ *sl = rs.yr;
+ *ns = rs.xr;
+ }
+ return(rs.rt);
+}
+
+
+char *
+resolu2str(buf, rp) /* convert resolution struct to line */
+char *buf;
+register RESOLU *rp;
+{
+ if (rp->rt&YMAJOR)
+ sprintf(buf, "%cY %d %cX %d\n",
+ rp->rt&YDECR ? '-' : '+', rp->yr,
+ rp->rt&XDECR ? '-' : '+', rp->xr);
+ else
+ sprintf(buf, "%cX %d %cY %d\n",
+ rp->rt&XDECR ? '-' : '+', rp->xr,
+ rp->rt&YDECR ? '-' : '+', rp->yr);
+ return(buf);
+}
+
+
+int
+str2resolu(rp, buf) /* convert resolution line to struct */
+register RESOLU *rp;
+char *buf;
+{
+ register char *xndx, *yndx;
+ register char *cp;
+
+ if (buf == NULL)
+ return(0);
xndx = yndx = NULL;
- for (cp = buf+1; *cp; cp++)
+ for (cp = buf; *cp; cp++)
if (*cp == 'X')
xndx = cp;
else if (*cp == 'Y')
yndx = cp;
if (xndx == NULL || yndx == NULL)
- return(-1);
- ord = 0;
- if (xndx > yndx) ord |= YMAJOR;
- if (xndx[-1] == '-') ord |= XDECR;
- if (yndx[-1] == '-') ord |= YDECR;
- if ((*xrp = atoi(xndx+1)) <= 0)
- return(-1);
- if ((*yrp = atoi(yndx+1)) <= 0)
- return(-1);
- return(ord);
+ return(0);
+ rp->rt = 0;
+ if (xndx > yndx) rp->rt |= YMAJOR;
+ if (xndx[-1] == '-') rp->rt |= XDECR;
+ if (yndx[-1] == '-') rp->rt |= YDECR;
+ if ((rp->xr = atoi(xndx+1)) <= 0)
+ return(0);
+ if ((rp->yr = atoi(yndx+1)) <= 0)
+ return(0);
+ return(1);
}