Updates to fix Watcom C/C++ 11.0 compiler warning problems. Now compiles
clean with this compiler. Hopefully I did this without breaking other compilers. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -159,9 +159,9 @@ WORD wxPaletteSize(VOID FAR * pv)
|
||||
NumColors = DibNumColors(lpbi);
|
||||
|
||||
if (lpbi->biSize == sizeof(BITMAPCOREHEADER))
|
||||
return NumColors * sizeof(RGBTRIPLE);
|
||||
return (WORD)(NumColors * sizeof(RGBTRIPLE));
|
||||
else
|
||||
return NumColors * sizeof(RGBQUAD);
|
||||
return (WORD)(NumColors * sizeof(RGBQUAD));
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
@@ -528,7 +528,7 @@ BOOL wxReadDIB(LPTSTR lpFileName, HBITMAP *bitmap, HPALETTE *palette)
|
||||
}
|
||||
|
||||
/* offset to the bits from start of DIB header */
|
||||
offBits = (WORD)lpbi->biSize + nNumColors * sizeof(RGBQUAD);
|
||||
offBits = (WORD)(lpbi->biSize + nNumColors * sizeof(RGBQUAD));
|
||||
|
||||
if (bf.bfOffBits != 0L)
|
||||
{
|
||||
|
Reference in New Issue
Block a user