| Index: core/fxge/win32/fx_win32_dib.cpp
|
| diff --git a/core/fxge/win32/fx_win32_dib.cpp b/core/fxge/win32/fx_win32_dib.cpp
|
| index 1f5688ddd24f9aefabe0de17f0b232296e41e02d..40c9ca6e311194e2f238e45f6e779b705873a59d 100644
|
| --- a/core/fxge/win32/fx_win32_dib.cpp
|
| +++ b/core/fxge/win32/fx_win32_dib.cpp
|
| @@ -53,20 +53,20 @@ CFX_ByteString CFX_WindowsDIB::GetBitmapInfo(const CFX_DIBitmap* pBitmap) {
|
|
|
| CFX_DIBitmap* _FX_WindowsDIB_LoadFromBuf(BITMAPINFO* pbmi,
|
| LPVOID pData,
|
| - FX_BOOL bAlpha) {
|
| + bool bAlpha) {
|
| int width = pbmi->bmiHeader.biWidth;
|
| int height = pbmi->bmiHeader.biHeight;
|
| - BOOL bBottomUp = TRUE;
|
| + BOOL bBottomUp = true;
|
| if (height < 0) {
|
| height = -height;
|
| - bBottomUp = FALSE;
|
| + bBottomUp = false;
|
| }
|
| int pitch = (width * pbmi->bmiHeader.biBitCount + 31) / 32 * 4;
|
| CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
|
| FXDIB_Format format = bAlpha
|
| ? (FXDIB_Format)(pbmi->bmiHeader.biBitCount + 0x200)
|
| : (FXDIB_Format)pbmi->bmiHeader.biBitCount;
|
| - FX_BOOL ret = pBitmap->Create(width, height, format);
|
| + bool ret = pBitmap->Create(width, height, format);
|
| if (!ret) {
|
| delete pBitmap;
|
| return nullptr;
|
| @@ -99,7 +99,7 @@ CFX_DIBitmap* _FX_WindowsDIB_LoadFromBuf(BITMAPINFO* pbmi,
|
| }
|
|
|
| CFX_DIBitmap* CFX_WindowsDIB::LoadFromBuf(BITMAPINFO* pbmi, LPVOID pData) {
|
| - return _FX_WindowsDIB_LoadFromBuf(pbmi, pData, FALSE);
|
| + return _FX_WindowsDIB_LoadFromBuf(pbmi, pData, false);
|
| }
|
|
|
| HBITMAP CFX_WindowsDIB::GetDDBitmap(const CFX_DIBitmap* pBitmap, HDC hDC) {
|
|
|