From c3b3b3a5b7bc0d6d18a227030cd41c59f2661798 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 5 Mar 2004 21:20:28 +0000 Subject: [PATCH] Don't try to load an alpha channel from the BMP, since there is no Fri Mar 5 22:22:25 2004 Matthias Clasen * io-bmp.c (OneLine32): Don't try to load an alpha channel from the BMP, since there is no evidence that even 32bit BMPs have an alpha channel. (#135502) --- gdk-pixbuf/ChangeLog | 6 ++++++ gdk-pixbuf/io-bmp.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 7f142e58a9..ea04dbfd53 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 5 22:22:25 2004 Matthias Clasen + + * io-bmp.c (OneLine32): Don't try to load an alpha channel + from the BMP, since there is no evidence that even 32bit + BMPs have an alpha channel. (#135502) + Mon Mar 1 19:47:48 2004 Owen Taylor * === Released 2.3.5 ==== diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c index e14a011276..d43bed95a5 100644 --- a/gdk-pixbuf/io-bmp.c +++ b/gdk-pixbuf/io-bmp.c @@ -624,7 +624,7 @@ static void OneLine32(struct bmp_progressive_state *context) *pixels++ = (r << r_lshift) | (r >> r_rshift); *pixels++ = (g << g_lshift) | (g >> g_rshift); *pixels++ = (b << b_lshift) | (b >> b_rshift); - *pixels++ = src[3]; /* alpha */ + *pixels++ = 0xff; src += 4; } @@ -633,7 +633,7 @@ static void OneLine32(struct bmp_progressive_state *context) *pixels++ = src[2]; *pixels++ = src[1]; *pixels++ = src[0]; - *pixels++ = src[3]; + *pixels++ = 0xff; src += 4; }