ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/tmapcolrs.c
(Generate patch)

Comparing ray/src/common/tmapcolrs.c (file contents):
Revision 3.10 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 3.16 by schorsch, Sat Oct 23 18:55:52 2004 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7   * Externals declared in tonemap.h
8   */
9  
10 < /* ====================================================================
11 < * The Radiance Software License, Version 1.0
12 < *
13 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
14 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
15 < *
16 < * Redistribution and use in source and binary forms, with or without
17 < * modification, are permitted provided that the following conditions
18 < * are met:
19 < *
20 < * 1. Redistributions of source code must retain the above copyright
21 < *         notice, this list of conditions and the following disclaimer.
22 < *
23 < * 2. Redistributions in binary form must reproduce the above copyright
24 < *       notice, this list of conditions and the following disclaimer in
25 < *       the documentation and/or other materials provided with the
26 < *       distribution.
27 < *
28 < * 3. The end-user documentation included with the redistribution,
29 < *           if any, must include the following acknowledgment:
30 < *             "This product includes Radiance software
31 < *                 (http://radsite.lbl.gov/)
32 < *                 developed by the Lawrence Berkeley National Laboratory
33 < *               (http://www.lbl.gov/)."
34 < *       Alternately, this acknowledgment may appear in the software itself,
35 < *       if and wherever such third-party acknowledgments normally appear.
36 < *
37 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
38 < *       and "The Regents of the University of California" must
39 < *       not be used to endorse or promote products derived from this
40 < *       software without prior written permission. For written
41 < *       permission, please contact [email protected].
42 < *
43 < * 5. Products derived from this software may not be called "Radiance",
44 < *       nor may "Radiance" appear in their name, without prior written
45 < *       permission of Lawrence Berkeley National Laboratory.
46 < *
47 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
48 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
49 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
50 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
51 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
52 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
53 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
54 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
55 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
57 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 < * SUCH DAMAGE.
59 < * ====================================================================
60 < *
61 < * This software consists of voluntary contributions made by many
62 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
63 < * information on Lawrence Berkeley National Laboratory, please see
64 < * <http://www.lbl.gov/>.
65 < */
10 > #include "copyright.h"
11  
12   #include        <stdio.h>
13   #include        <string.h>
14   #include        <math.h>
15   #include        <time.h>
16 +
17   #include        "tmprivat.h"
18   #include        "resolu.h"
19 + #include        "rtprocess.h"
20  
21   #ifndef TM_PIC_CTRANS
22   #define TM_PIC_CTRANS   1               /* transform colors? (expensive) */
# Line 83 | Line 30 | typedef struct {
30          TMbright        inpsfb;         /* encoded tm->inpsf */
31   } COLRDATA;
32  
86 #ifdef NOPROTO
87 static MEM_PTR  colrInit();
88 static void     colrNewSpace();
89 #else
33   static MEM_PTR  colrInit(struct tmStruct *);
34   static void     colrNewSpace(struct tmStruct *);
35 < #endif
35 > static gethfunc headline;
36 >
37   static struct tmPackage colrPkg = {     /* our package functions */
38          colrInit, colrNewSpace, free
39   };
# Line 113 | Line 57 | int    len;
57  
58          if (tmTop == NULL)
59                  returnErr(TM_E_TMINVAL);
60 <        if (ls == NULL | scan == NULL | len < 0)
60 >        if ((ls == NULL) | (scan == NULL) | (len < 0))
61                  returnErr(TM_E_ILLEGAL);
62   #if TM_PIC_CTRANS
63          if (tmNeedMatrix(tmTop)) {              /* need floating point */
# Line 172 | Line 116 | int    len;
116                  } else if (tmTop->flags & TM_F_BW) {
117                          cmon[RED] = cmon[GRN] = cmon[BLU] = li;
118                  }
119 <                bi = ( (int4)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8;
119 >                bi = ( (int32)GAMTSZ*cd->clfb[RED]*cmon[RED]/li ) >> 8;
120                  cs[3*i  ] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
121 <                bi = ( (int4)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 8;
121 >                bi = ( (int32)GAMTSZ*cd->clfb[GRN]*cmon[GRN]/li ) >> 8;
122                  cs[3*i+1] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
123 <                bi = ( (int4)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 8;
123 >                bi = ( (int32)GAMTSZ*cd->clfb[BLU]*cmon[BLU]/li ) >> 8;
124                  cs[3*i+2] = bi>=GAMTSZ ? 255 : cd->gamb[bi];
125          }
126          returnOK;
# Line 197 | Line 141 | static struct radhead {
141  
142  
143   static int
144 < headline(s, rh)                 /* grok a header line */
145 < register char   *s;
146 < register struct radhead *rh;
144 > headline(                       /* grok a header line */
145 >        register char   *s,
146 >        void    *vrh
147 > )
148   {
149          char    fmt[32];
150 +        register struct radhead *rh = vrh;
151  
152          if (formatval(fmt, s)) {
153                  if (!strcmp(fmt, COLRFMT))
# Line 242 | Line 188 | FILE   *fp;
188                                                  /* check arguments */
189          if (tmTop == NULL)
190                  returnErr(TM_E_TMINVAL);
191 <        if (lpp == NULL | xp == NULL | yp == NULL |
192 <                        (fname == NULL & fp == TM_GETFILE))
191 >        if ((lpp == NULL) | (xp == NULL) | (yp == NULL) |
192 >                        ((fname == NULL) & (fp == TM_GETFILE)))
193                  returnErr(TM_E_ILLEGAL);
194          *xp = *yp = 0;                          /* error precaution */
195          if ((inpf = fp) == TM_GETFILE && (inpf = fopen(fname, "r")) == NULL)
# Line 251 | Line 197 | FILE   *fp;
197          *lpp = NULL;
198          if (cpp != TM_NOCHROMP) *cpp = NULL;
199          info = rhdefault;                       /* get our header */
200 <        getheader(inpf, headline, (char *)&info);
201 <        if (info.format == FMTBAD | info.expos <= 0. ||
200 >        getheader(inpf, headline, &info);
201 >        if ((info.format == FMTBAD) | (info.expos <= 0.) ||
202                          fgetresolu(xp, yp, inpf) < 0) {
203                  err = TM_E_BADFILE; goto done;
204          }
# Line 305 | Line 251 | done:                                          /* clean up */
251  
252  
253   #ifdef PCOND
254 < int                                     /* run pcond to map picture */
254 > static int                                      /* run pcond to map picture */
255   dopcond(psp, xp, yp, flags, monpri, gamval, Lddyn, Ldmax, fname)
256   BYTE    **psp;
257   int     *xp, *yp;
# Line 360 | Line 306 | char   *fname;
306                  rp = (BYTE *)malloc(sizeof(BYTE) * *xp * *yp);
307          else
308                  rp = (BYTE *)malloc(3*sizeof(BYTE) * *xp * *yp);
309 <        if ((*psp = rp) == NULL | scan == NULL) {
309 >        if (((*psp = rp) == NULL) | (scan == NULL)) {
310                  pclose(infp);
311                  returnErr(TM_E_NOMEM);
312          }
# Line 406 | Line 352 | FILE   *fp;
352          TMbright        *lp;
353          int     err;
354                                                  /* check arguments */
355 <        if (psp == NULL | xp == NULL | yp == NULL | monpri == NULL |
356 <                        (fname == NULL & fp == TM_GETFILE))
355 >        if ((psp == NULL) | (xp == NULL) | (yp == NULL) | (monpri == NULL) |
356 >                        ((fname == NULL) & (fp == TM_GETFILE)))
357                  returnErr(TM_E_ILLEGAL);
358                                                  /* set defaults */
359          if (gamval < MINGAM) gamval = DEFGAM;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines