From 55f07d4daa76503530d96b9c20b53c59bcd5bcf9 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 12 Jan 2018 20:10:40 +0100 Subject: More loplugin:cstylecast: vcl auto-rewrite with "Enable loplugin:cstylecast for some more cases" plus solenv/clang-format/reformat-formatted-files Change-Id: I363c01a1ae9e863fca4fb4589829492d7280d711 --- vcl/unx/generic/gdi/salbmp.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/unx/generic/gdi/salbmp.cxx') diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index d599a39aaf1d..69ca5b041d11 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -376,7 +376,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( else if( aSrcBuf.mnBitCount <= 8 ) { const SalColormap& rColMap = pSalDisp->GetColormap( nScreen ); - const sal_uInt16 nCols = std::min((sal_uLong)rColMap.GetUsed(), + const sal_uInt16 nCols = std::min(static_cast(rColMap.GetUsed()), sal_uLong(1) << nDrawableDepth); rPal.SetEntryCount( nCols ); @@ -538,8 +538,8 @@ XImage* X11SalBitmap::ImplCreateXImage( else if( pImage->depth <= 8 ) { const SalColormap& rColMap = pSalDisp->GetColormap( nScreen ); - const sal_uInt16 nCols = std::min( (sal_uLong)rColMap.GetUsed() - , (sal_uLong)(1 << pImage->depth) + const sal_uInt16 nCols = std::min( static_cast(rColMap.GetUsed()) + , static_cast(1 << pImage->depth) ); xPal.reset(new BitmapPalette( nCols )); -- cgit