diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-07-20 14:09:36 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2018-07-27 17:46:08 +0200 |
| commit | a44843e8e324e00995dd4be0bd3244c85d91bd85 (patch) | |
| tree | f466eb03caf18e439f5e5f849c4139485291234e /canvas/Library_vclcanvas.mk | |
| parent | update credits (diff) | |
| download | core-a44843e8e324e00995dd4be0bd3244c85d91bd85.tar.gz core-a44843e8e324e00995dd4be0bd3244c85d91bd85.zip | |
tdf#118107 canvas opengl: avoid assertion failure with negative widths
In case an Impress shape has a "Fade in and Swivel" animation attached,
canvas calls OutputDevice::DrawBitmapEx() with a negative width. This
results in a call to OutputDevice::DrawDeviceAlphaBitmap(), which
asserts that the height/width is not negative.
Fix the problem by transforming the bitmap before calling
OutputDevice::DrawBitmapEx() in the GL case, similarly to how "complex"
transformations are handled already.
(cherry picked from commit 76b43425d764fbc9bf4dac52054b1d94344f26b0)
Change-Id: I65ccc8a984132c5921d6096bfe9c7a8fcfacd8dd
Reviewed-on: https://gerrit.libreoffice.org/57781
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'canvas/Library_vclcanvas.mk')
| -rw-r--r-- | canvas/Library_vclcanvas.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk index 805cefc43c77..6ff19eba6130 100644 --- a/canvas/Library_vclcanvas.mk +++ b/canvas/Library_vclcanvas.mk @@ -21,7 +21,10 @@ $(eval $(call gb_Library_Library,vclcanvas)) $(eval $(call gb_Library_set_componentfile,vclcanvas,canvas/source/vcl/vclcanvas)) -$(eval $(call gb_Library_use_external,vclcanvas,boost_headers)) +$(eval $(call gb_Library_use_externals,vclcanvas,\ + boost_headers \ + epoxy \ +)) $(eval $(call gb_Library_use_sdk_api,vclcanvas)) |