clang-cl loplugin: canvas

Change-Id: I3e4f9ccbe608a98759f2a9e312839eb909e6b575
Reviewed-on: https://gerrit.libreoffice.org/29878
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

1 files changed, 10 insertions, 11 deletions

diff --git a/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index addbda659a35..6d60842a3172 100644
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.cxx
@@ -54,7 +54,7 @@ namespace dxcanvas
                 }
                 else
                 {
-                    BITMAPCOREHEADER* pCoreHeader = (BITMAPCOREHEADER*)&rBIH;
+                    BITMAPCOREHEADER const * pCoreHeader = reinterpret_cast<BITMAPCOREHEADER const *>(&rBIH);
 
                     if( pCoreHeader->bcBitCount <= 8 )
                         return 1 << pCoreHeader->bcBitCount;
@@ -70,19 +70,18 @@ namespace dxcanvas
                 bool            bRet( false );
                 BitmapSharedPtr pBitmap;
 
-                const BITMAPINFO* pBI = (BITMAPINFO*)GlobalLock( (HGLOBAL)hDIB );
+                const BITMAPINFO* pBI = static_cast<BITMAPINFO*>(GlobalLock( const_cast<void *>(hDIB) ));
 
                 if( pBI )
                 {
-                    const BITMAPINFOHEADER* pBIH = (BITMAPINFOHEADER*)pBI;
-                    const BYTE*             pBits = (BYTE*) pBI + *(DWORD*)pBI +
-                        calcDIBColorCount( *pBIH ) * sizeof( RGBQUAD );
+                    const BYTE*             pBits = reinterpret_cast<BYTE const *>(pBI) + pBI->bmiHeader.biSize +
+                        calcDIBColorCount( pBI->bmiHeader ) * sizeof( RGBQUAD );
 
                     // forward to outsourced GDI+ rendering method
                     // (header clashes)
-                    bRet = tools::drawDIBits( rGraphics, *pBI, (void*)pBits );
+                    bRet = tools::drawDIBits( rGraphics, *pBI, pBits );
 
-                    GlobalUnlock( (HGLOBAL)hDIB );
+                    GlobalUnlock( const_cast<void *>(hDIB) );
                 }
 
                 return bRet;
@@ -121,7 +120,7 @@ namespace dxcanvas
                                                aBmpSysData.pDIB );
                         }
 
-                        rBmp.ReleaseAccess( pReadAcc );
+                        Bitmap::ReleaseAccess( pReadAcc );
                     }
                 }
                 else
@@ -165,7 +164,7 @@ namespace dxcanvas
                 const sal_Int32 nWidth( aBmpSize.Width() );
                 const sal_Int32 nHeight( aBmpSize.Height() );
 
-                ENSURE_OR_THROW( pReadAccess.get() != NULL,
+                ENSURE_OR_THROW( pReadAccess.get() != nullptr,
                                   "::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
                                   "Unable to acquire read access to bitmap" );
 
@@ -191,7 +190,7 @@ namespace dxcanvas
                     // WinSalBitmap::AcquireBuffer() sets up the
                     // buffer
 
-                    ENSURE_OR_THROW( pAlphaReadAccess.get() != NULL,
+                    ENSURE_OR_THROW( pAlphaReadAccess.get() != nullptr,
                                       "::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
                                       "Unable to acquire read access to alpha" );
 
@@ -331,7 +330,7 @@ namespace dxcanvas
                     // WinSalBitmap::AcquireBuffer() sets up the
                     // buffer
 
-                    ENSURE_OR_THROW( pMaskReadAccess.get() != NULL,
+                    ENSURE_OR_THROW( pMaskReadAccess.get() != nullptr,
                                       "::dxcanvas::tools::bitmapFromVCLBitmapEx(): "
                                       "Unable to acquire read access to mask" );