diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 16:18:06 +0000 |
---|---|---|
committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2017-12-18 01:07:43 -0500 |
commit | ed26aaa910f148dac57ef0b73f10b9efe1a28fb3 (patch) | |
tree | ed868e2e9ff7cbb8761d334854808ae4376a20d8 /vcl/headless | |
parent | 4a43b9d99f528538b81417c95b17574f76ffd2a3 (diff) |
Resolves: tdf#106280 under X we get into the 'unlikely' non-image surface case
Change-Id: Idd83bbc96cbbb3fc7864ad587fc1ba8d78d1c93d
(cherry picked from commit f3c4147883e3185b979c984f286d6898ced73f46)
(cherry picked from commit d92fa59b470418b983048f4a40e878596e9c71a2)
Diffstat (limited to 'vcl/headless')
-rw-r--r-- | vcl/headless/svpgdi.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index e6380808fc03..91b6f86e87cb 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -1353,7 +1353,7 @@ void SvpSalGraphics::releaseCairoContext(cairo_t* cr, bool bXorModeAllowed, cons unsigned char *target_surface_data = cairo_image_surface_get_data(target_surface); unsigned char *xor_surface_data = cairo_image_surface_get_data(surface); - cairo_format_t nFormat = cairo_image_surface_get_format(m_pSurface); + cairo_format_t nFormat = cairo_image_surface_get_format(target_surface); assert(nFormat == CAIRO_FORMAT_ARGB32 && "need to implement CAIRO_FORMAT_A1 after all here"); sal_Int32 nStride = cairo_format_stride_for_width(nFormat, nWidth * m_fScale); sal_Int32 nUnscaledExtentsLeft = nExtentsLeft * m_fScale; |