Kaydet (Commit) 67304b83 authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz#4372 Undefined-shift

upstreamed as https://bugs.freedesktop.org/show_bug.cgi?id=103845

Change-Id: I48430b2ab62991345863bceeaf3a6918f9dd1fda
Reviewed-on: https://gerrit.libreoffice.org/45078Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 0717f32d
...@@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo)) ...@@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo))
$(eval $(call gb_UnpackedTarball_add_patches,pixman,\ $(eval $(call gb_UnpackedTarball_add_patches,pixman,\
external/cairo/pixman/pixman-0.24.4.patch \ external/cairo/pixman/pixman-0.24.4.patch \
external/cairo/pixman/pixman-ofz4372.patch \
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
......
--- misc/pixman/pixman/pixman-solid-fill.c
+++ misc/build/pixman/pixman/pixman-solid-fill.c
@@ -30,10 +30,10 @@ static uint32_t
color_to_uint32 (const pixman_color_t *color)
{
return
- (color->alpha >> 8 << 24) |
- (color->red >> 8 << 16) |
+ ((uint32_t)color->alpha >> 8 << 24) |
+ ((uint32_t)color->red >> 8 << 16) |
(color->green & 0xff00) |
- (color->blue >> 8);
+ ((uint32_t)color->blue >> 8);
}
static argb_t
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment