--- ray/src/common/tmapcolrs.c 2003/02/22 02:07:22 3.10
+++ ray/src/common/tmapcolrs.c 2003/07/27 22:12:01 3.14
@@ -1,5 +1,5 @@
#ifndef lint
-static const char RCSid[] = "$Id: tmapcolrs.c,v 3.10 2003/02/22 02:07:22 greg Exp $";
+static const char RCSid[] = "$Id: tmapcolrs.c,v 3.14 2003/07/27 22:12:01 schorsch Exp $";
#endif
/*
* Routines for tone mapping on Radiance RGBE and XYZE pictures.
@@ -7,62 +7,7 @@ static const char RCSid[] = "$Id: tmapcolrs.c,v 3.10 2
* Externals declared in tonemap.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 "copyright.h"
#include
#include
@@ -113,7 +58,7 @@ int len;
if (tmTop == NULL)
returnErr(TM_E_TMINVAL);
- if (ls == NULL | scan == NULL | len < 0)
+ if ((ls == NULL) | (scan == NULL) | (len < 0))
returnErr(TM_E_ILLEGAL);
#if TM_PIC_CTRANS
if (tmNeedMatrix(tmTop)) { /* need floating point */
@@ -172,11 +117,11 @@ int len;
} else if (tmTop->flags & TM_F_BW) {
cmon[RED] = cmon[GRN] = cmon[BLU] = li;
}
- bi = ( (int4)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8;
+ bi = ( (int32)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8;
cs[3*i ] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
- bi = ( (int4)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 8;
+ bi = ( (int32)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 8;
cs[3*i+1] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
- bi = ( (int4)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 8;
+ bi = ( (int32)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 8;
cs[3*i+2] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
}
returnOK;
@@ -242,8 +187,8 @@ FILE *fp;
/* check arguments */
if (tmTop == NULL)
returnErr(TM_E_TMINVAL);
- if (lpp == NULL | xp == NULL | yp == NULL |
- (fname == NULL & fp == TM_GETFILE))
+ if ((lpp == NULL) | (xp == NULL) | (yp == NULL) |
+ ((fname == NULL) & (fp == TM_GETFILE)))
returnErr(TM_E_ILLEGAL);
*xp = *yp = 0; /* error precaution */
if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "r")) == NULL)
@@ -252,7 +197,7 @@ FILE *fp;
if (cpp != TM_NOCHROMP) *cpp = NULL;
info = rhdefault; /* get our header */
getheader(inpf, headline, (char *)&info);
- if (info.format == FMTBAD | info.expos <= 0. ||
+ if ((info.format == FMTBAD) | (info.expos <= 0.) ||
fgetresolu(xp, yp, inpf) < 0) {
err = TM_E_BADFILE; goto done;
}
@@ -305,7 +250,7 @@ done: /* clean up */
#ifdef PCOND
-int /* run pcond to map picture */
+static int /* run pcond to map picture */
dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname)
BYTE **psp;
int *xp, *yp;
@@ -360,7 +305,7 @@ char *fname;
rp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp);
else
rp = (BYTE *)malloc(3*sizeof(BYTE) * *xp * *yp);
- if ((*psp = rp) == NULL | scan == NULL) {
+ if (((*psp = rp) == NULL) | (scan == NULL)) {
pclose(infp);
returnErr(TM_E_NOMEM);
}
@@ -406,8 +351,8 @@ FILE *fp;
TMbright *lp;
int err;
/* check arguments */
- if (psp == NULL | xp == NULL | yp == NULL | monpri == NULL |
- (fname == NULL & fp == TM_GETFILE))
+ if ((psp == NULL) | (xp == NULL) | (yp == NULL) | (monpri == NULL) |
+ ((fname == NULL) & (fp == TM_GETFILE)))
returnErr(TM_E_ILLEGAL);
/* set defaults */
if (gamval < MINGAM) gamval = DEFGAM;