From a498d53fda3f2011bde835bb668f46b2ce6d08e7 Mon Sep 17 00:00:00 2001 From: kojima Date: Sun, 30 May 1999 04:58:32 +0000 Subject: [PATCH] fix bug with alpha transparent xpm --- wrlib/Makefile.in | 1 + wrlib/xpm.c | 28 +++++++--------------------- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/wrlib/Makefile.in b/wrlib/Makefile.in index 2a1a1c70..37e99717 100644 --- a/wrlib/Makefile.in +++ b/wrlib/Makefile.in @@ -89,6 +89,7 @@ XGETTEXT = @XGETTEXT@ XLFLAGS = @XLFLAGS@ XLIBS = @XLIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBRARY_PATH = @X_LIBRARY_PATH@ wprefsdir = @wprefsdir@ AUTOMAKE_OPTIONS = no-dependencies diff --git a/wrlib/xpm.c b/wrlib/xpm.c index 826ef780..79cffe50 100644 --- a/wrlib/xpm.c +++ b/wrlib/xpm.c @@ -99,16 +99,10 @@ RGetImageFromXPMData(RContext *context, char **data) XColor xcolor; if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) { - if (context->dpy) { - /* ??? */ - color_table[0][i]=context->red_offset; - color_table[1][i]=context->red_offset; - color_table[2][i]=context->red_offset; - } else { - color_table[0][i]=0; - color_table[1][i]=0; - color_table[2][i]=0; - } + color_table[0][i]=0; + color_table[1][i]=0; + color_table[2][i]=0; + transp = i; continue; } if (XParseColor(dpy, cmap, xpm.colorTable[i].c_color, &xcolor)) { @@ -213,17 +207,9 @@ RLoadXPM(RContext *context, char *file, int index) XColor xcolor; if (strncmp(xpm.colorTable[i].c_color,"None",4)==0) { - if (context->dpy) { - /* ??? */ - color_table[0][i]=context->red_offset; - color_table[1][i]=context->red_offset; - color_table[2][i]=context->red_offset; - } else { - color_table[0][i]=0; - color_table[1][i]=0; - color_table[2][i]=0; - } - + color_table[0][i]=0; + color_table[1][i]=0; + color_table[2][i]=0; transp = i; continue; }