diff options
| author | Matthias Clasen <maclas@gmx.de> | 2004-03-05 21:20:28 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-03-05 21:20:28 +0000 |
| commit | c3b3b3a5b7bc0d6d18a227030cd41c59f2661798 (patch) | |
| tree | 107a8c469c926ab25a5e49fd112c857614eaa169 | |
| parent | 385bd6a54e2c0b6b2ca69c8f66d5657a48f78b47 (diff) | |
| download | gtk+-c3b3b3a5b7bc0d6d18a227030cd41c59f2661798.tar.gz | |
Don't try to load an alpha channel from the BMP, since there is no
Fri Mar 5 22:22:25 2004 Matthias Clasen <maclas@gmx.de>
* 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)
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 <maclas@gmx.de> + + * 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 <otaylor@redhat.com> * === 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; } |