[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - vcl/opengl

[Michael Meeks]

 vcl/opengl/salbmp.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 318fc8d6810ed72bd43d811bac32216b6ed9f231
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Nov 14 16:32:06 2014 +0000

    vcl: assert more useful truths on BitmapWriterAccess completion.
    
    Change-Id: I2ccc5eb64bf3b5d5ce94e2ddd4b9b458c3eda217

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index c2ebb68..2a57e728 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -415,7 +415,8 @@ GLuint OpenGLSalBitmap::CreateTexture()
 bool OpenGLSalBitmap::ReadTexture()
 {
     sal_uInt8* pData = maUserBuffer.get();
-    GLenum nFormat, nType;
+    GLenum nFormat = GL_RGB;
+    GLenum nType = GL_UNSIGNED_BYTE;
 
     SAL_INFO( "vcl.opengl", "::ReadTexture " << mnWidth << "x" << mnHeight );
 
@@ -518,6 +519,12 @@ void OpenGLSalBitmap::ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly )
     // The palette is modified on read during the BitmapWriteAccess,
     // but of course, often it is not modified; interesting.
     maPalette = pBuffer->maPalette;
+
+    // Are there any more ground movements underneath us ?
+    assert( pBuffer->mnWidth == mnWidth );
+    assert( pBuffer->mnHeight == mnHeight );
+    assert( pBuffer->mnBitCount == mnBits );
+
     delete pBuffer;
 }