aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog7
-rw-r--r--w3mimg/x11/x11_w3mimg.c14
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 66bca7c..5f990a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-02 Yuji Abe <cbo46560@pop12.odn.ne.jp>
+
+ * [w3m-dev 03332] Re: hang up when seeing web page that contains xbm file
+ * w3mimg/x11/x11_w3mimg.c (x11_load_image): transparent support
+
2002-10-02 Yoshinobu Sakane <sakane@d4.bsd.nes.nec.co.jp>
* [w3m-dev 03331] Re: hang up when seeing web page that contains xbm file
@@ -3871,4 +3876,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.436 2002/10/01 15:29:05 ukai Exp $
+$Id: ChangeLog,v 1.437 2002/10/01 15:34:20 ukai Exp $
diff --git a/w3mimg/x11/x11_w3mimg.c b/w3mimg/x11/x11_w3mimg.c
index 6741771..29aa55d 100644
--- a/w3mimg/x11/x11_w3mimg.c
+++ b/w3mimg/x11/x11_w3mimg.c
@@ -1,4 +1,4 @@
-/* $Id: x11_w3mimg.c,v 1.8 2002/09/30 17:44:30 ukai Exp $ */
+/* $Id: x11_w3mimg.c,v 1.9 2002/10/01 15:34:20 ukai Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -194,13 +194,17 @@ x11_load_image(w3mimg_op * self, W3MImage * img, char *fname, int w, int h)
if (w != iw || h != ih) {
GdkPixbuf *newpixbuf;
newpixbuf = gdk_pixbuf_scale_simple(pixbuf, w, h, GDK_INTERP_BILINEAR);
- gdk_pixbuf_xlib_render_to_drawable(newpixbuf, (Drawable) img->pixmap,
- xi->imageGC, 0, 0, 0, 0, w, h,
+ gdk_pixbuf_xlib_render_to_drawable_alpha(newpixbuf,
+ (Drawable) img->pixmap,
+ 0, 0, 0, 0, w, h,
+ GDK_PIXBUF_ALPHA_BILEVEL, 1,
XLIB_RGB_DITHER_NORMAL, 0, 0);
gdk_pixbuf_finalize(newpixbuf);
} else {
- gdk_pixbuf_xlib_render_to_drawable(pixbuf, (Drawable) img->pixmap,
- xi->imageGC, 0, 0, 0, 0, w, h,
+ gdk_pixbuf_xlib_render_to_drawable_alpha(pixbuf,
+ (Drawable) img->pixmap,
+ 0, 0, 0, 0, w, h,
+ GDK_PIXBUF_ALPHA_BILEVEL, 1,
XLIB_RGB_DITHER_NORMAL, 0, 0);
}
gdk_pixbuf_unref(pixbuf);