[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - vcl/unx

[Markus Mohrhard]

 vcl/unx/generic/gdi/salgdi.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit aca7e0b26d3eb2a8b562dfbd7b9fc78090656f02
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Oct 24 01:30:41 2014 +0200

    fix missing pieces
    
    That resulted in the wrong color used for some rendering.
    
    Change-Id: I1f427fb65e287d17ca96ea6adbc46686f48f8c6f

diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 5bcc6e1..a84644c 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -145,9 +145,13 @@ void X11SalGraphics::SetDrawable( Drawable aDrawable, SalX11Screen nXScreen )
 
     if( hDrawable_ )
     {
-        // nPenPixel_      = GetPixel( nPenColor_ ); // TODO: moggi: FIX ME
+        X11SalGraphicsImpl* pImpl = dynamic_cast<X11SalGraphicsImpl*>(mpImpl.get());
+        if (pImpl)
+        {
+            pImpl->nPenPixel_      = GetPixel( pImpl->nPenColor_ );
+            pImpl->nBrushPixel_    = GetPixel( pImpl->nBrushColor_ );
+        }
         nTextPixel_     = GetPixel( nTextColor_ );
-        // nBrushPixel_    = GetPixel( nBrushColor_ ); // TODO: moggi: FIX ME
     }
 }
 
commit 90a015d14decf2908be7e43f6a5042f073ec847b
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Fri Oct 24 00:51:11 2014 +0200

    fix double delete after latest refactoring
    
    Change-Id: Ie9cae6ee3769631f9095a5995d5165d5367aa2b0

diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 67b5ff2..5bcc6e1 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -108,6 +108,8 @@ void X11SalGraphics::freeResources()
     DBG_ASSERT( !pPaintRegion_, "pPaintRegion_" );
     if( mpClipRegion ) XDestroyRegion( mpClipRegion ), mpClipRegion = None;
 
+    mpImpl->freeResources();
+
     if( hBrush_ )       XFreePixmap( pDisplay, hBrush_ ), hBrush_ = None;
     if( pFontGC_ ) XFreeGC( pDisplay, pFontGC_ ), pFontGC_ = None;
     if( m_pDeleteColormap )
@@ -117,8 +119,6 @@ void X11SalGraphics::freeResources()
         XRenderPeer::GetInstance().FreePicture( m_aXRenderPicture ), m_aXRenderPicture = 0;
 
     bFontGC_ = false;
-
-    mpImpl->freeResources();
 }
 
 void X11SalGraphics::SetDrawable( Drawable aDrawable, SalX11Screen nXScreen )