[Libreoffice-commits] core.git: vcl/headless

[Caolán McNamara]

 vcl/headless/svpgdi.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3c4147883e3185b979c984f286d6898ced73f46
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 3 16:18:06 2017 +0000

    Resolves: tdf#106280 under X we get into the 'unlikely' non-image surface case
    
    Change-Id: Idd83bbc96cbbb3fc7864ad587fc1ba8d78d1c93d

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index e638080..91b6f86 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;