Merge to XFA - else after returns.

core/src/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 "../../../include/fxge/fx_ge.h"
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ ||  _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <windows.h>
 #include "../../../include/fxge/fx_ge_win32.h"
@@ skipping 135 matching lines @@
         pDIBitmap = NULL;
     }
     DeleteDC(hDC);
     return pDIBitmap;
 }
 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);
-    } else if (args.flags == WINDIB_OPEN_MEMORY) {
+    }
+    if (args.flags == WINDIB_OPEN_MEMORY) {
         return NULL;
     }
     HBITMAP hBitmap = (HBITMAP)LoadImageW(NULL, (wchar_t*)args.path_name, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
     if (hBitmap == NULL) {
         return NULL;
     }
     HDC hDC = CreateCompatibleDC(NULL);
     int width, height;
     GetBitmapSize(hBitmap, width, height);
     CFX_DIBitmap* pDIBitmap = FX_NEW CFX_DIBitmap;
@@ skipping 114 matching lines @@
 }
 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