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

[Caolán McNamara]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 3cc36adbb48947ca1d670eef158908ff592abb8a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 4 13:16:48 2015 +0000

    duplicate of getCairoContext logic
    
    Change-Id: I8ec75a69dc8b63cf0cbf51a409a253cda765b815

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 98b7850..966f964 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -973,26 +973,18 @@ void GtkSalGraphics::renderAreaToPix( cairo_surface_t *source,
     if( !mpFrame->m_aFrame.get() )
         return;
 
-    basebmp::RawMemorySharedArray data = mpFrame->m_aFrame->getBuffer();
-    basegfx::B2IVector size = mpFrame->m_aFrame->getSize();
-    sal_Int32 nStride = mpFrame->m_aFrame->getScanlineStride();
     long ax = region->x;
     long ay = region->y;
+    basegfx::B2IVector size = mpFrame->m_aFrame->getSize();
     long awidth = MIN (region->width, size.getX() - ax);
     long aheight = MIN (region->height, size.getY() - ay);
 
-    cairo_surface_t *target =
-        cairo_image_surface_create_for_data(data.get(),
-                                        CAIRO_FORMAT_RGB24,
-                                        size.getX(), size.getY(),
-                                        nStride);
-    cairo_t *cr = cairo_create(target);
+    cairo_t *cr = getCairoContext();
 
     cairo_set_source_surface( cr, source, ax, ay );
     cairo_rectangle( cr, ax, ay, awidth, aheight );
     cairo_fill( cr );
     cairo_destroy(cr);
-    cairo_surface_destroy(target);
 
     if ( !mpFrame->isDuringRender() )
         gtk_widget_queue_draw_area( mpFrame->getWindow(), ax, ay, awidth, aheight );