Mercurial > mplayer.hg

changeset 35361:3e8dcfa3ceef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent unintended sign extension from int to long on 64-bit machines. If the property format is 32, the property data will be stored as an array of longs (which on 64-bit machines will be 64-bit values that are padded in the upper 4 bytes).
author ib
date Fri, 23 Nov 2012 12:08:56 +0000
parents a3e8af09792d
children 848ca0b6d5ca
files gui/ui/widgets.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gui/ui/widgets.c	Fri Nov 23 10:31:07 2012 +0000
+++ b/gui/ui/widgets.c	Fri Nov 23 12:08:56 2012 +0000
@@ -18,6 +18,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -100,7 +101,7 @@
             data = gdk_pixbuf_get_pixels(pixbuf);
 
             for (i = csize; i < guiIcon.collection_size; data += 4, i++)
-                guiIcon.collection[i] = (data[3] << 24) | AV_RB24(data);  // RGBA -> ARGB
+                guiIcon.collection[i] = (uint32_t)(data[3] << 24) | AV_RB24(data);  // RGBA -> ARGB
         }
 
         g_object_unref(pixbuf);