summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2007-01-04 14:18:14 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-01-04 14:18:14 +0000
commitb298dfbe8f1bb33896e3802a02ce5cff002b861f (patch)
tree6fb20a3a32b2521b648da411c34e758f89d694f6 /gdk-pixbuf
parent1d5fdd620951724967c4ec8cb7ebd62d433e9028 (diff)
downloadgdk-pixbuf-b298dfbe8f1bb33896e3802a02ce5cff002b861f.tar.gz
Fix a compiler warning
svn path=/trunk/; revision=17061
Diffstat (limited to 'gdk-pixbuf')
-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 81cb1cff7..043da1d8c 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 13d973801..0e72e599c 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;