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

Comparing ray/src/px/x11raster.c (file contents):
Revision 2.5 by greg, Wed May 27 14:28:54 1992 UTC vs.
Revision 2.7 by greg, Mon Oct 12 14:52:19 1992 UTC

# Line 14 | Line 14 | static char SCCSid[] = "$SunId$ LBL";
14   #include <X11/Xlib.h>
15   #include <X11/Xutil.h>
16  
17 + #include "color.h"
18   #include "x11raster.h"
19  
20  
# Line 41 | Line 42 | int    bm_pad;
42                  xr->image = XCreateImage(disp,vis->visual,vis->depth,
43                                  ZPixmap,0,data,width,height,bm_pad,0);
44          xr->image->bitmap_bit_order = MSBFirst;
45 +        xr->image->bitmap_unit = bm_pad;
46          xr->image->byte_order = *(char *)&swaptest ? LSBFirst : MSBFirst;
47          if (vis->depth >= 24 && (xr->image->red_mask != 0xff ||
48                          xr->image->green_mask != 0xff00 ||
# Line 58 | Line 60 | int    bm_pad;
60  
61  
62   int
63 < init_rcolors(xr, rmap, gmap, bmap)              /* initialize colors */
63 > init_rcolors(xr, cmap)                  /* initialize colors */
64   register XRASTER        *xr;
65 < int     rmap[256], gmap[256], bmap[256];
65 > BYTE    cmap[][3];
66   {
67          register unsigned char  *p;
68          register int    i;
69  
70 <        if (xr->image->depth != 8 || xr->ncolors != 0)
70 >        if (xr->image->depth > 8 | xr->ncolors != 0)
71                  return(xr->ncolors);
72          xr->pmap = (short *)malloc(256*sizeof(short));
73          if (xr->pmap == NULL)
# Line 79 | Line 81 | int    rmap[256], gmap[256], bmap[256];
81                          i = xr->image->width*xr->image->height;
82                          i--; p++)
83                  if (xr->pmap[*p] == -1) {
84 <                        xr->cdefs[xr->ncolors].red = rmap[*p] << 8;
85 <                        xr->cdefs[xr->ncolors].green = gmap[*p] << 8;
86 <                        xr->cdefs[xr->ncolors].blue = bmap[*p] << 8;
84 >                        xr->cdefs[xr->ncolors].red = cmap[*p][RED] << 8;
85 >                        xr->cdefs[xr->ncolors].green = cmap[*p][GRN] << 8;
86 >                        xr->cdefs[xr->ncolors].blue = cmap[*p][BLU] << 8;
87                          xr->cdefs[xr->ncolors].pixel = *p;
88                          xr->cdefs[xr->ncolors].flags = DoRed|DoGreen|DoBlue;
89                          xr->pmap[*p] = xr->ncolors++;
# Line 146 | Line 148 | Window w;
148          register int    i;
149          register unsigned char  *p;
150  
151 <        if (xr->ncolors == 0 || xr->image->depth != 8)
151 >        if (xr->ncolors == 0 || xr->image->depth > 8)
152                  return(NULL);
153          if (xr->pixels != NULL)
154                  return(xr->pixels);
# Line 189 | Line 191 | Window w;
191  
192  
193   Pixmap
194 < make_rpixmap(xr, d)                     /* make pixmap for raster */
194 > make_rpixmap(xr, w)                     /* make pixmap for raster */
195   register XRASTER        *xr;
196 < Drawable        d;
196 > Window  w;
197   {
198 +        XWindowAttributes       xwattr;
199          Pixmap  pm;
200  
201          if (xr->pm != 0)
202                  return(xr->pm);
203 <        pm = XCreatePixmap(xr->disp, d,
203 >        XGetWindowAttributes(xr->disp, w, &xwattr);
204 >        pm = XCreatePixmap(xr->disp, w,
205                          xr->image->width, xr->image->height,
206 <                        xr->image->depth);
206 >                        xwattr.depth);
207          if (pm == 0)
208                  return(0);
209          put_raster(pm, 0, 0, xr);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines