projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XEmacs 21.2.11
[chise/xemacs-chise.git.1]
/
src
/
glyphs-x.c
diff --git
a/src/glyphs-x.c
b/src/glyphs-x.c
index
aed51bf
..
6d5f750
100644
(file)
--- a/
src/glyphs-x.c
+++ b/
src/glyphs-x.c
@@
-124,7
+124,7
@@
convert_EImage_to_XImage (Lisp_Object device, int width, int height,
Colormap cmap;
Visual *vis;
XImage *outimg;
Colormap cmap;
Visual *vis;
XImage *outimg;
- int depth, bitmap_pad, byte_cnt, i, j;
+ int depth, bitmap_pad, bits_per_pixel, byte_cnt, i, j;
int rd,gr,bl,q;
unsigned char *data, *ip, *dp;
quant_table *qtable = 0;
int rd,gr,bl,q;
unsigned char *data, *ip, *dp;
quant_table *qtable = 0;
@@
-149,13
+149,15
@@
convert_EImage_to_XImage (Lisp_Object device, int width, int height,
bitmap_pad = ((depth > 16) ? 32 :
(depth > 8) ? 16 :
8);
bitmap_pad = ((depth > 16) ? 32 :
(depth > 8) ? 16 :
8);
- byte_cnt = bitmap_pad >> 3;
outimg = XCreateImage (dpy, vis,
depth, ZPixmap, 0, 0, width, height,
bitmap_pad, 0);
if (!outimg) return NULL;
outimg = XCreateImage (dpy, vis,
depth, ZPixmap, 0, 0, width, height,
bitmap_pad, 0);
if (!outimg) return NULL;
+ bits_per_pixel = outimg->bits_per_pixel;
+ byte_cnt = bits_per_pixel >> 3;
+
data = (unsigned char *) xmalloc (outimg->bytes_per_line * height);
if (!data)
{
data = (unsigned char *) xmalloc (outimg->bytes_per_line * height);
if (!data)
{