Make code compile with clang_use_chrome_plugin (part II)

core/fxge/win32/fx_win32_dib.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxge/include/fx_ge.h"
 
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <windows.h>
@@ skipping 33 matching lines @@
       pPalette[0] = pBitmap->GetPalette()[0];
       pPalette[1] = pBitmap->GetPalette()[1];
     } else {
       pPalette[0] = 0;
       pPalette[1] = 0xffffff;
     }
   }
   result.ReleaseBuffer(len);
   return result;
 }
+
 CFX_DIBitmap* _FX_WindowsDIB_LoadFromBuf(BITMAPINFO* pbmi,
                                          LPVOID pData,
                                          FX_BOOL bAlpha) {
   int width = pbmi->bmiHeader.biWidth;
   int height = pbmi->bmiHeader.biHeight;
   BOOL bBottomUp = TRUE;
   if (height < 0) {
     height = -height;
     bBottomUp = FALSE;
   }
@@ skipping 26 matching lines @@
     for (int i = 0; i < 2; i++) {
       pBitmap->SetPaletteEntry(i, ((uint32_t*)pbmi->bmiColors)[i] | 0xff000000);
     }
   } else if (pbmi->bmiHeader.biBitCount == 8) {
     for (int i = 0; i < 256; i++) {
       pBitmap->SetPaletteEntry(i, ((uint32_t*)pbmi->bmiColors)[i] | 0xff000000);
     }
   }
   return pBitmap;
 }
+
 CFX_DIBitmap* CFX_WindowsDIB::LoadFromBuf(BITMAPINFO* pbmi, LPVOID pData) {
   return _FX_WindowsDIB_LoadFromBuf(pbmi, pData, FALSE);
 }
+
 HBITMAP CFX_WindowsDIB::GetDDBitmap(const CFX_DIBitmap* pBitmap, HDC hDC) {
   CFX_ByteString info = GetBitmapInfo(pBitmap);
   return CreateDIBitmap(hDC, (BITMAPINFOHEADER*)info.c_str(), CBM_INIT,
                         pBitmap->GetBuffer(), (BITMAPINFO*)info.c_str(),
                         DIB_RGB_COLORS);
 }
+
 void GetBitmapSize(HBITMAP hBitmap, int& w, int& h) {
   BITMAP bmp;
   GetObject(hBitmap, sizeof bmp, &bmp);
   w = bmp.bmWidth;
   h = bmp.bmHeight;
 }
+
 CFX_DIBitmap* CFX_WindowsDIB::LoadFromFile(const FX_WCHAR* filename) {
   CWin32Platform* pPlatform =
       (CWin32Platform*)CFX_GEModule::Get()->GetPlatformData();
   if (pPlatform->m_GdiplusExt.IsAvailable()) {
     WINDIB_Open_Args_ args;
     args.flags = WINDIB_OPEN_PATHNAME;
     args.path_name = filename;
     return pPlatform->m_GdiplusExt.LoadDIBitmap(args);
   }
   HBITMAP hBitmap = (HBITMAP)LoadImageW(nullptr, (wchar_t*)filename,
@@ skipping 13 matching lines @@
   CFX_ByteString info = GetBitmapInfo(pDIBitmap);
   int ret = GetDIBits(hDC, hBitmap, 0, height, pDIBitmap->GetBuffer(),
                       (BITMAPINFO*)info.c_str(), DIB_RGB_COLORS);
   if (!ret) {
     delete pDIBitmap;
     pDIBitmap = nullptr;
   }
   DeleteDC(hDC);
   return pDIBitmap;
 }
+
+CFX_DIBitmap* CFX_WindowsDIB::LoadFromFile(const FX_CHAR* filename) {
+  return LoadFromFile(CFX_WideString::FromLocal(filename).c_str());
+}
+
 CFX_DIBitmap* CFX_WindowsDIB::LoadDIBitmap(WINDIB_Open_Args_ args) {
   CWin32Platform* pPlatform =
       (CWin32Platform*)CFX_GEModule::Get()->GetPlatformData();
   if (pPlatform->m_GdiplusExt.IsAvailable()) {
     return pPlatform->m_GdiplusExt.LoadDIBitmap(args);
   }
   if (args.flags == WINDIB_OPEN_MEMORY) {
     return nullptr;
   }
   HBITMAP hBitmap = (HBITMAP)LoadImageW(nullptr, (wchar_t*)args.path_name,
@@ skipping 13 matching lines @@
   CFX_ByteString info = GetBitmapInfo(pDIBitmap);
   int ret = GetDIBits(hDC, hBitmap, 0, height, pDIBitmap->GetBuffer(),
                       (BITMAPINFO*)info.c_str(), DIB_RGB_COLORS);
   if (!ret) {
     delete pDIBitmap;
     pDIBitmap = nullptr;
   }
   DeleteDC(hDC);
   return pDIBitmap;
 }
+
 CFX_DIBitmap* CFX_WindowsDIB::LoadFromDDB(HDC hDC,
                                           HBITMAP hBitmap,
                                           uint32_t* pPalette,
                                           uint32_t palsize) {
   FX_BOOL bCreatedDC = !hDC;
   if (bCreatedDC) {
     hDC = CreateCompatibleDC(nullptr);
   }
   BITMAPINFOHEADER bmih;
   FXSYS_memset(&bmih, 0, sizeof bmih);
@@ skipping 61 matching lines @@
   }
   if (ret == 0) {
     delete pDIBitmap;
     pDIBitmap = nullptr;
   }
   if (bCreatedDC) {
     DeleteDC(hDC);
   }
   return pDIBitmap;
 }
+
 CFX_WindowsDIB::CFX_WindowsDIB(HDC hDC, int width, int height) {
   Create(width, height, FXDIB_Rgb, (uint8_t*)1);
   BITMAPINFOHEADER bmih;
   FXSYS_memset(&bmih, 0, sizeof bmih);
   bmih.biSize = sizeof bmih;
   bmih.biBitCount = 24;
   bmih.biHeight = -height;
   bmih.biPlanes = 1;
   bmih.biWidth = width;
   m_hBitmap = CreateDIBSection(hDC, (BITMAPINFO*)&bmih, DIB_RGB_COLORS,
                                (LPVOID*)&m_pBuffer, nullptr, 0);
   m_hMemDC = CreateCompatibleDC(hDC);
   m_hOldBitmap = (HBITMAP)SelectObject(m_hMemDC, m_hBitmap);
 }
+
 CFX_WindowsDIB::~CFX_WindowsDIB() {
   SelectObject(m_hMemDC, m_hOldBitmap);
   DeleteDC(m_hMemDC);
   DeleteObject(m_hBitmap);
 }
+
 void CFX_WindowsDIB::LoadFromDevice(HDC hDC, int left, int top) {
   ::BitBlt(m_hMemDC, 0, 0, m_Width, m_Height, hDC, left, top, SRCCOPY);
 }
+
 void CFX_WindowsDIB::SetToDevice(HDC hDC, int left, int top) {
   ::BitBlt(hDC, left, top, m_Width, m_Height, m_hMemDC, 0, 0, SRCCOPY);
 }
 #endif