[Libreoffice-commits] core.git: 2 commits - vcl/quartz

[Tor Lillqvist]

 vcl/quartz/salgdicommon.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit e93a84d4857af442122d54c4d4857fa90d9f22f9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 1 11:55:47 2014 +0300

    Add two more CG_TRACEs
    
    Change-Id: Ib1ab15a0daa9e8cc1f48e6ff1b212b463fcb0004

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 58fcc7f..7b5800d 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -1615,7 +1615,9 @@ void AquaSalGraphics::SetState()
     }
 
     // set RGB colorspace and line and fill colors
+    CG_TRACE( "CGContextSetFillColor(" << mrContext << "," << maFillColor << ")" );
     CGContextSetFillColor( mrContext, maFillColor.AsArray() );
+    CG_TRACE( "CGContextSetStrokeColor(" << mrContext << "," << maLineColor << ")" );
     CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
     CGContextSetShouldAntialias( mrContext, false );
     if( mnXorMode == 2 )
commit 3972a2fecc63d2d01aa902359b02ef9929d51f62
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 1 11:54:26 2014 +0300

    Stopgap fix to avoid using a null CGContext
    
    Change-Id: I445f09dd842b62e5153c53bb5af066af71d492bd

diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index f0b9979..58fcc7f 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -308,6 +308,12 @@ void AquaSalGraphics::copyBits( const SalTwoRect& rPosAry, SalGraphics *pSrcGrap
         return;
     }
 
+#ifdef IOS
+    // If called from idle layout, mrContext is NULL, no idea what to do
+    if (!mrContext)
+        return;
+#endif
+
     // accelerate trivial operations
     /*const*/ AquaSalGraphics* pSrc = static_cast<AquaSalGraphics*>(pSrcGraphics);
     const bool bSameGraphics = (this == pSrc)