coverity#1242483 Unintentional integer overflow

Change-Id: Ie258b4b6d4d99c7b2b0d61550a840539b216d09f

coverity#1242483 Unintentional integer overflow
Change-Id: Ie258b4b6d4d99c7b2b0d61550a840539b216d09f
850b8dc7 · Caolán McNamara · ba8469f6 · 850b8dc7
Kaydet (Commit) 850b8dc7 authored Eki 02, 2014 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

salbmp.cxx vcl/unx/generic/gdi/salbmp.cxx +2 -3

No files found.
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -343,9 +343,8 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
            else if( aSrcBuf.mnBitCount <= 8 )
            {
                const SalColormap& rColMap = pSalDisp->GetColormap( nScreen );
-                const sal_uInt16 nCols = std::min( (sal_uLong)rColMap.GetUsed()
-                                            , (sal_uLong)(1 << nDrawableDepth)
-                                            );
+                const sal_uInt16 nCols = std::min((sal_uLong)rColMap.GetUsed(),
+                                                  sal_uLong(1) << nDrawableDepth);

                rPal.SetEntryCount( nCols );
                pDstPal = &rPal;