nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix reduce color depth to not use original data

Browse source 
(and break parentrel)
This commit is contained in:
Derek Foreman 2003-04-06 18:03:59 +00:00
parent 70e4138169
commit 8ebf2b6a3f
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
render/color.c
View file

@ -65,12 +65,11 @@ void color_free(color_rgb *c)
void reduce_depth(pixel32 *data, XImage *im) void reduce_depth(pixel32 *data, XImage *im)
{ {
/* since pixel32 is the largest possible pixel size, we can share the
array*/
int r, g, b; int r, g, b;
int x,y; int x,y;
pixel16 *p16 = (pixel16*) data; pixel32 *p32 = (pixel32 *) im->data;
unsigned char *p8 = (unsigned char *)data; pixel16 *p16 = (pixel16 *) im->data;
unsigned char *p8 = (unsigned char *)im->data;
switch (im->bits_per_pixel) { switch (im->bits_per_pixel) {
case 32: case 32:
if ((render_red_offset != default_red_shift) || if ((render_red_offset != default_red_shift) ||
@ -81,12 +80,14 @@ void reduce_depth(pixel32 *data, XImage *im)
r = (data[x] >> default_red_shift) & 0xFF; r = (data[x] >> default_red_shift) & 0xFF;
g = (data[x] >> default_green_shift) & 0xFF; g = (data[x] >> default_green_shift) & 0xFF;
b = (data[x] >> default_blue_shift) & 0xFF; b = (data[x] >> default_blue_shift) & 0xFF;
data[x] = (r << render_red_offset) + (g << render_green_offset) + p32[x] = (r << render_red_offset)
(b << render_blue_offset); + (g << render_green_offset)
+ (b << render_blue_offset);
} }
data += im->width; data += im->width;
p32 += im->width;
} }
} } else im->data = data;
break; break;
case 16: case 16:
for (y = 0; y < im->height; y++) { for (y = 0; y < im->height; y++) {

10
render/render.c
View file

@ -377,17 +377,23 @@ void appearance_free(Appearance *a)
void pixel32_to_pixmap(pixel32 *in, Pixmap out, int x, int y, int w, int h) void pixel32_to_pixmap(pixel32 *in, Pixmap out, int x, int y, int w, int h)
{ {
unsigned char *scratch;
XImage *im = NULL; XImage *im = NULL;
im = XCreateImage(ob_display, render_visual, render_depth, im = XCreateImage(ob_display, render_visual, render_depth,
ZPixmap, 0, NULL, w, h, 32, 0); ZPixmap, 0, NULL, w, h, 32, 0);
g_assert(im != NULL); g_assert(im != NULL);
im->byte_order = endian; im->byte_order = endian;
im->data = (char *)in; /* this malloc is a complete waste of time on normal 32bpp
reduce_depth((pixel32*)im->data, im); as reduce_depth just sets im->data = data and returns
*/
scratch = malloc(im->width * im->height * sizeof(pixel32));
im->data = scratch;
reduce_depth(in, im);
XPutImage(ob_display, out, DefaultGC(ob_display, ob_screen), XPutImage(ob_display, out, DefaultGC(ob_display, ob_screen),
im, 0, 0, x, y, w, h); im, 0, 0, x, y, w, h);
im->data = NULL; im->data = NULL;
XDestroyImage(im); XDestroyImage(im);
free(scratch);
} }
void appearance_minsize(Appearance *l, Size *s) void appearance_minsize(Appearance *l, Size *s)