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

Comparing ray/src/common/xraster.c (file contents):
Revision 2.1 by greg, Tue Nov 12 16:54:38 1991 UTC vs.
Revision 2.2 by greg, Fri Feb 21 22:27:52 2003 UTC

# Line 1 | Line 1
1 /* Copyright 1988 Regents of the University of California */
2
3 #ifndef lint
4 static char SCCSid[] = "$SunId$ LBL";
5 #endif
6
1   /*
2   * xraster.c - routines to handle images for X windows.
3 + */
4 +
5 + /* ====================================================================
6 + * The Radiance Software License, Version 1.0
7   *
8 < *      2/18/88
8 > * Copyright (c) 1990 - 2002 The Regents of the University of California,
9 > * through Lawrence Berkeley National Laboratory.   All rights reserved.
10 > *
11 > * Redistribution and use in source and binary forms, with or without
12 > * modification, are permitted provided that the following conditions
13 > * are met:
14 > *
15 > * 1. Redistributions of source code must retain the above copyright
16 > *         notice, this list of conditions and the following disclaimer.
17 > *
18 > * 2. Redistributions in binary form must reproduce the above copyright
19 > *       notice, this list of conditions and the following disclaimer in
20 > *       the documentation and/or other materials provided with the
21 > *       distribution.
22 > *
23 > * 3. The end-user documentation included with the redistribution,
24 > *           if any, must include the following acknowledgment:
25 > *             "This product includes Radiance software
26 > *                 (http://radsite.lbl.gov/)
27 > *                 developed by the Lawrence Berkeley National Laboratory
28 > *               (http://www.lbl.gov/)."
29 > *       Alternately, this acknowledgment may appear in the software itself,
30 > *       if and wherever such third-party acknowledgments normally appear.
31 > *
32 > * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
33 > *       and "The Regents of the University of California" must
34 > *       not be used to endorse or promote products derived from this
35 > *       software without prior written permission. For written
36 > *       permission, please contact [email protected].
37 > *
38 > * 5. Products derived from this software may not be called "Radiance",
39 > *       nor may "Radiance" appear in their name, without prior written
40 > *       permission of Lawrence Berkeley National Laboratory.
41 > *
42 > * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
43 > * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
44 > * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
45 > * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
46 > * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
47 > * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
48 > * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
49 > * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
50 > * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
51 > * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
52 > * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
53 > * SUCH DAMAGE.
54 > * ====================================================================
55 > *
56 > * This software consists of voluntary contributions made by many
57 > * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
58 > * information on Lawrence Berkeley National Laboratory, please see
59 > * <http://www.lbl.gov/>.
60   */
61  
62   #include <stdio.h>
# Line 33 | Line 82 | register XRASTER       *xr;
82          if (xr->pixels == NULL)
83                  return(NULL);
84          if (XGetColorCells(0, xr->ncolors, 0, &j, xr->pixels) == 0) {
85 <                free((char *)xr->pixels);
85 >                free((void *)xr->pixels);
86                  xr->pixels = NULL;
87                  return(NULL);
88          }
# Line 86 | Line 135 | register XRASTER       *xr;
135          if (xr->pixels == NULL)
136                  return;
137          XFreeColors(xr->pixels, xr->ncolors, 0);
138 <        free((char *)xr->pixels);
138 >        free((void *)xr->pixels);
139          xr->pixels = NULL;
140   }
141  
# Line 107 | Line 156 | register XRASTER       *xr;
156          free_rpixmap(xr);
157          if (xr->ncolors > 0) {
158                  unmap_rcolors(xr);
159 <                free((char *)xr->data.bz);
160 <                free((char *)xr->pmap);
161 <                free((char *)xr->cdefs);
159 >                free((void *)xr->data.bz);
160 >                free((void *)xr->pmap);
161 >                free((void *)xr->cdefs);
162          } else
163 <                free((char *)xr->data.m);
164 <        free((char *)xr);
163 >                free((void *)xr->data.m);
164 >        free((void *)xr);
165   }
166  
167  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines