--- ray/src/rt/data.c 2003/02/22 02:07:28 2.15
+++ ray/src/rt/data.c 2003/07/21 22:30:19 2.23
@@ -1,81 +1,26 @@
#ifndef lint
-static const char RCSid[] = "$Id: data.c,v 2.15 2003/02/22 02:07:28 greg Exp $";
+static const char RCSid[] = "$Id: data.c,v 2.23 2003/07/21 22:30:19 schorsch Exp $";
#endif
/*
* data.c - routines dealing with interpolated data.
*/
-/* ====================================================================
- * 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 "copyright.h"
-#include "standard.h"
+#include
+#include "standard.h"
+#include "platform.h"
#include "color.h"
-
#include "resolu.h"
-
#include "data.h"
/* picture memory usage before warning */
#ifndef PSIZWARN
-#ifdef BIGMEM
-#define PSIZWARN 5000000
-#else
+#ifdef SMLMEM
#define PSIZWARN 1500000
+#else
+#define PSIZWARN 5000000
#endif
#endif
@@ -122,7 +67,7 @@ char *dname;
* 0 0 ni p0i p1i .. pni
*/
- if ((dfname = getpath(dname, getlibpath(), R_OK)) == NULL) {
+ if ((dfname = getpath(dname, getrlibpath(), R_OK)) == NULL) {
sprintf(errmsg, "cannot find data file \"%s\"", dname);
error(USER, errmsg);
}
@@ -217,7 +162,7 @@ char *pname;
COLR *scanin;
int sl, ns;
RESOLU inpres;
- FLOAT loc[2];
+ RREAL loc[2];
int y;
register int x, i;
register DATARRAY *pp;
@@ -226,7 +171,7 @@ char *pname;
if (!strcmp(pname, pp->name))
return(pp); /* found! */
- if ((pfname = getpath(pname, getlibpath(), R_OK)) == NULL) {
+ if ((pfname = getpath(pname, getrlibpath(), R_OK)) == NULL) {
sprintf(errmsg, "cannot find picture file \"%s\"", pname);
error(USER, errmsg);
}
@@ -239,9 +184,7 @@ char *pname;
sprintf(errmsg, "cannot open picture file \"%s\"", pfname);
error(SYSTEM, errmsg);
}
-#ifdef MSDOS
- setmode(fileno(fp), O_BINARY);
-#endif
+ SET_FILE_BINARY(fp);
/* get dimensions */
inpaspect = 1.0;
getheader(fp, headaspect, (char *)&inpaspect);
@@ -291,8 +234,8 @@ char *pname;
fclose(fp);
i = hash(pname);
pp[0].next = dtab[i]; /* link into picture list */
- copystruct(&pp[1], &pp[0]);
- copystruct(&pp[2], &pp[0]);
+ pp[1] = pp[0];
+ pp[2] = pp[0];
pp[0].type = RED; /* differentiate RGB records */
pp[1].type = GRN;
pp[2].type = BLU;