[Libreoffice-commits] core.git: Branch 'feature/mac-opengl-fixes' - canvas/source

[Markus Mohrhard]

 canvas/source/factory/cf_service.cxx            |   26 ++++++++++++++++++++++++
 canvas/source/opengl/ogl_canvashelper.cxx       |    5 ++--
 canvas/source/opengl/ogl_spritedevicehelper.cxx |    1 
 3 files changed, 30 insertions(+), 2 deletions(-)

New commits:
commit a910eafd2bd46746616321db90d510d9242dc6f6
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Aug 18 08:07:04 2014 +0200

    some temporary debug output

diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index e9c3157..07ee8b7 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -169,6 +169,11 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
             xNameAccess, UNO_QUERY_THROW);
 
         Sequence<OUString> serviceNames = xNameAccess->getElementNames();
+        for (sal_Int32 i = 0; i < serviceNames.getLength(); ++i)
+        {
+            SAL_DEBUG(serviceNames[i]);
+        }
+
         const OUString* pCurr = serviceNames.getConstArray();
         const OUString* const pEnd = pCurr + serviceNames.getLength();
         while( pCurr != pEnd )
@@ -181,11 +186,30 @@ CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) :
             {
                 Sequence<OUString> implementationList;
                 if( (xEntryNameAccess->getByName("PreferredImplementations") >>= implementationList) )
+                {
                     m_aAvailableImplementations.push_back( std::make_pair(*pCurr,implementationList) );
+                    for (sal_Int32 i = 0; i < implementationList.getLength(); ++i)
+                    {
+                        SAL_DEBUG("available :" << implementationList[i]);
+                    }
+                }
                 if( (xEntryNameAccess->getByName("AcceleratedImplementations") >>= implementationList) )
+                {
+                    for (sal_Int32 i = 0; i < implementationList.getLength(); ++i)
+                    {
+                        SAL_DEBUG("accelerated: " <<implementationList[i]);
+                    }
                     m_aAcceleratedImplementations.push_back( std::make_pair(*pCurr,implementationList) );
+                }
                 if( (xEntryNameAccess->getByName("AntialiasingImplementations") >>= implementationList) )
+                {
+                    for (sal_Int32 i = 0; i < implementationList.getLength(); ++i)
+                    {
+                        SAL_DEBUG("aa implemented: " << implementationList[i]);
+                    }
                     m_aAAImplementations.push_back( std::make_pair(*pCurr,implementationList) );
+                }
+
             }
 
             ++pCurr;
@@ -270,6 +294,7 @@ Reference<XInterface> CanvasFactory::use(
     Reference<XComponentContext> const & xContext ) const
 {
     try {
+        SAL_DEBUG("use: " << serviceName);
         return m_xContext->getServiceManager()->createInstanceWithArgumentsAndContext(
             serviceName, args, xContext);
     }
@@ -312,6 +337,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse(
     Reference<XComponentContext> const & xContext ) const
 {
     ::osl::MutexGuard guard(m_mutex);
+    SAL_DEBUG(serviceName);
 
     // forcing last entry from impl list, if config flag set
     bool bForceLastEntry(false);
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index a5ee6bc6..29c8ca6 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -967,8 +967,9 @@ namespace oglcanvas
                 break;
         }
 
-        o_action.maARGBColor =
-            mpDevice->getDeviceColorSpace()->convertToARGB(renderState.DeviceColor)[0];
+        if (renderState.DeviceColor.getLength())
+            o_action.maARGBColor =
+                mpDevice->getDeviceColorSpace()->convertToARGB(renderState.DeviceColor)[0];
     }
 
     void CanvasHelper::flush() const
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 58a59ea..2e4b592 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -389,6 +389,7 @@ namespace oglcanvas
 
     uno::Reference<rendering::XColorSpace> SpriteDeviceHelper::getColorSpace() const
     {
+        SAL_DEBUG("called SpriteDeviceHelper::getColorSpace()");
         // always the same
         return uno::Reference<rendering::XColorSpace>(
             ::canvas::tools::getStdColorSpace(),