diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-11-22 10:37:20 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-11-22 11:39:10 +0100 |
| commit | 67304b83a7933a75ed24dd41a311d0250f15a203 (patch) | |
| tree | 315ecb05a862daae385ae343e7fe94f027a6e4b6 /external/cairo | |
| parent | Missing GraphicObject destruction, memory leak (diff) | |
| download | core-67304b83a7933a75ed24dd41a311d0250f15a203.tar.gz core-67304b83a7933a75ed24dd41a311d0250f15a203.zip | |
ofz#4372 Undefined-shift
upstreamed as https://bugs.freedesktop.org/show_bug.cgi?id=103845
Change-Id: I48430b2ab62991345863bceeaf3a6918f9dd1fda
Reviewed-on: https://gerrit.libreoffice.org/45078
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/UnpackedTarball_pixman.mk | 1 | ||||
| -rw-r--r-- | external/cairo/pixman/pixman-ofz4372.patch | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/external/cairo/UnpackedTarball_pixman.mk b/external/cairo/UnpackedTarball_pixman.mk index 777a47cc30fd..6669a8f8be66 100644 --- a/external/cairo/UnpackedTarball_pixman.mk +++ b/external/cairo/UnpackedTarball_pixman.mk @@ -13,6 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,pixman,$(PIXMAN_TARBALL),,cairo)) $(eval $(call gb_UnpackedTarball_add_patches,pixman,\ external/cairo/pixman/pixman-0.24.4.patch \ + external/cairo/pixman/pixman-ofz4372.patch \ )) ifeq ($(OS),WNT) diff --git a/external/cairo/pixman/pixman-ofz4372.patch b/external/cairo/pixman/pixman-ofz4372.patch new file mode 100644 index 000000000000..aaf83f11d414 --- /dev/null +++ b/external/cairo/pixman/pixman-ofz4372.patch @@ -0,0 +1,16 @@ +--- 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 |