Merge to XFA - else after returns.

core/src/fpdfapi/fpdf_render/fpdf_render_image.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/fpdfapi/fpdf_module.h"
 #include "../../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../../include/fpdfapi/fpdf_render.h"
 #include "../../../include/fxcodec/fx_codec.h"
@@ skipping 743 matching lines @@
         if (m_pQuickStretcher->Continue(pPause)) {
             return TRUE;
         }
         if (m_pQuickStretcher->m_pBitmap->IsAlphaMask())
             m_pRenderStatus->m_pDevice->SetBitMask(m_pQuickStretcher->m_pBitmap, m_pQuickStretcher->m_ResultLeft,
                                                    m_pQuickStretcher->m_ResultTop, m_FillArgb);
         else
             m_pRenderStatus->m_pDevice->SetDIBits(m_pQuickStretcher->m_pBitmap, m_pQuickStretcher->m_ResultLeft,
                                                   m_pQuickStretcher->m_ResultTop, m_BlendType);
         return FALSE;
-    } else if (m_Status == 2) {
+    }
+    if (m_Status == 2) {
         if (m_pTransformer->Continue(pPause)) {
             return TRUE;
         }
         CFX_DIBitmap* pBitmap = m_pTransformer->m_Storer.Detach();
         if (pBitmap == NULL) {
             return FALSE;
         }
         if (pBitmap->IsAlphaMask()) {
             if (m_BitmapAlpha != 255) {
                 m_FillArgb = FXARGB_MUL_ALPHA(m_FillArgb, m_BitmapAlpha);
             }
             m_Result = m_pRenderStatus->m_pDevice->SetBitMask(pBitmap,
                        m_pTransformer->m_ResultLeft, m_pTransformer->m_ResultTop, m_FillArgb);
         } else {
             if (m_BitmapAlpha != 255) {
                 pBitmap->MultiplyAlpha(m_BitmapAlpha);
             }
             m_Result = m_pRenderStatus->m_pDevice->SetDIBits(pBitmap,
                        m_pTransformer->m_ResultLeft, m_pTransformer->m_ResultTop, m_BlendType);
         }
         delete pBitmap;
         return FALSE;
-    } else if (m_Status == 3) {
+    }
+    if (m_Status == 3) {
         return m_pRenderStatus->m_pDevice->ContinueDIBits(m_DeviceHandle, pPause);
-    } else if (m_Status == 4) {
+    }
+    if (m_Status == 4) {
         if (m_Loader.Continue(m_LoadHandle, pPause)) {
             return TRUE;
         }
         if (StartRenderDIBSource()) {
             return Continue(pPause);
         }
-        return FALSE;
     }
     return FALSE;
 }
 CPDF_QuickStretcher::CPDF_QuickStretcher()
 {
     m_pBitmap = NULL;
     m_pDecoder = NULL;
     m_pCS = NULL;
 }
 CPDF_QuickStretcher::~CPDF_QuickStretcher()
@@ skipping 263 matching lines @@
         for (int i = 0; i < size; i ++) {
             dest_buf[i] = pTransfer[src_buf[i]];
         }
     } else {
         FXSYS_memcpy(dest_buf, src_buf, dest_pitch * height);
     }
     delete pFunc;
     FX_Free(pTransfer);
     return pMask;
 }