[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Michael Meeks]

 sc/source/core/opencl/opencl_device.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit fc5340dbd927fa9c821e7861cfe5c34a856e436a
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Nov 29 02:24:50 2013 +0000

    GPU Calc: WaE fixes.
    
    Change-Id: Ifa3621a21e03aff313198fc29044b93c8f57001c

diff --git a/sc/source/core/opencl/opencl_device.cxx b/sc/source/core/opencl/opencl_device.cxx
index a91883f..f6ab41f 100644
--- a/sc/source/core/opencl/opencl_device.cxx
+++ b/sc/source/core/opencl/opencl_device.cxx
@@ -402,7 +402,7 @@ ds_status pickBestDevice(ds_profile* profile, int* bestDeviceIdx)
         ds_device device = profile->devices[d];
         LibreOfficeDeviceScore *pScore = (LibreOfficeDeviceScore*)device.score;
 
-        float fScore = DBL_MAX;
+        double fScore = DBL_MAX;
         if (pScore)
             fScore = pScore->fTime;
         else
@@ -480,7 +480,10 @@ ds_device getDeviceSelection(const char* sProfilePath, bool bForceSelection)
         }
         if (DS_SUCCESS != status)
         {
-            if (!bForceSelection) LOG_PRINTF("[DS] Profile file not available (" << fileName << "); performing profiling.");
+            if (!bForceSelection)
+            {
+                LOG_PRINTF("[DS] Profile file not available (" << fileName << "); performing profiling.");
+            }
 
             /* Populate input data for micro-benchmark */
             boost::scoped_ptr<LibreOfficeDeviceEvaluationIO> testData(new LibreOfficeDeviceEvaluationIO);