Merge to XFA - else after returns.

core/src/fxge/dib/fx_dib_main.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_dib.h"
 #include "../../../include/fxge/fx_ge.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "dib_int.h"
@@ skipping 1036 matching lines @@
     switch (GetFormat()) {
         case FXDIB_1bppMask: {
                 if ((*pos) & (1 << (7 - x % 8))) {
                     return 0xff000000;
                 }
                 return 0;
             }
         case FXDIB_1bppRgb: {
                 if ((*pos) & (1 << (7 - x % 8))) {
                     return m_pPalette ? m_pPalette[1] : 0xffffffff;
-                } else {
-                    return m_pPalette ? m_pPalette[0] : 0xff000000;
                 }
-                break;
+                return m_pPalette ? m_pPalette[0] : 0xff000000;
             }
         case FXDIB_8bppMask:
             return (*pos) << 24;
         case FXDIB_8bppRgb:
             return m_pPalette ? m_pPalette[*pos] : (0xff000000 | ((*pos) * 0x10101));
         case FXDIB_Rgb:
         case FXDIB_Rgba:
         case FXDIB_Rgb32:
             return FXARGB_GETDIB(pos) | 0xff000000;
         case FXDIB_Argb:
@@ skipping 540 matching lines @@
     m_Composer.Compose(pDevice, pClipRgn, bitmap_alpha, mask_color,
                        m_ClipBox, FALSE, FALSE, FALSE, m_bRgbByteOrder, alpha_flag, pIccTransform, m_BlendType);
     m_Status = 1;
     ret = m_Stretcher.Start(&m_Composer, pSource, dest_width, dest_height, bitmap_clip, dib_flags);
     return ret;
 }
 FX_BOOL CFX_ImageRenderer::Continue(IFX_Pause* pPause)
 {
     if (m_Status == 1) {
         return m_Stretcher.Continue(pPause);
-    } 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->GetBuffer() == NULL) {
             delete pBitmap;
             return FALSE;
@@ skipping 61 matching lines @@
     if (!m_pBitmap->Create(width, height, src_format)) {
         delete m_pBitmap;
         m_pBitmap = NULL;
         return FALSE;
     }
     if (pSrcPalette) {
         m_pBitmap->CopyPalette(pSrcPalette);
     }
     return TRUE;
 }