diff options
Diffstat (limited to 'vcl/unx/generic/gdi/salbmp.cxx')
| -rw-r--r-- | vcl/unx/generic/gdi/salbmp.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx index 9c9bdd164fb2..9c7a798ed274 100644 --- a/vcl/unx/generic/gdi/salbmp.cxx +++ b/vcl/unx/generic/gdi/salbmp.cxx @@ -360,7 +360,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB( else if( aSrcBuf.mnBitCount <= 8 ) { const SalColormap& rColMap = pSalDisp->GetColormap( nScreen ); - const sal_uInt16 nCols = Min( (sal_uLong)rColMap.GetUsed() + const sal_uInt16 nCols = std::min( (sal_uLong)rColMap.GetUsed() , (sal_uLong)(1 << nDrawableDepth) ); @@ -520,7 +520,7 @@ XImage* X11SalBitmap::ImplCreateXImage( else if( pImage->depth <= 8 ) { const SalColormap& rColMap = pSalDisp->GetColormap( nScreen ); - const sal_uInt16 nCols = Min( (sal_uLong)rColMap.GetUsed() + const sal_uInt16 nCols = std::min( (sal_uLong)rColMap.GetUsed() , (sal_uLong)(1 << pImage->depth) ); |