diff options
author | Tor Lillqvist <tml@collabora.com> | 2016-05-25 15:23:22 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2016-05-25 15:24:54 +0300 |
commit | 591a9129451234a60a88849f8ce01af3c7c5b9b6 (patch) | |
tree | 95d514f40227d5d730e822475c4ae9e81053a8db | |
parent | 5f459af600597d3508676252b23ff8b5e00427dd (diff) |
Don't claim to be reading a file before trying to open it
Change-Id: I8a3332c4b1acaa4dc69ff9349d2e9241fb4f340f
-rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index e6ea3a100f00..70f4b0912fd3 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -67,7 +67,6 @@ OString loadShader(const OUString& rFilename) { OUString aFileURL = getShaderFolder() + rFilename +".glsl"; osl::File aFile(aFileURL); - SAL_INFO("vcl.opengl", "Reading " << aFileURL); if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None) { sal_uInt64 nSize = 0; @@ -77,11 +76,12 @@ OString loadShader(const OUString& rFilename) aFile.read(content.get(), nSize, nBytesRead); assert(nSize == nBytesRead); content.get()[nBytesRead] = 0; + SAL_INFO("vcl.opengl", "Read " << nBytesRead << " bytes from " << aFileURL); return OString(content.get()); } else { - SAL_WARN("vcl.opengl", "could not load the file: " << aFileURL); + SAL_WARN("vcl.opengl", "Could not open " << aFileURL); } return OString(); |