| 5 |  | * Integer operations on COLR scanlines | 
| 6 |  | */ | 
| 7 |  |  | 
| 8 | < | /* ==================================================================== | 
| 9 | < | * The Radiance Software License, Version 1.0 | 
| 10 | < | * | 
| 11 | < | * Copyright (c) 1990 - 2002 The Regents of the University of California, | 
| 12 | < | * through Lawrence Berkeley National Laboratory.   All rights reserved. | 
| 13 | < | * | 
| 14 | < | * Redistribution and use in source and binary forms, with or without | 
| 15 | < | * modification, are permitted provided that the following conditions | 
| 16 | < | * are met: | 
| 17 | < | * | 
| 18 | < | * 1. Redistributions of source code must retain the above copyright | 
| 19 | < | *         notice, this list of conditions and the following disclaimer. | 
| 20 | < | * | 
| 21 | < | * 2. Redistributions in binary form must reproduce the above copyright | 
| 22 | < | *       notice, this list of conditions and the following disclaimer in | 
| 23 | < | *       the documentation and/or other materials provided with the | 
| 24 | < | *       distribution. | 
| 25 | < | * | 
| 26 | < | * 3. The end-user documentation included with the redistribution, | 
| 27 | < | *           if any, must include the following acknowledgment: | 
| 28 | < | *             "This product includes Radiance software | 
| 29 | < | *                 (http://radsite.lbl.gov/) | 
| 30 | < | *                 developed by the Lawrence Berkeley National Laboratory | 
| 31 | < | *               (http://www.lbl.gov/)." | 
| 32 | < | *       Alternately, this acknowledgment may appear in the software itself, | 
| 33 | < | *       if and wherever such third-party acknowledgments normally appear. | 
| 34 | < | * | 
| 35 | < | * 4. The names "Radiance," "Lawrence Berkeley National Laboratory" | 
| 36 | < | *       and "The Regents of the University of California" must | 
| 37 | < | *       not be used to endorse or promote products derived from this | 
| 38 | < | *       software without prior written permission. For written | 
| 39 | < | *       permission, please contact [email protected]. | 
| 40 | < | * | 
| 41 | < | * 5. Products derived from this software may not be called "Radiance", | 
| 42 | < | *       nor may "Radiance" appear in their name, without prior written | 
| 43 | < | *       permission of Lawrence Berkeley National Laboratory. | 
| 44 | < | * | 
| 45 | < | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED | 
| 46 | < | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 
| 47 | < | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 
| 48 | < | * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR | 
| 49 | < | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
| 50 | < | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 
| 51 | < | * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | 
| 52 | < | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | 
| 53 | < | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 
| 54 | < | * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | 
| 55 | < | * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 
| 56 | < | * SUCH DAMAGE. | 
| 57 | < | * ==================================================================== | 
| 58 | < | * | 
| 59 | < | * This software consists of voluntary contributions made by many | 
| 60 | < | * individuals on behalf of Lawrence Berkeley National Laboratory.   For more | 
| 61 | < | * information on Lawrence Berkeley National Laboratory, please see | 
| 62 | < | * <http://www.lbl.gov/>. | 
| 63 | < | */ | 
| 8 | > | #include "copyright.h" | 
| 9 |  |  | 
| 10 | + | #include <stdio.h> | 
| 11 |  | #include <math.h> | 
| 12 | + |  | 
| 13 | + | #include "rtmisc.h" | 
| 14 |  | #include "color.h" | 
| 15 |  |  | 
| 68 | – | #define NULL            0 | 
| 16 |  |  | 
| 70 | – | extern char     *bmalloc(); | 
| 71 | – |  | 
| 17 |  | #define MAXGSHIFT       31              /* maximum shift for gamma table */ | 
| 18 |  |  | 
| 19 | < | static BYTE     *g_mant = NULL, *g_nexp = NULL; | 
| 19 | > | static uby8     *g_mant = NULL, *g_nexp = NULL; | 
| 20 |  |  | 
| 21 | < | static BYTE     (*g_bval)[256] = NULL; | 
| 21 | > | static uby8     (*g_bval)[256] = NULL; | 
| 22 |  |  | 
| 23 |  |  | 
| 24 |  | int | 
| 25 | < | setcolrcor(f, a2)               /* set brightness correction */ | 
| 26 | < | double  (*f)(); | 
| 27 | < | double  a2; | 
| 25 | > | setcolrcor(                     /* set brightness correction */ | 
| 26 | > | double  (*f)(double,double), | 
| 27 | > | double  a2 | 
| 28 | > | ) | 
| 29 |  | { | 
| 30 |  | double  mult; | 
| 31 | < | register int    i, j; | 
| 31 | > | int     i, j; | 
| 32 |  | /* allocate tables */ | 
| 33 |  | if (g_bval == NULL && (g_bval = | 
| 34 | < | (BYTE (*)[256])bmalloc((MAXGSHIFT+1)*256)) == NULL) | 
| 34 | > | (uby8 (*)[256])bmalloc((MAXGSHIFT+1)*256)) == NULL) | 
| 35 |  | return(-1); | 
| 36 |  | /* compute colr -> gamb mapping */ | 
| 37 |  | mult = 1.0/256.0; | 
| 45 |  |  | 
| 46 |  |  | 
| 47 |  | int | 
| 48 | < | setcolrinv(f, a2)               /* set inverse brightness correction */ | 
| 49 | < | double  (*f)(); | 
| 50 | < | double  a2; | 
| 48 | > | setcolrinv(                     /* set inverse brightness correction */ | 
| 49 | > | double  (*f)(double,double), | 
| 50 | > | double  a2 | 
| 51 | > | ) | 
| 52 |  | { | 
| 53 |  | double  mult; | 
| 54 | < | register int    i, j; | 
| 54 | > | int     i, j; | 
| 55 |  | /* allocate tables */ | 
| 56 | < | if (g_mant == NULL && (g_mant = (BYTE *)bmalloc(256)) == NULL) | 
| 56 | > | if (g_mant == NULL && (g_mant = (uby8 *)bmalloc(256)) == NULL) | 
| 57 |  | return(-1); | 
| 58 | < | if (g_nexp == NULL && (g_nexp = (BYTE *)bmalloc(256)) == NULL) | 
| 58 | > | if (g_nexp == NULL && (g_nexp = (uby8 *)bmalloc(256)) == NULL) | 
| 59 |  | return(-1); | 
| 60 |  | /* compute gamb -> colr mapping */ | 
| 61 |  | i = 0; | 
| 72 |  |  | 
| 73 |  |  | 
| 74 |  | int | 
| 75 | < | setcolrgam(g)                   /* set gamma conversion */ | 
| 76 | < | double  g; | 
| 75 | > | setcolrgam(                             /* set gamma conversion */ | 
| 76 | > | double  g | 
| 77 | > | ) | 
| 78 |  | { | 
| 79 |  | if (setcolrcor(pow, 1.0/g) < 0) | 
| 80 |  | return(-1); | 
| 83 |  |  | 
| 84 |  |  | 
| 85 |  | int | 
| 86 | < | colrs_gambs(scan, len)          /* convert scanline of colrs to gamma bytes */ | 
| 87 | < | register COLR   *scan; | 
| 88 | < | int     len; | 
| 86 | > | colrs_gambs(                    /* convert scanline of colrs to gamma bytes */ | 
| 87 | > | COLR    *scan, | 
| 88 | > | int     len | 
| 89 | > | ) | 
| 90 |  | { | 
| 91 | < | register int    i, expo; | 
| 91 | > | int     i, expo; | 
| 92 |  |  | 
| 93 |  | if (g_bval == NULL) | 
| 94 |  | return(-1); | 
| 134 |  |  | 
| 135 |  |  | 
| 136 |  | int | 
| 137 | < | gambs_colrs(scan, len)          /* convert gamma bytes to colr scanline */ | 
| 138 | < | register COLR   *scan; | 
| 139 | < | int     len; | 
| 137 | > | gambs_colrs(            /* convert gamma bytes to colr scanline */ | 
| 138 | > | COLR    *scan, | 
| 139 | > | int     len | 
| 140 | > | ) | 
| 141 |  | { | 
| 142 | < | register int    nexpo; | 
| 142 | > | int     nexpo; | 
| 143 |  |  | 
| 144 | < | if (g_mant == NULL | g_nexp == NULL) | 
| 144 | > | if ((g_mant == NULL) | (g_nexp == NULL)) | 
| 145 |  | return(-1); | 
| 146 |  | while (len-- > 0) { | 
| 147 |  | nexpo = g_nexp[scan[0][RED]]; | 
| 172 |  |  | 
| 173 |  |  | 
| 174 |  | void | 
| 175 | < | shiftcolrs(scan, len, adjust)   /* shift a scanline of colors by 2^adjust */ | 
| 176 | < | register COLR   *scan; | 
| 177 | < | register int    len; | 
| 178 | < | register int    adjust; | 
| 175 | > | shiftcolrs(             /* shift a scanline of colors by 2^adjust */ | 
| 176 | > | COLR    *scan, | 
| 177 | > | int     len, | 
| 178 | > | int     adjust | 
| 179 | > | ) | 
| 180 |  | { | 
| 181 |  | int     minexp; | 
| 182 |  |  | 
| 195 |  |  | 
| 196 |  |  | 
| 197 |  | void | 
| 198 | < | normcolrs(scan, len, adjust)    /* normalize a scanline of colrs */ | 
| 199 | < | register COLR  *scan; | 
| 200 | < | int  len; | 
| 201 | < | int  adjust; | 
| 198 | > | normcolrs(              /* normalize a scanline of colrs */ | 
| 199 | > | COLR  *scan, | 
| 200 | > | int  len, | 
| 201 | > | int  adjust | 
| 202 | > | ) | 
| 203 |  | { | 
| 204 | < | register int  c; | 
| 205 | < | register int  shift; | 
| 204 | > | int  c; | 
| 205 | > | int  shift; | 
| 206 |  |  | 
| 207 |  | while (len-- > 0) { | 
| 208 |  | shift = scan[0][EXP] + adjust - COLXS; |