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

[Tor Lillqvist]

 vcl/coretext/salgdi2.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit e77f18f4975bb731f8445cacfff7609a5fe2d7a9
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 31 20:06:51 2013 +0200

    Better warnings when CheckContext() fails
    
    Change-Id: I94627e5b4efda92ac80a618e5aa4b0b33340f4ef

diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index c0ae17a..a78c8a3 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -828,6 +828,7 @@ bool SvpSalGraphics::CheckContext()
     const basegfx::B2IVector bufferSize = m_aDevice->getBufferSize();
     const sal_Int32 scanlineStride = m_aDevice->getScanlineStride();
     basebmp::RawMemorySharedArray pixelBuffer = m_aDevice->getBuffer();
+    bool warned = false;
 
     SAL_INFO( "vcl.ios",
               "CheckContext: device=" << m_aDevice.get() <<
@@ -852,10 +853,11 @@ bool SvpSalGraphics::CheckContext()
                                           kCGImageAlphaNoneSkipLast);
         break;
     default:
-        SAL_INFO( "vcl.ios", "CheckContext: unsupported color format " << basebmp::formatName( m_aDevice->getScanlineFormat() ) );
+        SAL_WARN( "vcl.ios", "CheckContext: unsupported color format " << basebmp::formatName( m_aDevice->getScanlineFormat() ) );
+        warned = true;
     }
 
-    SAL_WARN_IF( mrContext == NULL, "vcl.ios", "CheckContext() failed" );
+    SAL_WARN_IF( mrContext == NULL && !warned, "vcl.ios", "CheckContext: CGBitmapContextCreate() failed" );
 
     // Should we also clip the context? (Then we need to add a
     // getBounds() function to BitmapDevice.)