[Libreoffice-commits] core.git: 2 commits - vcl/opengl

[Markus Mohrhard]

 vcl/opengl/gdiimpl.cxx |    2 +-
 vcl/opengl/salbmp.cxx  |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e90a6f154e94b91d4a1bdd832a98dc263bd29d6b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Nov 10 08:16:38 2014 +0100

    WaE: [-Wsometimes-uninitialized]
    
    Change-Id: Ie51a67474631ecfb0b223bd2f5a63ae8bf363e42

diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 564426c..abe62e3 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -319,7 +319,8 @@ Size OpenGLSalBitmap::GetSize() const
 
 GLuint OpenGLSalBitmap::CreateTexture()
 {
-    GLenum nFormat, nType;
+    GLenum nFormat = GL_RGBA;
+    GLenum nType = GL_UNSIGNED_BYTE;
     sal_uInt8* pData( NULL );
     bool bAllocated( false );
 
commit 8c3bb9d3799f9ddd62ce2dc2517a2054bfc9a437
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Mon Nov 10 08:13:31 2014 +0100

    WaE implicit conversion of NULL constant to 'bool' [-Wnull-conversion]
    
    Change-Id: I8f208d6c87275aa4a169c7c6ed219200617c5669

diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 7094727..e62e32e 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -753,7 +753,7 @@ bool OpenGLSalGraphicsImpl::drawPolyPolygonBezier(
             const SalPoint* const* /*pPtAry*/,
             const sal_uInt8* const* /*pFlgAry*/ )
 {
-    return NULL;
+    return false;
 }
 
 // CopyArea --> No RasterOp, but ClipRegion