vcl/opengl/salbmp.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 70f710f8343f58bd4876dead79d32129ad3ebaab
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Nov 5 09:42:43 2018 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Nov 5 12:47:34 2018 +0100
Fix for --enable-debug --disable-assert-always-abort
...found by
<https://ci.libreoffice.org//job/lo_tb_random_config_linux/1573/>
Change-Id: I805457f4da6d91a1ee27b0e4da999448950ecf40
Reviewed-on: https://gerrit.libreoffice.org/62875
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 67b49e1ce185..a2cf2e25b388 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -596,7 +596,7 @@ bool OpenGLSalBitmap::ReadTexture()
maTexture.Read(nFormat, nType, pData);
-#if OSL_DEBUG_LEVEL > 0
+#if OSL_DEBUG_LEVEL > 0 && !defined NDEBUG
// If we read over the end of pData we have a real hidden memory
// corruption problem !
size_t nCanary = mnBytesPerRow * mnHeight;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
