opencl/source/openclwrapper.cxx | 2 +- sc/qa/unit/opencl-test.cxx | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
New commits: commit d739811038c54081ea4039a939af8f320b31378b Author: Tor Lillqvist <[email protected]> Date: Tue Mar 29 14:02:02 2016 +0300 The OpenCL shared library is called libOpenCL.so.1 on Linux libOpenCL.so is just the symbolic link to it, typically from a development package. (On Fedora, from ocl-icd-devel.) (Sure, libOpenCL.so.1 is also a symbolic link on Fedora, to libOpenCL.so.1.0.0. But anyway, libOpenCL.so.1 is not from a development package, but from ocl-icd.) Change-Id: I18ca2e52e025001f709b1b57e12cd01d5b52d08e diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index 7bbcb2c..74a925b 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -38,7 +38,7 @@ #elif defined(MACOSX) #define OPENCL_DLL_NAME nullptr #else -#define OPENCL_DLL_NAME "libOpenCL.so" +#define OPENCL_DLL_NAME "libOpenCL.so.1" #endif #define DEVICE_NAME_LENGTH 1024 commit 22fd8e743f455ab072086fb91c29a40f391403a9 Author: Tor Lillqvist <[email protected]> Date: Tue Mar 29 13:04:34 2016 +0300 Avoid running out of memory on Windows when OpenCL is available Call Clear() on the ScDocShellRef (derived from tools::SvRef) members of the ScOpenCLTest object in tearDown(). Otherwise the memory used by the ScDocShellRef objects in each ScOpenCLTest object would be held until when all the ScOpenCLTest objects are destroyed in the end. (CppUnit creates all the ScOpenCLTest objects in advance, then calls the test functions on them, and then destroys them.) The issue was a side-effect of the (otherwise nice) fix for tdf#89267. Change-Id: Ie5c59f2f089386c0abc135136397e1653c975fdc diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx index 53699a8..dfdf560 100644 --- a/sc/qa/unit/opencl-test.cxx +++ b/sc/qa/unit/opencl-test.cxx @@ -4771,9 +4771,15 @@ void ScOpenCLTest::tearDown() { //close test env if(xDocSh.Is()) + { xDocSh->DoClose(); + xDocSh.Clear(); + } if(xDocShRes.Is()) + { xDocShRes->DoClose(); + xDocShRes.Clear(); + } uno::Reference< lang::XComponent > ( m_xCalcComponent, UNO_QUERY_THROW )->dispose(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
