projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19980810
[rocksndiamonds.git]
/
src
/
gfxloader.c
diff --git
a/src/gfxloader.c
b/src/gfxloader.c
index d0bd1cbae59fb299998e9b8c26c3c456344590fd..c84a3cd711a00b8dd5176894fe907decbeb88cfd 100644
(file)
--- a/
src/gfxloader.c
+++ b/
src/gfxloader.c
@@
-779,10
+779,18
@@
static int ConvertXImageDepth(Display *display, XImage **image)
register int dwx, dwy;
byte *data;
register int dwx, dwy;
byte *data;
- data = (byte *)malloc(width * height);
+ data = (byte *)malloc(width * height
* depth
);
old_image = *image;
old_image = *image;
+
+ /*
new_image = XCreateImage(display,visual,depth,
ZPixmap,0,data,width,height,8,0);
new_image = XCreateImage(display,visual,depth,
ZPixmap,0,data,width,height,8,0);
+ */
+
+ new_image = XGetImage(display,RootWindow(display,screen),
+ 0,0,width,height,0xffffffff,ZPixmap);
+
+
if (!new_image)
return(GIF_NoMemory);
if (!new_image)
return(GIF_NoMemory);
@@
-811,13
+819,17
@@
static int ConvertXImageDepth(Display *display, XImage **image)
}
else /* other format change than 8 bit -> 4 bit */
{
}
else /* other format change than 8 bit -> 4 bit */
{
-
register
unsigned long pixel_value;
+ unsigned long pixel_value;
for (dwx=0; dwx<width; dwx++)
{
for (dwy=0; dwy<height; dwy++)
{
pixel_value = XGetPixel(old_image, dwx, dwy);
for (dwx=0; dwx<width; dwx++)
{
for (dwy=0; dwy<height; dwy++)
{
pixel_value = XGetPixel(old_image, dwx, dwy);
+
+ if (pixel_value > 0xff)
+ printf("pixel = %lx", pixel_value);
+
XPutPixel(new_image, dwx, dwy, pixel_value);
}
}
XPutPixel(new_image, dwx, dwy, pixel_value);
}
}