Merge to XFA - else after returns.

core/src/fxge/dib/fx_dib_engine.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 "dib_int.h"
 #include <limits.h>
@@ skipping 328 matching lines @@
     }
     if (m_pSource->SkipToScanline(m_CurRow, pPause)) {
         return TRUE;
     }
     int Bpp = m_DestBpp / 8;
     int rows_to_go = FX_STRECH_PAUSE_ROWS;
     for (; m_CurRow < m_SrcClip.bottom; m_CurRow ++) {
         if (rows_to_go == 0) {
             if (pPause && pPause->NeedToPauseNow()) {
                 return TRUE;
-            } else {
-                rows_to_go = FX_STRECH_PAUSE_ROWS;
             }
+            rows_to_go = FX_STRECH_PAUSE_ROWS;
         }
         const uint8_t* src_scan = m_pSource->GetScanline(m_CurRow);
         uint8_t* dest_scan = m_pInterBuf + (m_CurRow - m_SrcClip.top) * m_InterPitch;
         const uint8_t* src_scan_mask = NULL;
         uint8_t* dest_scan_mask = NULL;
         if (m_pExtraAlphaBuf) {
             src_scan_mask = m_pSource->m_pAlphaMask->GetScanline(m_CurRow);
             dest_scan_mask = m_pExtraAlphaBuf + (m_CurRow - m_SrcClip.top) * m_ExtraMaskPitch;
         }
         switch (m_TransMethod) {
@@ skipping 376 matching lines @@
             pal[i] = CmykEncode(c, m, y, k);
         }
         if (!pDest->SetInfo(rect.Width(), rect.Height(), m_DestFormat, pal)) {
             return FALSE;
         }
     } else if (!pDest->SetInfo(rect.Width(), rect.Height(), m_DestFormat, NULL)) {
         return FALSE;
     }
     if (flags & FXDIB_DOWNSAMPLE) {
         return StartQuickStretch();
-    } else {
-        return StartStretch();
     }
+    return StartStretch();
 }
 FX_BOOL CFX_ImageStretcher::Continue(IFX_Pause* pPause)
 {
     if (m_Flags & FXDIB_DOWNSAMPLE) {
         return ContinueQuickStretch(pPause);
-    } else {
-        return ContinueStretch(pPause);
     }
+    return ContinueStretch(pPause);
 }
 #define MAX_PROGRESSIVE_STRETCH_PIXELS  1000000
 FX_BOOL CFX_ImageStretcher::StartStretch()
 {
     m_pStretchEngine = FX_NEW CStretchEngine(m_pDest, m_DestFormat, m_DestWidth, m_DestHeight, m_ClipRect, m_pSource, m_Flags);
     if (!m_pStretchEngine) {
         return FALSE;
     }
     m_pStretchEngine->StartStretchHorz();
     if (m_pSource->GetWidth() * m_pSource->GetHeight() < MAX_PROGRESSIVE_STRETCH_PIXELS) {
@@ skipping 63 matching lines @@
             return TRUE;
         }
         m_pSource->DownSampleScanline(src_y, m_pScanline, m_DestBPP, m_DestWidth, m_bFlipX, m_ClipRect.left, result_width);
         if (m_pMaskScanline) {
             m_pSource->m_pAlphaMask->DownSampleScanline(src_y, m_pMaskScanline, 1, m_DestWidth, m_bFlipX, m_ClipRect.left, result_width);
         }
         m_pDest->ComposeScanline(dest_y, m_pScanline, m_pMaskScanline);
     }
     return FALSE;
 }