| 14 |
|
#include <X11/Xlib.h> |
| 15 |
|
#include <X11/Xutil.h> |
| 16 |
|
|
| 17 |
+ |
#include "color.h" |
| 18 |
|
#include "x11raster.h" |
| 19 |
|
|
| 20 |
+ |
extern char *malloc(), *realloc(), *calloc(); |
| 21 |
|
|
| 22 |
+ |
|
| 23 |
|
XRASTER * |
| 24 |
|
make_raster(disp, vis, npixbits, data, width, height, bm_pad) |
| 25 |
|
Display *disp; |
| 62 |
|
|
| 63 |
|
|
| 64 |
|
int |
| 65 |
< |
init_rcolors(xr, rmap, gmap, bmap) /* initialize colors */ |
| 65 |
> |
init_rcolors(xr, cmap) /* initialize colors */ |
| 66 |
|
register XRASTER *xr; |
| 67 |
< |
int rmap[256], gmap[256], bmap[256]; |
| 67 |
> |
BYTE cmap[][3]; |
| 68 |
|
{ |
| 69 |
|
register unsigned char *p; |
| 70 |
|
register int i; |
| 71 |
|
|
| 72 |
< |
if (xr->image->depth > 8 || xr->ncolors != 0) |
| 72 |
> |
if (xr->image->depth > 8 | xr->ncolors != 0) |
| 73 |
|
return(xr->ncolors); |
| 74 |
|
xr->pmap = (short *)malloc(256*sizeof(short)); |
| 75 |
|
if (xr->pmap == NULL) |
| 83 |
|
i = xr->image->width*xr->image->height; |
| 84 |
|
i--; p++) |
| 85 |
|
if (xr->pmap[*p] == -1) { |
| 86 |
< |
xr->cdefs[xr->ncolors].red = rmap[*p] << 8; |
| 87 |
< |
xr->cdefs[xr->ncolors].green = gmap[*p] << 8; |
| 88 |
< |
xr->cdefs[xr->ncolors].blue = bmap[*p] << 8; |
| 86 |
> |
xr->cdefs[xr->ncolors].red = cmap[*p][RED] << 8; |
| 87 |
> |
xr->cdefs[xr->ncolors].green = cmap[*p][GRN] << 8; |
| 88 |
> |
xr->cdefs[xr->ncolors].blue = cmap[*p][BLU] << 8; |
| 89 |
|
xr->cdefs[xr->ncolors].pixel = *p; |
| 90 |
|
xr->cdefs[xr->ncolors].flags = DoRed|DoGreen|DoBlue; |
| 91 |
|
xr->pmap[*p] = xr->ncolors++; |
