Merge to XFA - else after returns.

core/src/fxge/win32/fx_win32_gdipext.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 <algorithm>
@@ skipping 995 matching lines @@
     CFX_ByteTextBuf     m_InterStream;
 public:
     GpStream()
     {
         m_RefCount = 1;
         m_ReadPos = 0;
     }
     virtual HRESULT STDMETHODCALLTYPE
     QueryInterface(REFIID iid, void ** ppvObject)
     {
-        if (iid == __uuidof(IUnknown) || iid == __uuidof(IStream) ||
-                iid == __uuidof(ISequentialStream))     {
+        if (iid == __uuidof(IUnknown) ||
+            iid == __uuidof(IStream) ||
+            iid == __uuidof(ISequentialStream)) {
             *ppvObject = static_cast<IStream*>(this);
             AddRef();
             return S_OK;
-        } else {
-            return E_NOINTERFACE;
         }
+        return E_NOINTERFACE;
     }
     virtual ULONG STDMETHODCALLTYPE AddRef(void)
     {
         return (ULONG)InterlockedIncrement(&m_RefCount);
     }
     virtual ULONG STDMETHODCALLTYPE Release(void)
     {
         ULONG res = (ULONG) InterlockedDecrement(&m_RefCount);
         if (res == 0) {
             delete this;
@@ skipping 218 matching lines @@
         for (int i = 0; i < height; i ++) {
             FXSYS_memcpy(pData + dest_pitch * i, pInfo->pScan0 + pInfo->Stride * i, dest_pitch);
         }
     }
     CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf(pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32);
     FX_Free(pData);
     FreeDIBitmap(pInfo);
     return pDIBitmap;
 }
 #endif