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

[Caolán McNamara]

 vcl/unx/generic/gdi/cairotextrender.cxx          |    1 +
 vcl/unx/generic/gdi/openglx11cairotextrender.cxx |    1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4c11ac451a00e552899429253652a6423829573b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 11 17:34:02 2015 +0000

    flush surface for all backends
    
    Change-Id: Ifa6f7f9a816096bfe9f44baca17b34e54b83a5c6

diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 0445771..b107c95 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -338,6 +338,7 @@ void CairoTextRender::DrawServerFontLayout( const ServerFontLayout& rLayout )
         aI = aNext;
     }
 
+    cairo_surface_flush(cairo_get_target(cr));
     drawSurface(cr);
     cairo_destroy(cr);
 }
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
index 8edeba8..dbb6ecf 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -65,7 +65,6 @@ void OpenGLX11CairoTextRender::drawSurface(cairo_t* cr)
     cairo_surface_t* pSurface = cairo_get_target(cr);
     int nWidth = cairo_image_surface_get_width( pSurface );
     int nHeight = cairo_image_surface_get_height( pSurface );
-    cairo_surface_flush( pSurface );
     unsigned char *pSrc = cairo_image_surface_get_data( pSurface );
 
     // XXX: lfrb: GLES 2.0 doesn't support GL_UNSIGNED_INT_8_8_8_8_REV