Merge to XFA - else after returns.

core/src/fxcodec/codec/fx_codec_jpeg.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 <setjmp.h>
 
 #include "../../../include/fxcodec/fx_codec.h"
 #include "../../../include/fxcrt/fx_safe_types.h"
@@ skipping 475 matching lines @@
     return TRUE;
 }
 extern "C" {
     int32_t FX_GetDownsampleRatio(int32_t originWidth, int32_t originHeight, int32_t downsampleWidth, int32_t downsampleHeight)
     {
         int iratio_w = originWidth / downsampleWidth;
         int iratio_h = originHeight / downsampleHeight;
         int ratio = (iratio_w > iratio_h) ? iratio_h : iratio_w;
         if (ratio >= 8) {
             return 8;
-        } else if (ratio >= 4) {
+        }
+        if (ratio >= 4) {
             return 4;
-        } else if (ratio >= 2) {
+        }
+        if (ratio >= 2) {
             return 2;
         }
         return 1;
     }
 }
 void CCodec_JpegDecoder::v_DownScale(int dest_width, int dest_height)
 {
     if (m_pExtProvider) {
         m_pExtProvider->DownScale(m_pExtContext, dest_width, dest_height);
         return;
@@ skipping 234 matching lines @@
         return m_pExtProvider->GetAvailInput(pContext, avail_buf_ptr);
     }
     if(avail_buf_ptr != NULL) {
         *avail_buf_ptr = NULL;
         if(((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer > 0) {
             *avail_buf_ptr = (uint8_t*)((FXJPEG_Context*)pContext)->m_SrcMgr.next_input_byte;
         }
     }
     return (FX_DWORD)((FXJPEG_Context*)pContext)->m_SrcMgr.bytes_in_buffer;
 }