[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 3 commits - vcl/inc vcl/opengl vcl/source

[Stephan Bergmann]

 vcl/inc/opengl/salbmp.hxx  |    2 +-
 vcl/inc/opengl/texture.hxx |    4 ++--
 vcl/opengl/salbmp.cxx      |    2 +-
 vcl/opengl/texture.cxx     |    4 ++--
 vcl/source/app/svapp.cxx   |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 0479d59e7539b04061cbf97f9adb04ddb7d8634a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 4 14:13:38 2015 +0200

    loplugin:simplifybool
    
    Change-Id: I19e96b882a5cc8991035a8275aebd4ff586bf9f3
    (cherry picked from commit 57e7f48633f820223e8dd1dd06af42dc164dfe26)

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 30decf3..c261a37 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -419,7 +419,7 @@ void Application::AcquireSolarMutex( sal_uLong nCount )
 bool Application::IsInMain()
 {
     ImplSVData* pSVData = ImplGetSVData();
-    return pSVData ? pSVData->maAppData.mbInAppMain : false;
+    return pSVData && pSVData->maAppData.mbInAppMain;
 }
 
 bool Application::IsInExecute()
commit ce90b2f67afd48fc2d0b4ab0f39f900585ea0539
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 1 20:04:43 2015 +0300

    WaE: C-style cast from const sal_uInt64 * to sal_uInt8 * [loplugin:cstylecast]
    
    More useful param type for arg that ultimately ends up as const GLVoid
    *pixels arg to glTexImage2D
    
    Change-Id: I69ba2f1dd397fa103f3f59638bec727add3caed7
    (cherry picked from commit 086aec27ddfd72dc21fffb0466cb5c815e2b4169)
    (cherry picked from commit 84eafb6a051863a775f122cec1bc27d9f5fef6e4)

diff --git a/vcl/inc/opengl/texture.hxx b/vcl/inc/opengl/texture.hxx
index 01dbecc..f555f09 100644
--- a/vcl/inc/opengl/texture.hxx
+++ b/vcl/inc/opengl/texture.hxx
@@ -42,7 +42,7 @@ public:
     int mnFreeSlots;
 
     ImplOpenGLTexture( int nWidth, int nHeight, bool bAllocate );
-    ImplOpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData );
+    ImplOpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, void const * pData );
     ImplOpenGLTexture( int nX, int nY, int nWidth, int nHeight );
     ~ImplOpenGLTexture();
 
@@ -93,7 +93,7 @@ public:
                     OpenGLTexture(ImplOpenGLTexture* pImpl, Rectangle aRectangle, int nSlotNumber = 0);
 
                     OpenGLTexture( int nWidth, int nHeight, bool bAllocate = true );
-                    OpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData );
+                    OpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, void const * pData );
                     OpenGLTexture( int nX, int nY, int nWidth, int nHeight );
                     OpenGLTexture( const OpenGLTexture& rTexture );
                     OpenGLTexture( const OpenGLTexture& rTexture, int nX, int nY, int nWidth, int nHeight );
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx
index 3f049b4..e76ebd7 100644
--- a/vcl/opengl/salbmp.cxx
+++ b/vcl/opengl/salbmp.cxx
@@ -514,7 +514,7 @@ bool OpenGLSalBitmap::calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType&
     OUString FragShader("areaHashCRC64TFragmentShader");
 
     static const OpenGLTexture aCRCTableTexture(512, 1, GL_RGBA, GL_UNSIGNED_BYTE,
-            (sal_uInt8*)(vcl_get_crc64_table()));
+            vcl_get_crc64_table());
 
     // First Pass
 
diff --git a/vcl/opengl/texture.cxx b/vcl/opengl/texture.cxx
index b33d990..9895dc8 100644
--- a/vcl/opengl/texture.cxx
+++ b/vcl/opengl/texture.cxx
@@ -79,7 +79,7 @@ ImplOpenGLTexture::ImplOpenGLTexture( int nX, int nY, int nWidth, int nHeight )
 }
 
 // texture from buffer data
-ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData ) :
+ImplOpenGLTexture::ImplOpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, void const * pData ) :
     mnRefCount( 1 ),
     mnTexture( 0 ),
     mnWidth( nWidth ),
@@ -192,7 +192,7 @@ OpenGLTexture::OpenGLTexture( int nX, int nY, int nWidth, int nHeight )
     mpImpl = new ImplOpenGLTexture( nX, nY, nWidth, nHeight );
 }
 
-OpenGLTexture::OpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, sal_uInt8* pData )
+OpenGLTexture::OpenGLTexture( int nWidth, int nHeight, int nFormat, int nType, void const * pData )
     : maRect( Point( 0, 0 ), Size( nWidth, nHeight ) )
     , mnSlotNumber(-1)
 {
commit c33fc5557df85ded29d993bb6fcb441298087b75
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Sep 1 19:41:19 2015 +0300

    WaE: 'updateChecksum' overrides a member function but is not marked 'override'
    
    Change-Id: Ic2230e1d1f54e27d4189fc56b525a7e76ddab649
    (cherry picked from commit a5493ee2ec1dbc49acdd376bb5e869ed4a80cce7)

diff --git a/vcl/inc/opengl/salbmp.hxx b/vcl/inc/opengl/salbmp.hxx
index 53d8957..602d47b 100644
--- a/vcl/inc/opengl/salbmp.hxx
+++ b/vcl/inc/opengl/salbmp.hxx
@@ -53,7 +53,7 @@ private:
     std::deque< OpenGLSalBitmapOp* >    maPendingOps;
 
     void makeCurrent();
-    virtual void updateChecksum() const;
+    virtual void updateChecksum() const SAL_OVERRIDE;
 
     bool calcChecksumGL(OpenGLTexture& rInputTexture, ChecksumType& rChecksum) const;