Re-land else-after-returns

core/src/fxge/agg/src/fx_agg_driver.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"
 #include "../../dib/dib_int.h"
 #include "../../ge/text_int.h"
 #include "../../../../include/fxcodec/fx_codec.h"
@@ skipping 399 matching lines @@
                         ori_scan ++;
                         *dest_scan = FXDIB_ALPHA_MERGE( *dest_scan, r, cover_scan[col]);
                         dest_scan ++;
                         *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, g, cover_scan[col]);
                         dest_scan ++;
                         *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, b, cover_scan[col]);
                         dest_scan += 2;
                     }
                 }
                 return;
-            } else if (Bpp == 3 || Bpp == 4) {
+            }
+            if (Bpp == 3 || Bpp == 4) {
                 for (int col = col_start; col < col_end; col ++) {
                     int src_alpha;
                     if (clip_scan) {
                         src_alpha = m_Alpha * clip_scan[col] / 255 ;
                     } else {
                         src_alpha = m_Alpha;
                     }
                     int r = FXDIB_ALPHA_MERGE(*ori_scan++, m_Red, src_alpha);
                     int g = FXDIB_ALPHA_MERGE(*ori_scan++, m_Green, src_alpha);
                     int b = FXDIB_ALPHA_MERGE(*ori_scan, m_Blue, src_alpha);
@@ skipping 41 matching lines @@
                     dest_scan[3] = FXDIB_ALPHA_MERGE(dest_scan[3], src_alpha, cover);
                     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, m_Blue, cover);
                     dest_scan ++;
                     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, m_Green, cover);
                     dest_scan ++;
                     *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, m_Red, cover);
                     dest_scan += 2;
                 }
             }
             return;
-        } else if (Bpp == 3 || Bpp == 4) {
+        }
+        if (Bpp == 3 || Bpp == 4) {
             for (int col = col_start; col < col_end; col ++) {
                 int src_alpha;
                 if (clip_scan) {
                     src_alpha = m_Alpha * clip_scan[col] / 255;
                 } else {
                     src_alpha = m_Alpha;
                 }
                 if (m_bFullCover) {
                     *dest_scan++ = FXDIB_ALPHA_MERGE(*ori_scan++, m_Blue, src_alpha);
                     *dest_scan++ = FXDIB_ALPHA_MERGE(*ori_scan++, m_Green, src_alpha);
                     *dest_scan = FXDIB_ALPHA_MERGE(*ori_scan, m_Red, src_alpha);
                     dest_scan += Bpp - 2;
                     ori_scan += Bpp - 2;
                     continue;
                 }
                 int b = FXDIB_ALPHA_MERGE(*ori_scan++, m_Blue, src_alpha);
                 int g = FXDIB_ALPHA_MERGE(*ori_scan++, m_Green, src_alpha);
                 int r = FXDIB_ALPHA_MERGE(*ori_scan, m_Red, src_alpha);
                 ori_scan += Bpp - 2;
                 *dest_scan = FXDIB_ALPHA_MERGE( *dest_scan, b, cover_scan[col]);
                 dest_scan ++;
                 *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, g, cover_scan[col]);
                 dest_scan ++;
                 *dest_scan = FXDIB_ALPHA_MERGE(*dest_scan, r, cover_scan[col]);
                 dest_scan += Bpp - 2;
                 continue;
             }
             return;
-        } else if (Bpp == 1) {
+        }
+        if (Bpp == 1) {
             for (int col = col_start; col < col_end; col ++) {
                 int src_alpha;
                 if (clip_scan) {
                     src_alpha = m_Alpha * clip_scan[col] / 255;
                 } else {
                     src_alpha = m_Alpha;
                 }
                 if (m_bFullCover) {
                     *dest_scan = FXDIB_ALPHA_MERGE(*ori_scan++, m_Gray, src_alpha);
                 } else {
@@ skipping 1071 matching lines @@
     IFX_RenderDeviceDriver* pDriver = new CFX_AggDeviceDriver(pBitmap, dither_bits, FALSE, pOriDevice, FALSE);
     SetDeviceDriver(pDriver);
     return TRUE;
 }
 CFX_FxgeDevice::~CFX_FxgeDevice()
 {
     if (m_bOwnedBitmap) {
         delete GetBitmap();
     }
 }