vcl/opengl/salbmp.cxx | 7 +------ vcl/source/opengl/OpenGLContext.cxx | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-)
New commits: commit f04e5ce57e9c31e187f4db193923fe5ac9ab42c1 Author: Markus Mohrhard <[email protected]> Date: Sun Nov 16 13:40:45 2014 +0100 remove some useless SAL_WARNs Change-Id: I26ae7aaab0e2d1685fd9c961aba027e1399b6911 diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index ad43ef8..4b5287e 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -200,8 +200,7 @@ bool OpenGLSalBitmap::AllocateUserData() } if (!alloc) { - SAL_WARN( - "vcl.opengl", "bad alloc " << mnBytesPerRow << "x" << mnHeight); + SAL_WARN("vcl.opengl", "bad alloc " << mnBytesPerRow << "x" << mnHeight); maUserBuffer.reset( static_cast<sal_uInt8*>(NULL) ); mnBytesPerRow = 0; } @@ -239,8 +238,6 @@ public: ImplPixelFormat8( const BitmapPalette& rPalette ) : mrPalette( rPalette ) { - if ( mrPalette.GetEntryCount() < 256 ) - SAL_WARN( "vcl.opengl", "Bad sign, if we get an OOB pixel we die" ); } virtual const BitmapColor& ReadPixel() SAL_OVERRIDE { @@ -262,8 +259,6 @@ public: , mnX(0) , mnShift(4) { - if ( mrPalette.GetEntryCount() < 16 ) - SAL_WARN( "vcl.opengl", "Bad sign, if we get an OOB pixel we die" ); } virtual void StartLine( sal_uInt8* pLine ) SAL_OVERRIDE { commit 98a0ff7183c06e12cadba5412d26d203723b137a Author: Markus Mohrhard <[email protected]> Date: Sun Nov 16 12:33:55 2014 +0100 use correct flag to enable ARB debug version Change-Id: I933aea4f9cb1ccd58f9a07e7d32ff28077f8bb33 diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx index 15d551a..0659ce5 100644 --- a/vcl/source/opengl/OpenGLContext.cxx +++ b/vcl/source/opengl/OpenGLContext.cxx @@ -865,7 +865,7 @@ bool OpenGLContext::InitGLEW() { if (glDebugMessageCallbackARB) { - glEnable(GL_DEBUG_OUTPUT); + glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB); glDebugMessageCallbackARB(&debug_callback, NULL); } else if ( glDebugMessageCallback ) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
