summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2007-01-04 14:16:49 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-01-04 14:16:49 +0000
commit50cccdc0b898552e5df6ea1a7df790203872f244 (patch)
treeb737467a7ffe96c3ed8870c1164fd52313df2b44
parent44a6f7a773b9c969e73ec750556114baa017a631 (diff)
downloadgdk-pixbuf-50cccdc0b898552e5df6ea1a7df790203872f244.tar.gz
Fix a compiler warning
svn path=/branches/gtk-2-10/; revision=17060
-rw-r--r--gdk-pixbuf/ChangeLog4
-rw-r--r--gdk-pixbuf/io-bmp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 722be4c6a..42f2e99bf 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-04 Matthias Clasen <mclasen@redhat.com>
+
+ * io-bmp.c (OneLine32): Fix a warning
+
2006-12-22 Matthias Clasen <mclasen@redhat.com>
* io-bmp.c (decode_bitmasks): Handle bmps
diff --git a/gdk-pixbuf/io-bmp.c b/gdk-pixbuf/io-bmp.c
index 67461a4e1..89e8a26e9 100644
--- a/gdk-pixbuf/io-bmp.c
+++ b/gdk-pixbuf/io-bmp.c
@@ -753,7 +753,7 @@ static void OneLine32(struct bmp_progressive_state *context)
*pixels++ = (g << g_lshift) | (g >> g_rshift);
*pixels++ = (b << b_lshift) | (b >> b_rshift);
if (context->a_bits)
- *pixels++ = 0xff - (a << a_lshift) | (a >> a_rshift);
+ *pixels++ = 0xff - ((a << a_lshift) | (a >> a_rshift));
else
*pixels++ = 0xff;