--- ray/src/common/colrops.c 2003/02/22 02:07:22 2.6
+++ ray/src/common/colrops.c 2023/12/18 18:54:38 2.13
@@ -1,91 +1,37 @@
#ifndef lint
-static const char RCSid[] = "$Id: colrops.c,v 2.6 2003/02/22 02:07:22 greg Exp $";
+static const char RCSid[] = "$Id: colrops.c,v 2.13 2023/12/18 18:54:38 greg Exp $";
#endif
/*
* Integer operations on COLR scanlines
*/
-/* ====================================================================
- * 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
+
+#include "rtmisc.h"
#include "color.h"
-#define NULL 0
-extern char *bmalloc();
-
#define MAXGSHIFT 31 /* maximum shift for gamma table */
-static BYTE *g_mant = NULL, *g_nexp = NULL;
+static uby8 *g_mant = NULL, *g_nexp = NULL;
-static BYTE (*g_bval)[256] = NULL;
+static uby8 (*g_bval)[256] = NULL;
int
-setcolrcor(f, a2) /* set brightness correction */
-double (*f)();
-double a2;
+setcolrcor( /* set brightness correction */
+ double (*f)(double,double),
+ double a2
+)
{
double mult;
- register int i, j;
+ int i, j;
/* allocate tables */
if (g_bval == NULL && (g_bval =
- (BYTE (*)[256])bmalloc((MAXGSHIFT+1)*256)) == NULL)
+ (uby8 (*)[256])bmalloc((MAXGSHIFT+1)*256)) == NULL)
return(-1);
/* compute colr -> gamb mapping */
mult = 1.0/256.0;
@@ -99,16 +45,17 @@ double a2;
int
-setcolrinv(f, a2) /* set inverse brightness correction */
-double (*f)();
-double a2;
+setcolrinv( /* set inverse brightness correction */
+ double (*f)(double,double),
+ double a2
+)
{
double mult;
- register int i, j;
+ int i, j;
/* allocate tables */
- if (g_mant == NULL && (g_mant = (BYTE *)bmalloc(256)) == NULL)
+ if (g_mant == NULL && (g_mant = (uby8 *)bmalloc(256)) == NULL)
return(-1);
- if (g_nexp == NULL && (g_nexp = (BYTE *)bmalloc(256)) == NULL)
+ if (g_nexp == NULL && (g_nexp = (uby8 *)bmalloc(256)) == NULL)
return(-1);
/* compute gamb -> colr mapping */
i = 0;
@@ -125,8 +72,9 @@ double a2;
int
-setcolrgam(g) /* set gamma conversion */
-double g;
+setcolrgam( /* set gamma conversion */
+ double g
+)
{
if (setcolrcor(pow, 1.0/g) < 0)
return(-1);
@@ -135,11 +83,12 @@ double g;
int
-colrs_gambs(scan, len) /* convert scanline of colrs to gamma bytes */
-register COLR *scan;
-int len;
+colrs_gambs( /* convert scanline of colrs to gamma bytes */
+ COLR *scan,
+ int len
+)
{
- register int i, expo;
+ int i, expo;
if (g_bval == NULL)
return(-1);
@@ -185,13 +134,14 @@ int len;
int
-gambs_colrs(scan, len) /* convert gamma bytes to colr scanline */
-register COLR *scan;
-int len;
+gambs_colrs( /* convert gamma bytes to colr scanline */
+ COLR *scan,
+ int len
+)
{
- register int nexpo;
+ int nexpo;
- if (g_mant == NULL | g_nexp == NULL)
+ if ((g_mant == NULL) | (g_nexp == NULL))
return(-1);
while (len-- > 0) {
nexpo = g_nexp[scan[0][RED]];
@@ -222,10 +172,11 @@ int len;
void
-shiftcolrs(scan, len, adjust) /* shift a scanline of colors by 2^adjust */
-register COLR *scan;
-register int len;
-register int adjust;
+shiftcolrs( /* shift a scanline of colors by 2^adjust */
+ COLR *scan,
+ int len,
+ int adjust
+)
{
int minexp;
@@ -244,13 +195,14 @@ register int adjust;
void
-normcolrs(scan, len, adjust) /* normalize a scanline of colrs */
-register COLR *scan;
-int len;
-int adjust;
+normcolrs( /* normalize a scanline of colrs */
+ COLR *scan,
+ int len,
+ int adjust
+)
{
- register int c;
- register int shift;
+ int c;
+ int shift;
while (len-- > 0) {
shift = scan[0][EXP] + adjust - COLXS;